summaryrefslogtreecommitdiff
path: root/t/t4130-apply-criss-cross-rename.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-28 15:29:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-28 15:44:44 -0800
commit9bcbb1c218d075d8b180cfef4c9089f868151e7e (patch)
treeebbecac96214b283888b90d0710eddce6e74122a /t/t4130-apply-criss-cross-rename.sh
parentGit 1.7.11.7 (diff)
downloadtgif-9bcbb1c218d075d8b180cfef4c9089f868151e7e.tar.xz
merge --no-edit: do not credit people involved in the side branch
The credit lines "By" and "Via" to credit authors and committers for their contributions on the side branch are meant as a hint to the integrator to decide whom to mention in the log message text. After the integrator saves the message in the editor, they are meant to go away and that is why they are commented out. When a merge is recorded without editing the generated message, however, its contents do not go through the normal stripspace() and these lines are left in the merge. Stop producing them when we know the merge is going to be recorded without editing, i.e. when --no-edit is given. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4130-apply-criss-cross-rename.sh')
0 files changed, 0 insertions, 0 deletions