Teach "am" and "rebase" to mark the original position with ORIG_HEAD

diff --git a/git-am.sh b/git-am.sh
index 2c517ede590c5c3274b03d1c980f9a847cc7d643..fe53608c94a7eda70aebfdf3364802b1a665647f 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -241,6 +241,7 @@ else
                : >"$dotest/rebasing"
        else
                : >"$dotest/applying"
+               git update-ref ORIG_HEAD HEAD
        fi
 fi