various updates

[next-scripts] / merge_fix

diff --git a/merge_fix b/merge_fix
index 9cf57c03322d14060611d7eb065a445295e1077c..e1d68e1d6eda0db00b14bd3c59c9cfbb257a11c0 100755 (executable)
--- a/merge_fix
+++ b/merge_fix
@@ -56,7 +56,7 @@ GIT_EDITOR=: execute git reset 'HEAD^' || {
        echo "git reset failed" 1>&2
        bash -i || exit
 }
-execute git add . || {
+execute git add -A . || {
        echo "git add failed" 1>&2
        bash -i || exit
 }