]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7600-merge.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ae8e4c9) | patch
merge: record tag objects without peeling in MERGE_HEAD
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Nov 2011 22:45:10 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Nov 2011 18:36:53 +0000 (10:36 -0800)
commit274a5c06d525da8c9720ae60454fba6779523c52
treea7ad758e0777c7e7fa6486243b8b6edc2de129e1tree | snapshot
parentae8e4c9ce10ea9439a88b79a40aeff4696d40416commit | diff
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>
builtin/merge.c diff | blob | blame | history
t/t7600-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.