diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-15 08:45:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-15 08:45:49 +0200 |
| commit | 633ce9a3ba973acf19a122e1359b7ae724887d70 (patch) | |
| tree | d360db37cc2c4f64ed85eae77e03f2b98061c9b1 /git-am.sh | |
| parent | bash completion: Remove dashed command completion support (diff) | |
| parent | Documentation: mention ORIG_HEAD in am, merge, and rebase (diff) | |
| download | git-633ce9a3ba973acf19a122e1359b7ae724887d70.tar.xz git-633ce9a3ba973acf19a122e1359b7ae724887d70.zip | |
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-x | git-am.sh | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -242,6 +242,7 @@ else : >"$dotest/rebasing" else : >"$dotest/applying" + git update-ref ORIG_HEAD HEAD fi fi |