| commit | 274a5c06d525da8c9720ae60454fba6779523c52 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Nov 2011 22:45:10 +0000 (7 14:45 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Nov 2011 18:36:53 +0000 (8 10:36 -0800) | ||
| tree | a7ad758e0777c7e7fa6486243b8b6edc2de129e1 | treesnapshot (tar.gz zip) |
| parent | ae8e4c9ce10ea9439a88b79a40aeff4696d40416 | commitdiff |
merge: record tag objects without peeling in MERGE_HEAD
Otherwise, "git commit" wouldn't have a way to tell that we were in the
middle of merging an annotated or signed tag, not a plain commit, after
"git merge" stops to ask the user to resolve conflicts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Otherwise, "git commit" wouldn't have a way to tell that we were in the
middle of merging an annotated or signed tag, not a plain commit, after
"git merge" stops to ask the user to resolve conflicts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory | |
| t/t7600-merge.sh | diffblobblamehistory |