git/Documentation
Junio C Hamano 216d29ef25 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`
2014-11-10 09:56:39 -08:00
..
2009-04-06 00:27:09 -07:00
2014-04-08 12:00:28 -07:00
2013-07-22 16:06:48 -07:00
2013-09-04 12:23:25 -07:00
2014-08-04 14:03:45 -07:00
2011-09-06 11:42:12 -07:00
2013-05-29 14:23:04 -07:00
2014-07-22 11:00:23 -07:00
2013-10-18 13:50:12 -07:00
2011-03-11 10:59:16 -05:00
2013-04-12 12:00:52 -07:00