git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: git@vger.kernel.org, johannes.schindelin@gmx.de,
	Pratyush Yadav <me@yadavpratyush.com>
Subject: Re: [PATCH] doc: mention that 'git submodule update' fetches missing commits
Date: Wed, 20 Nov 2019 11:51:46 +0900	[thread overview]
Message-ID: <xmqq8sobdzul.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <9B605234-8F49-4FEB-9156-22367E01B08B@gmail.com> (Philippe Blain's message of "Mon, 18 Nov 2019 22:55:37 -0500")

Philippe Blain <levraiphilippeblain@gmail.com> writes:

> Since 'git pull’ will fetch submodules changes, and is usually
> run first, the commits are usually already there, but I think
> it’s worth mentioning that they will be fetched if they need to.
>
> I like thoroughness in software documentation :) 

Where to draw the line between being thorough and being overly
verbose with trivial things is subjective, so I generally tend to
side with status quo.  But after re-reading the updated text, I do
not think it is so bad, so let's apply it with a bit of tweak.

The lines prefixed with "++" are with my tweak, "- " are your
original changes and " -" are what was in the version before your
patch (I CC'ed Pratyush to show this as an example of what I meant
by using combined diff to express an amended commit):

$ git diff -c HEAD HEAD@{1} HEAD^
diff --combined Documentation/git-submodule.txt
index 16c765cbfa,0ed5c24dc1..4beb569ae5
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@@ -133,8 -133,7 +133,8 @@@ update [--init] [--remote] [-N|--no-fet
  +
  --
  Update the registered submodules to match what the superproject
- expects by cloning missing submodules, fetching missing submodule commits
- and updating the working tree of
 -expects by cloning missing submodules and updating the working tree of
++expects by cloning missing submodules, fetching missing commits
++in submodules and updating the working tree of
  the submodules. The "updating" can be done in several ways depending
  on command line options and the value of `submodule.<name>.update`
  configuration variable. The command line option takes precedence over

  reply	other threads:[~2019-11-20  2:51 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-15 19:24 [PATCH] git-submodule.txt: mention that 'git submodule update' fetches missing commits Philippe Blain
2019-06-20  2:09 ` [PATCH] doc: " Philippe Blain
2019-06-20 18:09   ` Junio C Hamano
2019-11-19  3:55     ` Philippe Blain
2019-11-20  2:51       ` Junio C Hamano [this message]
2019-11-24  2:01 ` [PATCH v2] " Philippe Blain
2019-11-24  6:05   ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq8sobdzul.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=levraiphilippeblain@gmail.com \
    --cc=me@yadavpratyush.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).