diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-01-15 06:12:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-01-15 06:12:45 +0000 |
| commit | edd2b0a4fa552d711bcf7561dead9c6c87146701 (patch) | |
| tree | e80c32034830f1b7e1d426c595e242567eccc386 /git-reset.html | |
| parent | ffaf0e26d2f1796fd1763b4a8817b8f12339bace (diff) | |
| download | git-htmldocs-edd2b0a4fa552d711bcf7561dead9c6c87146701.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc1-g5fe3
Diffstat (limited to 'git-reset.html')
| -rw-r--r-- | git-reset.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/git-reset.html b/git-reset.html index d331aba3f..86fcfd3b5 100644 --- a/git-reset.html +++ b/git-reset.html @@ -468,10 +468,6 @@ Undo a merge or pull <div class="listingblock">
<div class="content">
<pre><tt>$ git pull <b>(1)</b>
-Trying really trivial in-index merge...
-fatal: Merge requires file-level merging
-Nope.
-...
Auto-merging nitfol
CONFLICT (content): Merge conflict in nitfol
Automatic merge failed/prevented; fix up by hand
@@ -570,7 +566,7 @@ At this point the index file still has all the WIP changes you </div>
<div id="footer">
<div id="footer-text">
-Last updated 26-Dec-2006 09:11:35 UTC
+Last updated 15-Jan-2007 06:12:34 UTC
</div>
</div>
</body>
|