diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-15 15:43:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-15 15:43:44 -0700 |
| commit | 633a8bdddf32191ffde532a198f8bb59f4370e26 (patch) | |
| tree | 911f4deb06dc173d6718153cd4c07807cc2ae5f1 /git-mergetool--lib.sh | |
| parent | Merge branch 'mm/detach-at-HEAD-reflog' (diff) | |
| parent | rebase-i: loosen over-eager check_bad_cmd check (diff) | |
| download | tgif-633a8bdddf32191ffde532a198f8bb59f4370e26.tar.xz | |
Merge branch 'gr/rebase-i-drop-warn'
"git rebase -i" had a minor regression recently, which stopped
considering a line that begins with an indented '#' in its insn
sheet not a comment, which is now fixed.
* gr/rebase-i-drop-warn:
rebase-i: loosen over-eager check_bad_cmd check
rebase-i: explicitly accept tab as separator in commands
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions