do_merge: always do the commit after a manual fixup

diff --git a/do_merge b/do_merge
index 58ef07c9c7fa3e69be345c4beb0b8fb807f58dd8..cb110ccfbb8a1878fdf4c1a89e9ba169e64f1f39 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -120,10 +120,10 @@ for h in $heads; do
                        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                                bash -i || exit
                        }
-                       [ "$(git status --porcelain)" ] && {
+#                      [ "$(git status --porcelain)" ] && {
                                GIT_EDITOR=: execute git commit -v -a
                                execute git diff -M --stat --summary 'HEAD^..'
-                       }
+#                      }
                }
                ;;
        esac