set auto edit to no w/ burnettk

2022-10-19 16:16:43 -04:00 · 2022-10-19 16:16:43 -04:00 · c2631ee045
parent 0d9aabcee4
commit c2631ee045
1 changed files with 1 additions and 1 deletions
--- a/bin/pull-subtrees
+++ b/bin/pull-subtrees
@ -6,5 +6,5 @@ for subtree in "SpiffWorkflow" \
  "flask-bpmn" \
  "bpmn-js-spiffworkflow"
 do
-  git subtree pull --prefix=$subtree git@github.com:sartography/$subtree.git main --squash
+  GIT_MERGE_AUTOEDIT=no git subtree pull --prefix=$subtree git@github.com:sartography/$subtree.git main --squash
 done