diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-15 15:49:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-15 15:49:03 +0000 |
| commit | 38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (patch) | |
| tree | bc44e0dbf17d91c4eec1fdc57bafcec5a15f74dc /git-am.html | |
| parent | c4b18dd00515b271e8b4e4725ce0d19c4ca41636 (diff) | |
| download | git-htmldocs-38ddcce0c19a8eedec7a98bd291f65b2127a82b9.tar.gz | |
Autogenerated HTML docs for v1.5.6.3-350-g6c11a
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-am.html b/git-am.html index b913f1ad2..4c7a7b7ee 100644 --- a/git-am.html +++ b/git-am.html @@ -553,6 +553,11 @@ hand resolve the conflict in the working directory, and update directory exists, so if you decide to start over from scratch,
run <tt>rm -f -r .dotest</tt> before running the command with mailbox
names.</p></div>
+<div class="para"><p>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 <em>git am</em> 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).</p></div>
</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
@@ -572,7 +577,7 @@ names.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-14 03:12:28 UTC
+Last updated 2008-07-15 15:48:33 UTC
</div>
</div>
</body>
|