diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 01:26:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 01:26:17 +0300 |
| commit | 69dd6e57374f4aa5dcda0736529be47b16a08afe (patch) | |
| tree | 580c5fd6f1360d82a911ac18108a2afd1b9d649a /git-legacy-rebase.sh | |
| parent | 5d2710bd3c706c3375991972b630f9419551f24e (diff) | |
| parent | 891d4a0313edc03f7e2ecb96edec5d30dc182294 (diff) | |
Merge branch 'pw/no-editor-in-rebase-i-implicit'
When GIT_SEQUENCE_EDITOR is set, the command was incorrectly
started when modes of "git rebase" that implicitly uses the
machinery for the interactive rebase are run, which has been
corrected.
* pw/no-editor-in-rebase-i-implicit:
implicit interactive rebase: don't run sequence editor
Diffstat (limited to 'git-legacy-rebase.sh')
| -rwxr-xr-x | git-legacy-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh index 3bb0682db5..f03ca6c49a 100755 --- a/git-legacy-rebase.sh +++ b/git-legacy-rebase.sh @@ -176,8 +176,8 @@ run_interactive () { run_specific_rebase () { if [ "$interactive_rebase" = implied ]; then - GIT_EDITOR=: - export GIT_EDITOR + GIT_SEQUENCE_EDITOR=: + export GIT_SEQUENCE_EDITOR autosquash= fi |