git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michal Sojka <sojkam1@fel.cvut.cz>
To: git@vger.kernel.org
Cc: Jens Lehmann <Jens.Lehmann@web.de>, Michal Sojka <sojkam1@fel.cvut.cz>
Subject: [PATCH] submodule: Fix documentation of update subcommand
Date: Mon,  3 Nov 2014 11:09:51 +0100	[thread overview]
Message-ID: <1415009391-14979-1-git-send-email-sojkam1@fel.cvut.cz> (raw)

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.
-- 
2.1.1

             reply	other threads:[~2014-11-03 10:10 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-03 10:09 Michal Sojka [this message]
2014-11-03 19:02 ` [PATCH] submodule: Fix documentation of update subcommand Junio C Hamano
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=1415009391-14979-1-git-send-email-sojkam1@fel.cvut.cz \
    --to=sojkam1@fel.cvut.cz \
    --cc=Jens.Lehmann@web.de \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).