| commit | 48059e405028ebf8a09c5a9aede89dfb460cce98 | |
| author | John Keeping <john@keeping.me.uk> | |
| Sun, 8 Dec 2013 12:47:25 +0000 (8 12:47 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Dec 2013 21:05:20 +0000 (9 13:05 -0800) | ||
| tree | 518354d1c895b12e4523514a090bf144c81272e2 | treesnapshot (tar.gz zip) |
| parent | 07d406b742b577a39d7cbdacd76d0dde021ff788 | commitdiff |
pull: use merge-base --fork-point when appropriate
Since commit d96855f (merge-base: teach "--fork-point" mode, 2013-10-23)
we can replace a shell loop in git-pull with a single call to
git-merge-base. So let's do so.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since commit d96855f (merge-base: teach "--fork-point" mode, 2013-10-23)
we can replace a shell loop in git-pull with a single call to
git-merge-base. So let's do so.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-pull.sh | diffblobblamehistory |