merg_fix: a fixup may add files

[next-scripts] / merge_fix

diff --git a/merge_fix b/merge_fix
index e7c749c9bca285a65fa5c6f85942e9b285880a60..96c0a4fcd8662dba21687673bcd4d11c1bd728ee 100755 (executable)
--- a/merge_fix
+++ b/merge_fix
@@ -37,6 +37,10 @@ GIT_EDITOR=: execute git reset 'HEAD^' || {
        echo "git reset failed" 1>&2
        bash -i || exit
 }
+execute git add . || {
+       echo "git add failed" 1>&2
+       bash -i || exit
+}
 GIT_EDITOR=: execute git commit -v -a --amend || {
        echo "git commit failed" 1>&2
        bash -i || exit