diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-12-08 12:47:25 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-12-09 13:05:20 -0800 |
| commit | 48059e405028ebf8a09c5a9aede89dfb460cce98 (patch) | |
| tree | 518354d1c895b12e4523514a090bf144c81272e2 /csum-file.h | |
| parent | Merge branch 'jc/merge-base-reflog' (diff) | |
| download | tgif-48059e405028ebf8a09c5a9aede89dfb460cce98.tar.xz | |
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>
Diffstat (limited to 'csum-file.h')
0 files changed, 0 insertions, 0 deletions