rebase: implement --[no-]autostash and rebase.autostash

diff --git a/git-am.sh b/git-am.sh
index ccb854a20e51d2522c8744742c10b3f5d70d7a9e..1cf3d1dacfb2084e9fcc360a6296900b6f9a7d03 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -906,5 +906,10 @@ if test -s "$dotest"/rewritten; then
     fi
 fi
 
-rm -fr "$dotest"
-git gc --auto
+# If am was called with --rebasing (from git-rebase--am), it's up to
+# the caller to take care of housekeeping.
+if ! test -f "$dotest/rebasing"
+then
+       rm -fr "$dotest"
+       git gc --auto
+fi