diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-07 15:59:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-07 15:59:41 -0800 |
| commit | 798ddfc17fbbe58494f2af0f71e0b53264ee82b5 (patch) | |
| tree | 24daff91349aa29c3a7f08881c7c39adc25a2e29 /git-gui/lib/commit.tcl | |
| parent | Merge branch 'js/merge-tree-3-trees' (diff) | |
| parent | commit: unify logic to avoid multiple scissors lines when merging (diff) | |
| download | git-798ddfc17fbbe58494f2af0f71e0b53264ee82b5.tar.gz git-798ddfc17fbbe58494f2af0f71e0b53264ee82b5.zip | |
Merge branch 'jt/commit-redundant-scissors-fix'
"git commit -v --cleanup=scissors" used to add the scissors line
twice in the log message buffer, which has been corrected.
* jt/commit-redundant-scissors-fix:
commit: unify logic to avoid multiple scissors lines when merging
commit: avoid redundant scissor line with --cleanup=scissors -v
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions