summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Dale R. Worley <worley@alum.mit.edu>2013-05-15 18:28:39 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-16 12:01:31 -0700
commit3244eb9b5a6f0b5a06d20c06dbb34739fa3b043a (patch)
treed7f317a1736688976bf9055e0f211130ff642d20 /Documentation/git-merge.txt
parentremote-bzr: fix cloning of non-listable repos (diff)
downloadtgif-3244eb9b5a6f0b5a06d20c06dbb34739fa3b043a.tar.xz
git-submodule.txt: Clarify 'init' and 'add' subcommands.
Describe how 'add' sets the submodule's logical name, which is used in the configuration entry names. Clarify that 'init' only sets up the configuration entries for submodules that have already been added elsewhere. Describe that <path> arguments limit the submodules that are configured. Signed-off-by: Dale Worley <worley@ariadne.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions