diff options
author | Stefan Beller <sbeller@google.com> | 2017-09-22 15:52:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-24 10:41:47 +0900 |
commit | d3a44f637ecb0a4033e521a4166710aa2f080796 (patch) | |
tree | ee436711b41228565ef2dc046f8d094dfc4b22ba /compat/strcasestr.c | |
parent | Merge branch 'jk/leak-checkers' (diff) | |
download | tgif-d3a44f637ecb0a4033e521a4166710aa2f080796.tar.xz |
Documentation/config: clarify the meaning of submodule.<name>.update
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/
submodule.<name>.update was set to "none", triggering unexpected
behavior as the submodule was thought to never be touched.
However a newer version of Git taught 'git pull --rebase' to also
populate and rebase submodules if they were active.
The newer options such as submodule.active and command specific
flags would not have triggered unexpected behavior.
Reported-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/strcasestr.c')
0 files changed, 0 insertions, 0 deletions