git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9ecee0 ad8261d)
Merge branch 'jk/pull-rebase-using-fork-point'
authorJunio C Hamano <redacted>
Fri, 27 Dec 2013 22:58:08 +0000 (14:58 -0800)
committerJunio C Hamano <redacted>
Fri, 27 Dec 2013 22:58:08 +0000 (14:58 -0800)
* jk/pull-rebase-using-fork-point:
  rebase: use reflog to find common base with upstream
  pull: use merge-base --fork-point when appropriate

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

diff --cc git-pull.sh
Simple merge
git clone https://git.99rst.org/PROJECT