X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-branch.sh;h=6ac961e6d18b8419abdaa5ed57a55ef58f7bc0fb;hb=289c4b36e336af5266b86d924ef0aa828e8e4841;hp=0266f46223c2f20973bbbcb78f4825ff880d9bd3;hpb=b0d3e9baaa16c805ef941e8f26d55fb23f091ef5;p=git.git

diff --git a/git-branch.sh b/git-branch.sh
index 0266f462..6ac961e6 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-USAGE='[-d <branch>] | [[-f] <branch> [start-point]]'
+USAGE='[(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]'
 LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
 If one argument, create a new branch <branchname> based off of current HEAD.
 If two arguments, create a new branch <branchname> based off of <start-point>.'
@@ -32,11 +32,11 @@ delete_branch () {
 	    case " $mbs " in
 	    *' '$branch' '*)
 		# the merge base of branch and HEAD contains branch --
-		# which means that the HEAD contains everything in the HEAD.
+		# which means that the HEAD contains everything in both.
 		;;
 	    *)
 		echo >&2 "The branch '$branch_name' is not a strict subset of your current HEAD.
-    If you are sure you want to delete it, run 'git branch -D $branch_name'."
+If you are sure you want to delete it, run 'git branch -D $branch_name'."
 		exit 1
 		;;
 	    esac