summaryrefslogtreecommitdiffstats
path: root/gitk-git (unfollow)
Commit message (Expand)AuthorFilesLines
2014-11-10trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder2-7/+27
2014-11-10commit: make ignore_non_trailer() non staticChristian Couder3-46/+49
2014-11-10trailer: display a trailer without its trailing newlineChristian Couder1-2/+6
2014-11-10trailer: ignore comment lines inside the trailersChristian Couder1-2/+4
2014-10-28merge & sequencer: turn "Conflicts:" hint into a commentJunio C Hamano3-28/+68
2014-10-28builtin/commit.c: extract ignore_non_trailer() helper functionJunio C Hamano1-26/+33
2014-10-24merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano3-28/+26
2014-10-24builtin/merge.c: drop a parameter that is never usedJunio C Hamano1-2/+2
2014-10-13Documentation: add documentation for 'git interpret-trailers'Christian Couder2-0/+315
2014-10-13trailer: add tests for commands in config fileChristian Couder1-0/+125
2014-10-13trailer: execute command from 'trailer.<name>.command'Christian Couder1-1/+84