From 9c1c7680d4827fa55092f78646d43de3ed1a1ab3 Mon Sep 17 00:00:00 2001 From: Stefan Naewe Date: Thu, 15 Aug 2013 19:32:57 +0200 Subject: [PATCH] merging-rebase: set both GIT_SEQUENCE_EDITOR and GIT_EDITOR to modify the insn-cheet 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 --- share/msysGit/merging-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/msysGit/merging-rebase.sh b/share/msysGit/merging-rebase.sh index f17ac5d9..44ba7177 100755 --- a/share/msysGit/merging-rebase.sh +++ b/share/msysGit/merging-rebase.sh @@ -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} -- 2.11.4.GIT