diff --git a/git-am.sh b/git-am.sh
index 65c634f77af98b3598bfb50583de05f0cf5d6eb4..2ecebc45a93784f1ca377941cd9b96569b3ade1c 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
3,3way allow fall back on 3way merging if needed
s,signoff add a Signed-off-by line to the commit message
u,utf8 recode into utf8 (default)
3,3way allow fall back on 3way merging if needed
s,signoff add a Signed-off-by line to the commit message
u,utf8 recode into utf8 (default)
-k,keep pass -k flagg to git-mailinfo
+k,keep pass -k flag to git-mailinfo
whitespace= pass it through git-apply
C= pass it through git-apply
p= pass it through git-apply
whitespace= pass it through git-apply
C= pass it through git-apply
p= pass it through git-apply
"$GIT_DIR"/hooks/post-applypatch
fi
"$GIT_DIR"/hooks/post-applypatch
fi
- git gc --auto
-
go_next
done
go_next
done
+git gc --auto
+
rm -fr "$dotest"
rm -fr "$dotest"