diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:30 -0700 |
| commit | a94594dcf7522652363773c06e1ff617914dffe8 (patch) | |
| tree | 26e106482d98545d8e6d4cb4cb8da48dee14e877 /mergetools/tortoisemerge | |
| parent | Git 2.4.7 (diff) | |
| parent | commit: cope with scissors lines in commit message (diff) | |
| download | tgif-a94594dcf7522652363773c06e1ff617914dffe8.tar.xz | |
Merge branch 'sg/commit-cleanup-scissors' into maint
"git commit --cleanup=scissors" was not careful enough to protect
against getting fooled by a line that looked like scissors.
* sg/commit-cleanup-scissors:
commit: cope with scissors lines in commit message
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions