Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update docs to match `git-delete-merged-branches` behavior

  • Loading branch information...
commit fb779658e3513dfdcb8c3cc3c6b08d9c97b3cbf4 1 parent 36596a3
@egrim egrim authored
View
12 man/git-delete-merged-branches.1
@@ -1,22 +1,16 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "GIT\-DELETE\-MERGED\-BRANCHES" "1" "November 2012" "" "Git Extras"
+.TH "GIT\-DELETE\-MERGED\-BRANCHES" "1" "July 2014" "" "Git Extras"
.
.SH "NAME"
\fBgit\-delete\-merged\-branches\fR \- Delete merged branches
.
.SH "SYNOPSIS"
-\fBgit\-delete\-merged\-branches\fR [\-f|\-\-force]
+\fBgit\-delete\-merged\-branches\fR
.
.SH "DESCRIPTION"
-Deletes all branches merged into current HEAD\. Does not delete \fImaster\fR, even if ran from a branch that is \fImaster\fR descendant\. Asks before deleting anything, unless it is run with \fI\-\-force\fR option\.
-.
-.SH "OPTIONS"
-\-f, \-\-force
-.
-.P
-Delete merged branches without asking user for confirmation\.
+Deletes all branches merged into current HEAD\. Does not delete \fImaster\fR, even if run from a branch that is a descendant of \fImaster\fR\.
.
.SH "EXAMPLES"
.
View
21 man/git-delete-merged-branches.html
@@ -56,7 +56,6 @@
<a href="#NAME">NAME</a>
<a href="#SYNOPSIS">SYNOPSIS</a>
<a href="#DESCRIPTION">DESCRIPTION</a>
- <a href="#OPTIONS">OPTIONS</a>
<a href="#EXAMPLES">EXAMPLES</a>
<a href="#AUTHOR">AUTHOR</a>
<a href="#REPORTING-BUGS">REPORTING BUGS</a>
@@ -76,18 +75,12 @@ <h2 id="NAME">NAME</h2>
<h2 id="SYNOPSIS">SYNOPSIS</h2>
-<p><code>git-delete-merged-branches</code> [-f|--force]</p>
+<p><code>git-delete-merged-branches</code></p>
<h2 id="DESCRIPTION">DESCRIPTION</h2>
-<p> Deletes all branches merged into current HEAD. Does not delete <em>master</em>, even if ran from a branch that is
- <em>master</em> descendant. Asks before deleting anything, unless it is run with <em>--force</em> option.</p>
-
-<h2 id="OPTIONS">OPTIONS</h2>
-
-<p> -f, --force</p>
-
-<p> Delete merged branches without asking user for confirmation.</p>
+<p> Deletes all branches merged into current HEAD. Does not delete <em>master</em>, even if run from a branch that is
+ a descendant of <em>master</em>.</p>
<h2 id="EXAMPLES">EXAMPLES</h2>
@@ -96,20 +89,20 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Written by Jesús Espino &lt;<a data-bare-link="true" href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#106;&#101;&#115;&#112;&#105;&#x6e;&#111;&#103;&#64;&#103;&#x6d;&#x61;&#105;&#108;&#x2e;&#99;&#x6f;&#109;">&#x6a;&#x65;&#x73;&#112;&#x69;&#x6e;&#x6f;&#103;&#64;&#103;&#x6d;&#x61;&#x69;&#x6c;&#x2e;&#x63;&#x6f;&#109;</a>&gt;</p>
+<p>Written by Jesús Espino &lt;<a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#58;&#x6a;&#101;&#x73;&#112;&#105;&#110;&#x6f;&#x67;&#64;&#x67;&#109;&#97;&#x69;&#x6c;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#101;&#x73;&#x70;&#105;&#110;&#111;&#x67;&#64;&#x67;&#x6d;&#x61;&#x69;&#x6c;&#x2e;&#99;&#x6f;&#109;</a>&gt;</p>
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
-<p>&lt;<a data-bare-link="true" href="https://github.com/visionmedia/git-extras/issues">https://github.com/visionmedia/git-extras/issues</a>&gt;</p>
+<p>&lt;<a href="https://github.com/visionmedia/git-extras/issues" data-bare-link="true">https://github.com/visionmedia/git-extras/issues</a>&gt;</p>
<h2 id="SEE-ALSO">SEE ALSO</h2>
-<p>&lt;<a data-bare-link="true" href="https://github.com/visionmedia/git-extras">https://github.com/visionmedia/git-extras</a>&gt;</p>
+<p>&lt;<a href="https://github.com/visionmedia/git-extras" data-bare-link="true">https://github.com/visionmedia/git-extras</a>&gt;</p>
<ol class='man-decor man-foot man foot'>
<li class='tl'></li>
- <li class='tc'>November 2012</li>
+ <li class='tc'>July 2014</li>
<li class='tr'>git-delete-merged-branches(1)</li>
</ol>
View
12 man/git-delete-merged-branches.md
@@ -3,18 +3,12 @@ git-delete-merged-branches(1) -- Delete merged branches
## SYNOPSIS
-`git-delete-merged-branches` [-f|--force]
+`git-delete-merged-branches`
## DESCRIPTION
- Deletes all branches merged into current HEAD. Does not delete *master*, even if ran from a branch that is
- *master* descendant. Asks before deleting anything, unless it is run with _--force_ option.
-
-## OPTIONS
-
- -f, --force
-
- Delete merged branches without asking user for confirmation.
+ Deletes all branches merged into current HEAD. Does not delete *master*, even if run from a branch that is
+ a descendant of *master*.
## EXAMPLES
Please sign in to comment.
Something went wrong with that request. Please try again.