projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d52adf1 261f315)
Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 17:56:39 +0000 (09:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 17:56:39 +0000 (09:56 -0800)
commit216d29ef257e48f95bc14765d5da17e7854a3109
tree7cd0e31b75f442d9ae146f222b102b9982bd60cetree | snapshot
parentd52adf1f328162a9513940913ced044d24c0212fcommit | diff
parent261f315bebfa9af2d09f20211960100ff06f87cbcommit | diff
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`
Documentation/git-tag.txt diff1 | diff2 | blob | history
builtin/commit.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
sequencer.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.