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-merge.html | |
| parent | c4b18dd00515b271e8b4e4725ce0d19c4ca41636 (diff) | |
| download | git-htmldocs-38ddcce0c19a8eedec7a98bd291f65b2127a82b9.tar.gz | |
Autogenerated HTML docs for v1.5.6.3-350-g6c11a
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index 90992fcf1..46166165c 100644 --- a/git-merge.html +++ b/git-merge.html @@ -685,7 +685,9 @@ fail.</td> (that is, it may fetch the objects from remote, and it may even
update the local branch used to keep track of the remote branch
with <tt>git pull remote rbranch:lbranch</tt>, but your working tree,
-<tt>.git/HEAD</tt> pointer and index file are left intact).</p></div>
+<tt>.git/HEAD</tt> pointer and index file are left intact). In addition,
+merge always sets <tt>.git/ORIG_HEAD</tt> to the original state of HEAD so
+a problematic merge can be removed by using <tt>git reset ORIG_HEAD</tt>.</p></div>
<div class="para"><p>You may have local modifications in the working tree files. In
other words, <em>git-diff</em> is allowed to report changes.
However, the merge uses your working tree as the working area,
@@ -809,7 +811,7 @@ Resolve the conflicts. <tt>git diff</tt> would report only the </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:54 UTC
+Last updated 2008-07-15 15:48:34 UTC
</div>
</div>
</body>
|