From 62d4c9148e19821f5c523f79a581cef0729926bf Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 19 Nov 2008 16:09:23 +1100 Subject: [PATCH] merg_fix: a fixup may add files --- merge_fix | 4 ++++ 1 file changed, 4 insertions(+) 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 -- 2.39.2