]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6abb365) | patch
git notes merge: List conflicting notes in notes merge commit message
authorJohan Herland <johan@herland.net>
Tue, 9 Nov 2010 21:49:53 +0000 (22:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:22:49 +0000 (13:22 -0800)
commit443259cf929c0041310e3c77946252cbfc3f787d
tree120f8360fdd0f0c55c08fca1ecae571a2d167750tree | snapshot
parent6abb3655efe364cf0375b5cdae2729af7562ed45commit | diff
git notes merge: List conflicting notes in notes merge commit message

This brings notes merge in line with regular merge's behaviour.

This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Don't use C99 comments.

Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/notes.c diff | blob | blame | history
notes-merge.c diff | blob | blame | history
notes-merge.h diff | blob | blame | history
t/t3310-notes-merge-manual-resolve.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.