]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pw/no-editor-in-rebase-i-implicit'
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:17 +0000 (14:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Feb 2019 22:26:17 +0000 (14:26 -0800)
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

1  2 
builtin/rebase.c
git-legacy-rebase.sh

Simple merge
Simple merge