X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=2ecebc45a93784f1ca377941cd9b96569b3ade1c;hb=ee95ec5d58d536243966de6ee810d345074b755e;hp=65c634f77af98b3598bfb50583de05f0cf5d6eb4;hpb=bd8ff616c998da8b08bd59b47644408048b3016d;p=git.git diff --git a/git-am.sh b/git-am.sh index 65c634f77..2ecebc45a 100755 --- a/git-am.sh +++ b/git-am.sh @@ -14,7 +14,7 @@ b,binary pass --allo-binary-replacement to git-apply 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 @@ -469,9 +469,9 @@ do "$GIT_DIR"/hooks/post-applypatch fi - git gc --auto - go_next done +git gc --auto + rm -fr "$dotest"