Merge branch 'jpgrayson/main'

Byron · Nov 21, 2022 · 72abac6 · 72abac6
2 parents b755b5b + f302fc1
commit 72abac6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-repository/tests/fixtures/make_rebase_i_repo.sh b/git-repository/tests/fixtures/make_rebase_i_repo.sh
@@ -13,4 +13,4 @@ git commit -m 3 3
 
 # NOTE: Starting around git 2.35.0 --preserve-merges was renamed to --rebase-merges
 # however --preserve-merges first appeared in git 2.18.  That should cover most use cases.
-EDITOR="sed -i.bak 's/pick/edit/g'" git rebase --rebase-merges --interactive HEAD~2
+GIT_EDITOR="sed -i.bak 's/pick/edit/g'" git rebase --rebase-merges --interactive HEAD~2