| commit | 216d29ef257e48f95bc14765d5da17e7854a3109 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Nov 2014 17:56:39 +0000 (10 09:56 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Nov 2014 17:56:39 +0000 (10 09:56 -0800) | ||
| tree | 7cd0e31b75f442d9ae146f222b102b9982bd60ce | treesnapshot (tar.gz zip) |
| parent | d52adf1f328162a9513940913ced044d24c0212f | commitdiff |
| parent | 261f315bebfa9af2d09f20211960100ff06f87cb | commitdiff |
Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
* jc/conflict-hint:
merge & sequencer: turn "Conflicts:" hint into a comment
builtin/commit.c: extract ignore_non_trailer() helper function
merge & sequencer: unify codepaths that write "Conflicts:" hint
builtin/merge.c: drop a parameter that is never used
git-tag.txt: Add a missing hyphen to `-s`
* jc/conflict-hint:
merge & sequencer: turn "Conflicts:" hint into a comment
builtin/commit.c: extract ignore_non_trailer() helper function
merge & sequencer: unify codepaths that write "Conflicts:" hint
builtin/merge.c: drop a parameter that is never used
git-tag.txt: Add a missing hyphen to `-s`