path: root/
diff options
authorJunio C Hamano <>2006-10-23 05:40:30 (GMT)
committerJunio C Hamano <>2006-10-23 05:40:30 (GMT)
commit02a20456d2c5efccbdd0093ad2a16134f160c218 (patch)
tree7377c60146663d9a6402d6742be92591eefa07b2 /
parent87b787ac77e0d8f81468dcba2a39c9d0287870c3 (diff)
parent0abc0260fa3419de649fcc1444e3d256a17ca6c7 (diff)
Merge branch 'maint'
* maint: pager: default to LESS=FRSX not LESS=FRS Make prune also run prune-packed git-vc: better installation instructions gitweb: Do not esc_html $basedir argument to git_print_tree_entry gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2) Fix usagestring for git-branch git-merge: show usage if run without arguments
Diffstat (limited to '')
1 files changed, 1 insertions, 1 deletions
diff --git a/ b/
index 4f31903..f823c78 100755
--- a/
+++ b/
@@ -1,6 +1,6 @@
-USAGE='[-l] [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]] | -r'
+USAGE='[-l] [-f] <branchname> [<start-point>] | (-d | -D) <branchname> | [-r]'
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>.'