diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-21 13:25:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-21 13:25:42 -0800 |
| commit | 681b036fa0461fa40f5c8caedd06579ab52e671e (patch) | |
| tree | 0ef74a29e4c3b236e50d087c516ba69e60f51b12 | |
| parent | Merge branch 'so/prompt-command' (diff) | |
| parent | git-submodule: wrap branch option with "<>" in usage strings. (diff) | |
| download | git-681b036fa0461fa40f5c8caedd06579ab52e671e.tar.gz git-681b036fa0461fa40f5c8caedd06579ab52e671e.zip | |
Merge branch 'wtk/submodule-doc-fixup'
* wtk/submodule-doc-fixup:
git-submodule: wrap branch option with "<>" in usage strings.
| -rw-r--r-- | Documentation/git-submodule.txt | 2 | ||||
| -rwxr-xr-x | git-submodule.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 1d6527ab9f..b1de3bade7 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -9,7 +9,7 @@ git-submodule - Initialize, update or inspect submodules SYNOPSIS -------- [verse] -'git submodule' [--quiet] add [-b branch] [-f|--force] [--name <name>] +'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 --git a/git-submodule.sh b/git-submodule.sh index 0522c3871a..2365149d0b 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -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] [--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>...] |