Re: [PATCH v2 1/2] commit: don't add scissors line if one exists in MERGE_MSG

Denton Liu writes: > If commit.cleanup = scissors is specified, don't produce a scissors line > if one already exists in the MERGE_MSG file. Are we already sometimes adding a scissors line in that file? The impression I was getting was that the change in the step 2/2 is the only reason why

[PATCH v2 1/2] commit: don't add scissors line if one exists in MERGE_MSG

If commit.cleanup = scissors is specified, don't produce a scissors line if one already exists in the MERGE_MSG file. Signed-off-by: Denton Liu --- builtin/commit.c | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index