]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 451316d 62d955f)
Merge branch 'sb/pull-rebase'
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:47:13 +0000 (21:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:47:13 +0000 (21:47 -0700)
* sb/pull-rebase:
  parse-remote: remove unused functions
  parse-remote: support default reflist in get_remote_merge_branch
  parse-remote: function to get the tracking branch to be merge

1  2 
git-pull.sh patch | diff1 | diff2 | blob | history

diff --cc git-pull.sh
Simple merge
Git mirror and local development