| commit | 2b0a564e02528e006d23e3318d0d2869fb239425 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Dec 2013 22:58:08 +0000 (27 14:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Dec 2013 22:58:08 +0000 (27 14:58 -0800) | ||
| tree | 76f46ae7b059ac9ca0e8b725fa67f89a3c078f16 | treesnapshot (tar.gz zip) |
| parent | e9ecee0423f2b24eb4e51d337044721c761cb4c3 | commitdiff |
| parent | ad8261d21221d27638c75f47b39892db6f7972f6 | commitdiff |
Merge branch 'jk/pull-rebase-using-fork-point'
* jk/pull-rebase-using-fork-point:
rebase: use reflog to find common base with upstream
pull: use merge-base --fork-point when appropriate
* jk/pull-rebase-using-fork-point:
rebase: use reflog to find common base with upstream
pull: use merge-base --fork-point when appropriate
| git-pull.sh | diff1 | diff2 | blobhistory |