From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH] Documentation/config: clarify the meaning of submodule.<name>.update
Date: Fri, 22 Sep 2017 14:28:18 -0700 [thread overview]
Message-ID: <20170922212818.9958-1-sbeller@google.com> (raw)
With more commands (that potentially change a submodule) paying attention
to submodules as well as the recent discussion[1] on submodule.<name>.update,
let's spell out that submodule.<name>.update is strictly to be used
for configuring the "submodule update" command and not to be obeyed
by other commands.
These other commands usually have a strict meaning of what they should
do (i.e. checkout, reset, rebase, merge) as well as have their name
overlapping with the modes possible for submodule.<name>.update.
[1] https://public-inbox.org/git/4283F0B0-BC1C-4ED1-8126-7E512D84484B@gmail.com/
Signed-off-by: Stefan Beller <sbeller@google.com>
---
Documentation/config.txt | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index dc4e3f58a2..b0ded777fe 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3085,10 +3085,9 @@ submodule.<name>.url::
See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
submodule.<name>.update::
- The default update procedure for a submodule. This variable
- is populated by `git submodule init` from the
- linkgit:gitmodules[5] file. See description of 'update'
- command in linkgit:git-submodule[1].
+ The method how a submodule is updated via 'git submodule update'.
+ It is populated by `git submodule init` from the linkgit:gitmodules[5]
+ file. See description of 'update' command in linkgit:git-submodule[1].
submodule.<name>.branch::
The remote branch name for a submodule, used by `git submodule
--
2.14.0.rc0.3.g6c2e499285
next reply other threads:[~2017-09-22 21:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 21:28 Stefan Beller [this message]
2017-09-22 21:37 ` [PATCH] Documentation/config: clarify the meaning of submodule.<name>.update Jonathan Nieder
2017-09-22 22:52 ` [PATCHv2] " Stefan Beller
2017-09-22 22:58 ` Jonathan Nieder
2017-09-23 23:52 ` Junio C Hamano
2017-09-25 19:10 ` [PATCH] Documentation: consolidate submodule.<name>.update Stefan Beller
2017-09-25 19:17 ` Brandon Williams
2017-09-25 22:18 ` Stefan Beller
2017-09-25 22:22 ` Jonathan Nieder
2017-09-25 22:42 ` Stefan Beller
2017-09-25 23:44 ` Jonathan Nieder
2017-09-26 1:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170922212818.9958-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.