summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-14 23:45:49 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-14 23:45:49 -0700
commit633ce9a3ba973acf19a122e1359b7ae724887d70 (patch)
treed360db37cc2c4f64ed85eae77e03f2b98061c9b1 /git-am.sh
parent055767194c15f9b7c39a509daf1a77472c77bed8 (diff)
parent9869099bee332e4c351c3aaa15a74786d85909c7 (diff)
downloadgit-633ce9a3ba973acf19a122e1359b7ae724887d70.tar.gz
Merge branch 'jc/rebase-orig-head'
* jc/rebase-orig-head: Documentation: mention ORIG_HEAD in am, merge, and rebase Teach "am" and "rebase" to mark the original position with ORIG_HEAD
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 4e73f93a1f..52b5669b43 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -242,6 +242,7 @@ else
: >"$dotest/rebasing"
else
: >"$dotest/applying"
+ git update-ref ORIG_HEAD HEAD
fi
fi