diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:45:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:45:49 -0700 |
| commit | 633ce9a3ba973acf19a122e1359b7ae724887d70 (patch) | |
| tree | d360db37cc2c4f64ed85eae77e03f2b98061c9b1 /Documentation/git-am.txt | |
| parent | 055767194c15f9b7c39a509daf1a77472c77bed8 (diff) | |
| parent | 9869099bee332e4c351c3aaa15a74786d85909c7 (diff) | |
| download | git-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 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index eeb23b25b0..1395c7d986 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -145,6 +145,12 @@ directory exists, so if you decide to start over from scratch, run `rm -f -r .dotest` before running the command with mailbox names. +Before any patches are applied, ORIG_HEAD is set to the tip of the +current branch. This is useful if you have problems with multiple +commits, like running 'git am' on the wrong branch or an error in the +commits that is more easily fixed by changing the mailbox (e.g. +errors in the "From:" lines). + SEE ALSO -------- |