summaryrefslogtreecommitdiffstats
path: root/git-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-20 15:45:24 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-20 15:45:24 +0900
commitf7e3f4720248d8f301f1a9d734940ac233333bfd (patch)
tree9218fcdf9a6a2d6c5ce3604024f3a30ff09d6eb1 /git-branch.html
parentbadd79c219fe0283e7e2a448cc04da89724eefd9 (diff)
downloadgit-htmldocs-f7e3f4720248d8f301f1a9d734940ac233333bfd.tar.gz
Autogenerated HTML docs for v2.15.0-rc2
Diffstat (limited to 'git-branch.html')
-rw-r--r--git-branch.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-branch.html b/git-branch.html
index b0e6f3c13..5063da40e 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -866,8 +866,8 @@ way to clean up all obsolete remote-tracking branches.</p></div>
</dt>
<dd>
<p>
- Reset &lt;branchname&gt; to &lt;startpoint&gt; if &lt;branchname&gt; exists
- already. Without <code>-f</code> <em>git branch</em> refuses to change an existing branch.
+ Reset &lt;branchname&gt; to &lt;startpoint&gt;, even if &lt;branchname&gt; exists
+ already. Without <code>-f</code>, <em>git branch</em> refuses to change an existing branch.
In combination with <code>-d</code> (or <code>--delete</code>), allow deleting the
branch irrespective of its merged status. In combination with
<code>-m</code> (or <code>--move</code>), allow renaming the branch even if the new
@@ -1336,7 +1336,7 @@ a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-10-03 16:10:36 JST
+Last updated 2017-10-20 15:42:50 JST
</div>
</div>
</body>