diff options
| author | Johan Herland <johan@herland.net> | 2010-11-09 21:49:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 21:22:49 (GMT) |
| commit | 443259cf929c0041310e3c77946252cbfc3f787d (patch) | |
| tree | 120f8360fdd0f0c55c08fca1ecae571a2d167750 /builtin | |
| parent | 6abb3655efe364cf0375b5cdae2729af7562ed45 (diff) | |
| download | git-443259cf929c0041310e3c77946252cbfc3f787d.zip git-443259cf929c0041310e3c77946252cbfc3f787d.tar.gz git-443259cf929c0041310e3c77946252cbfc3f787d.tar.bz2 | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index b538523..ee1df70 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -902,7 +902,7 @@ static int merge(int argc, const char **argv, const char *prefix) strbuf_addf(&msg, "notes: Merged notes from %s into %s", remote_ref.buf, default_notes_ref()); - o.commit_msg = msg.buf + 7; // skip "notes: " prefix + strbuf_add(&(o.commit_msg), msg.buf + 7, msg.len - 7); /* skip "notes: " */ result = notes_merge(&o, t, result_sha1); |