From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Nov 2008 05:09:23 +0000 (+1100)
Subject: merg_fix: a fixup may add files
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=62d4c9148e19821f5c523f79a581cef0729926bf;p=next-scripts

merg_fix: a fixup may add files
---

diff --git a/merge_fix b/merge_fix
index e7c749c..96c0a4f 100755
--- 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