From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Jan 2017 23:59:20 +0000 (-0800)
Subject: Merge branch 'sb/submodule-embed-gitdir'
X-Git-Tag: v2.12.0-rc0~52
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9dc7f78149407cf2659d4ea6295bad88313b2899?ds=inline;hp=-c

Merge branch 'sb/submodule-embed-gitdir'

Help-text fix.

* sb/submodule-embed-gitdir:
submodule absorbgitdirs: mention in docstring help
---

9dc7f78149407cf2659d4ea6295bad88313b2899
diff --combined git-submodule.sh
index 554bd1c494,56bb3737e5..b43af1742c
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -12,7 -12,8 +12,8 @@@ USAGE="[--quiet] add [-b <branch>] [-f|
     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
@@@ -21,10 -22,14 +22,10 @@@ require_work_tre
  wt_prefix=$(git rev-parse --show-prefix)
  cd_to_toplevel
  
 -# Restrict ourselves to a vanilla subset of protocols; the URLs
 -# we get are under control of a remote repository, and we do not
 -# want them kicking off arbitrary git-remote-* programs.
 -#
 -# If the user has already specified a set of allowed protocols,
 -# we assume they know what they're doing and use that instead.
 -: ${GIT_ALLOW_PROTOCOL=file:git:http:https:ssh}
 -export GIT_ALLOW_PROTOCOL
 +# Tell the rest of git that any URLs we get don't come
 +# directly from the user, so it can apply policy as appropriate.
 +GIT_PROTOCOL_FROM_USER=0
 +export GIT_PROTOCOL_FROM_USER
  
  command=
  branch=