Here is a series to fix a few small bugs in "git interpret-trailers". Patch 1/5 and patch 2/5 are independent from the last 3 patches, and can be applied to master. Patches 3/5, 4/5 and 5/5 depend on this series by Junio: jc/conflict-hint (2014-10-28) 4 commits (merged to 'next' on 2014-10-29 at 693250f) Christian Couder (5): trailer: ignore comment lines inside the trailers trailer: display a trailer without its trailing newline commit: make ignore_non_trailer() non static trailer: reuse ignore_non_trailer() to ignore conflict lines trailer: add test with an old style conflict block builtin/commit.c | 46 ------------------------------------------- commit.c | 46 +++++++++++++++++++++++++++++++++++++++++++ commit.h | 3 +++ t/t7513-interpret-trailers.sh | 34 +++++++++++++++++++++++++++++++- trailer.c | 39 +++++++++++++++++++++++++----------- 5 files changed, 110 insertions(+), 58 deletions(-) -- 2.1.2.555.gfbecd99 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html