merge: handle FETCH_HEAD internally
authorJunio C Hamano <gitster@pobox.com>
Sun, 26 Apr 2015 01:47:21 +0000 (18:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2015 20:27:31 +0000 (13:27 -0700)
commit74e8bc5...cb324d2d7a55c90195db004219770eec
tree1ad1ba8...3e9be15691af9d23e22e3d6ce5839b73copy hash to clipboard (tree)
parent7703801...6dd06cd03d83957d55484f4a98ad284fcopy hash to clipboard (diff)
Documentation/git-merge.txt
builtin/merge.c
t/t3033-merge-toplevel.sh