pull: use merge-base --fork-point when appropriate
authorJohn Keeping <john@keeping.me.uk>
Sun, 8 Dec 2013 12:47:25 +0000 (12:47 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Dec 2013 21:05:20 +0000 (13:05 -0800)
commit48059e4...5028ebf8a09c5a9aede89dfb460cce98
tree518354d...c895b12e4523514a090bf144c81272e2copy hash to clipboard (tree)
parent07d406b...42b577a39d7cbdacd76d0dde021ff788copy hash to clipboard (diff)
git-pull.sh