merging-rebase: set both GIT_SEQUENCE_EDITOR and GIT_EDITOR to modify the insn-cheet
authorStefan Naewe <stefan.naewe@gmail.com>
Thu, 15 Aug 2013 17:32:57 +0000 (15 19:32 +0200)
committerStefan Naewe <stefan.naewe@gmail.com>
Thu, 15 Aug 2013 17:32:57 +0000 (15 19:32 +0200)
Somehow git rebase -i seems to ignore GIT_EDITOR and only uses
GIT_SEQUENCE_EDITOR. Set both variables to not introduce a regression.

Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
share/msysGit/merging-rebase.sh

index f17ac5d..44ba717 100755 (executable)
@@ -180,4 +180,4 @@ EOF
 chmod a+x "$TMP_EDITOR"
 
 # Rebase!
-GIT_EDITOR="$TMP_EDITOR" git rebase --autosquash -i ${REBASING_BASE:-$TO}
+GIT_EDITOR="$TMP_EDITOR" GIT_SEQUENCE_EDITOR="$TMP_EDITOR" git rebase --autosquash -i ${REBASING_BASE:-$TO}