From: Junio C Hamano <gitster@pobox•com>
To: Jens Lehmann <Jens.Lehmann@web•de>
Cc: git@vger•kernel.org, Michal Sojka <sojkam1@fel•cvut.cz>
Subject: Re: [PATCH] submodule: Fix documentation of update subcommand
Date: Mon, 03 Nov 2014 11:02:42 -0800 [thread overview]
Message-ID: <xmqqegtkrtt9.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1415009391-14979-1-git-send-email-sojkam1@fel.cvut.cz> (Michal Sojka's message of "Mon, 3 Nov 2014 11:09:51 +0100")
Michal Sojka <sojkam1@fel•cvut.cz> writes:
> The documentation says that submodule.$name.update can be overridden by
> --checkout only if its value is `none`. This is not true, because both
> implementation and documentation of --checkout specifies that the
> override applies to all possible values.
>
> Signed-off-by: Michal Sojka <sojkam1@fel•cvut.cz>
> ---
> Documentation/git-submodule.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
> index 8e6af65..84ab577 100644
> --- a/Documentation/git-submodule.txt
> +++ b/Documentation/git-submodule.txt
> @@ -158,7 +158,7 @@ update::
> checkout the commit specified in the index of the containing repository.
> This will make the submodules HEAD be detached unless `--rebase` or
> `--merge` is specified or the key `submodule.$name.update` is set to
> - `rebase`, `merge` or `none`. `none` can be overridden by specifying
> + `rebase`, `merge` or `none`. This can be overridden by specifying
> `--checkout`. Setting the key `submodule.$name.update` to `!command`
> will cause `command` to be run. `command` can be any arbitrary shell
> command that takes a single argument, namely the sha1 to update to.
Thanks. This looks sensible, judging only from the text (iow I
didn't check if there were legitimate reason why rebase/merge
settings should not be overriden from the command line).
Jens?
next prev parent reply other threads:[~2014-11-03 19:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-03 10:09 [PATCH] submodule: Fix documentation of update subcommand Michal Sojka
2014-11-03 19:02 ` Junio C Hamano [this message]
2014-11-03 20:38 ` Jens Lehmann
2014-11-03 21:35 ` Junio C Hamano
2014-11-03 22:55 ` Michal Sojka
2014-11-03 23:08 ` Junio C Hamano
2014-11-04 20:22 ` Jens Lehmann
2014-11-04 20:56 ` Junio C Hamano
2014-11-03 20:53 ` Junio C Hamano
2014-11-03 20:58 ` Jens Lehmann
2015-02-17 22:45 ` Junio C Hamano
2015-02-18 22:48 ` [PATCH v2] " Michal Sojka
2015-02-18 23:44 ` Junio C Hamano
2015-02-19 17:54 ` Michal Sojka
2015-02-19 18:52 ` [PATCH v3] submodule: Improve " Michal Sojka
2015-02-20 23:31 ` Junio C Hamano
2015-02-23 13:31 ` Michal Sojka
2015-02-23 13:32 ` [PATCH] " Michal Sojka
2015-02-23 20:13 ` Junio C Hamano
2015-02-23 20:25 ` Junio C Hamano
2015-03-02 22:39 ` Michal Sojka
2015-03-02 22:42 ` [PATCH v5] " Michal Sojka
2015-03-02 22:57 ` [PATCH v6] " Michal Sojka
2015-03-02 23:05 ` Junio C Hamano
2014-11-03 21:15 ` [PATCH] submodule: Fix " Michal Sojka
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=xmqqegtkrtt9.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=sojkam1@fel$(echo .)cvut.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox