summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-01-23 15:59:20 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-23 15:59:20 -0800
commit9dc7f78149407cf2659d4ea6295bad88313b2899 (patch)
tree79003ace6c333a655a9b656d43d864c5dc3011f5
parentMerge branch 'sb/submodule-config-tests' (diff)
parentsubmodule absorbgitdirs: mention in docstring help (diff)
downloadtgif-9dc7f78149407cf2659d4ea6295bad88313b2899.tar.xz
Merge branch 'sb/submodule-embed-gitdir'
Help-text fix. * sb/submodule-embed-gitdir: submodule absorbgitdirs: mention in docstring help
-rwxr-xr-xgit-submodule.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 554bd1c494..b43af1742c 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -12,7 +12,8 @@ USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <re
or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--] [<path>...]
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
or: $dashless [--quiet] foreach [--recursive] <command>
- or: $dashless [--quiet] sync [--recursive] [--] [<path>...]"
+ or: $dashless [--quiet] sync [--recursive] [--] [<path>...]
+ or: $dashless [--quiet] absorbgitdirs [--] [<path>...]"
OPTIONS_SPEC=
SUBDIRECTORY_OK=Yes
. git-sh-setup