averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

git notes merge: List conflicting notes in notes merge commit message

Browse Source 
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>
This commit is contained in:
Johan Herland
2010-11-09 22:49:53 +01:00
committed by Junio C Hamano
parent 6abb3655ef
commit 443259cf92
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
notes-merge.h
View File

@@ -11,7 +11,7 @@ enum notes_merge_verbosity {
struct notes_merge_options {
const char *local_ref;
const char *remote_ref;
const char *commit_msg;
struct strbuf commit_msg;
int verbosity;
enum {
NOTES_MERGE_RESOLVE_MANUAL = 0,