From fb779658e3513dfdcb8c3cc3c6b08d9c97b3cbf4 Mon Sep 17 00:00:00 2001 From: Evan Grim Date: Mon, 21 Jul 2014 23:12:46 -0500 Subject: [PATCH] Update docs to match `git-delete-merged-branches` behavior --- man/git-delete-merged-branches.1 | 12 +++--------- man/git-delete-merged-branches.html | 21 +++++++-------------- man/git-delete-merged-branches.md | 12 +++--------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/man/git-delete-merged-branches.1 b/man/git-delete-merged-branches.1 index 2c3a834..578d4cb 100644 --- a/man/git-delete-merged-branches.1 +++ b/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" . diff --git a/man/git-delete-merged-branches.html b/man/git-delete-merged-branches.html index 74af004..114d132 100644 --- a/man/git-delete-merged-branches.html +++ b/man/git-delete-merged-branches.html @@ -56,7 +56,6 @@ NAME SYNOPSIS DESCRIPTION - OPTIONS EXAMPLES AUTHOR REPORTING BUGS @@ -76,18 +75,12 @@

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

@@ -96,20 +89,20 @@

AUTHOR

-

Written by Jesús Espino <jespinog@gmail.com>

+

Written by Jesús Espino <jespinog@gmail.com>

REPORTING BUGS

-

<https://github.com/visionmedia/git-extras/issues>

+

<https://github.com/visionmedia/git-extras/issues>

SEE ALSO

-

<https://github.com/visionmedia/git-extras>

+

<https://github.com/visionmedia/git-extras>

  1. -
  2. November 2012
    3. +
  3. July 2014
  4. git-delete-merged-branches(1)
diff --git a/man/git-delete-merged-branches.md b/man/git-delete-merged-branches.md index 8faa134..0ce3f3b 100644 --- a/man/git-delete-merged-branches.md +++ b/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