diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-05 16:42:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-05 16:42:26 -0700 |
| commit | 91e3395c6964b309b071bf9fe79bd004c979b297 (patch) | |
| tree | 4f9891f342e552dcef22b8382233cd5d11be3115 /git-merge.html | |
| parent | 535ed7ab18f533085d95a42eb62de0626c2a1b73 (diff) | |
| download | git-htmldocs-91e3395c6964b309b071bf9fe79bd004c979b297.tar.gz | |
Autogenerated HTML docs for v1.8.4-99-gd2dbd
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/git-merge.html b/git-merge.html index 426d4bdc3..4014d8410 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1163,11 +1163,12 @@ release point, you may not want to make an unnecessary merge commit.</p></div> <div class="paragraph"><p>In such a case, you can "unwrap" the tag yourself before feeding it
to <code>git merge</code>, or pass <code>--ff-only</code> when you do not have any work on
your own. e.g.</p></div>
-<div class="paragraph"><p>---
-git fetch origin
+<div class="listingblock">
+<div class="content">
+<pre><code>git fetch origin
git merge v1.2.3^0
-git merge --ff-only v1.2.3
----</p></div>
+git merge --ff-only v1.2.3</code></pre>
+</div></div>
</div>
</div>
<div class="sect1">
@@ -1799,7 +1800,7 @@ branch.<name>.mergeoptions <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-09-05 16:41:39 PDT
</div>
</div>
</body>
|