From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2012 21:25:42 +0000 (-0800)
Subject: Merge branch 'wtk/submodule-doc-fixup'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=681b036fa0461fa40f5c8caedd06579ab52e671e;p=git.git

Merge branch 'wtk/submodule-doc-fixup'

* wtk/submodule-doc-fixup:
  git-submodule: wrap branch option with "<>" in usage strings.
---

681b036fa0461fa40f5c8caedd06579ab52e671e
diff --cc Documentation/git-submodule.txt
index 1d6527ab9,a65f38e18..b1de3bade
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@@ -9,7 -9,7 +9,7 @@@ git-submodule - Initialize, update or i
  SYNOPSIS
  --------
  [verse]
- 'git submodule' [--quiet] add [-b branch] [-f|--force] [--name <name>]
 -'git submodule' [--quiet] add [-b <branch>] [-f|--force]
++'git submodule' [--quiet] add [-b <branch>] [-f|--force] [--name <name>]
  	      [--reference <repository>] [--] <repository> [<path>]
  'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
  'git submodule' [--quiet] init [--] [<path>...]
diff --cc git-submodule.sh
index 0522c3871,02f82e9ed..2365149d0
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -5,7 -5,7 +5,7 @@@
  # Copyright (c) 2007 Lars Hjemli
  
  dashless=$(basename "$0" | sed -e 's/-/ /')
- USAGE="[--quiet] add [-b branch] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
 -USAGE="[--quiet] add [-b <branch>] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
++USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
     or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
     or: $dashless [--quiet] init [--] [<path>...]
     or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]