Merge pull request #240 from egrim/bug/delete-merged-branches-clobbers-master

Exempt `master` from being deleted by `git-delete-merged-branches`.

Author: hemanth

bin/git-delete-merged-branches

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-git branch --merged | grep -v "\*" | xargs -n 1 git branch -d
+git branch --merged | grep -v "\*" | grep -v master | xargs -n 1 git branch -d

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"
 .

man/git-delete-merged-branches.html

@@ -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