diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-27 13:28:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-27 13:28:18 -0800 |
| commit | 2207e104abc5233b5ad671448b4c653db3c0faba (patch) | |
| tree | 9385ebaf6edad4175bc5ab288d21e4dff67e40e8 | |
| parent | Documentation: improve phrasing in git-push.txt (diff) | |
| parent | git-submodule: wrap branch option with "<>" in usage strings. (diff) | |
| download | tgif-2207e104abc5233b5ad671448b4c653db3c0faba.tar.xz | |
Merge branch 'wtk/submodule-doc-fixup' into maint
* 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 b4683bba1b..a65f38e184 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] +'git submodule' [--quiet] add [-b <branch>] [-f|--force] [--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 ab6b1107b6..02f82e9ed5 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] [--reference <repository>] [--] <repository> [<path>] +USAGE="[--quiet] add [-b <branch>] [-f|--force] [--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>...] |