diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:55 -0700 |
| commit | 07528be1018b72e463404624b8752ead7eb0eb8d (patch) | |
| tree | 5d08b81961e129a3d8c42f3ecd23ceec83b08f1b /Documentation/git-merge-file.txt | |
| parent | Merge branch 'jk/index-pack-reduce-recheck' (diff) | |
| parent | commit: cope with scissors lines in commit message (diff) | |
| download | tgif-07528be1018b72e463404624b8752ead7eb0eb8d.tar.xz | |
Merge branch 'sg/commit-cleanup-scissors'
"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 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions