git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matt McCutchen <matt@mattmccutchen.net>
To: Junio C Hamano <gitster@pobox.com>, Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Documentation/git-clean.txt: don't mention deletion of .git/modules/*
Date: Tue, 09 Feb 2016 12:40:56 -0500	[thread overview]
Message-ID: <1455039656.2511.177.camel@mattmccutchen.net> (raw)
In-Reply-To: <xmqqpow54wkh.fsf@gitster.mtv.corp.google.com>

On Tue, 2016-02-09 at 09:34 -0800, Junio C Hamano wrote:
> Mikko Rapeli <mikko.rapeli@iki.fi> writes:
> 
> > Sorry, can't reproduce the problem where submodules stayed in the
> > tree until
> > git clean was called with two -f's.
> > 
> > You are right in removing the second part.
> 
> Thanks, then let's do this.

Looks good except for a typo (below).  I'll try to write better commit
messages in the future.

> -- >8 --
> From: Matt McCutchen <matt@mattmccutchen.net>
> Date: Sat, 6 Feb 2016 15:25:41 -0500
> Subject: [PATCH] Documentation/git-clean.txt: don't mention deletion
> of .git/modules/*
> 
> The latter half fo

of

> this sentence, the removal of the submodules, was
> never done with (or without) double -f back when it was written, and
> we still do not do so.
> 
> Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
> Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  Documentation/git-clean.txt | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/Documentation/git-clean.txt b/Documentation/git-
> clean.txt
> index 641681f..51a7e26 100644
> --- a/Documentation/git-clean.txt
> +++ b/Documentation/git-clean.txt
> @@ -37,9 +37,7 @@ OPTIONS
>  	to false, 'git clean' will refuse to delete files or
> directories
>  	unless given -f, -n or -i. Git will refuse to delete
> directories
>  	with .git sub directory or file unless a second -f
> -	is given. This affects also git submodules where the storage
> area
> -	of the removed submodule under .git/modules/ is not removed
> until
> -	-f is given twice.
> +	is given.
>  
>  -i::
>  --interactive::

  reply	other threads:[~2016-02-09 17:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-06 20:34 [PATCH] Documentation/git-clean.txt: don't mention deletion of .git/modules/* Matt McCutchen
2016-02-06 20:25 ` Matt McCutchen
2016-02-08 22:22 ` Junio C Hamano
2016-02-08 22:36   ` Matt McCutchen
2016-02-08 22:47     ` Mikko Rapeli
2016-02-09  7:55       ` Mikko Rapeli
2016-02-09 17:34         ` Junio C Hamano
2016-02-09 17:40           ` Matt McCutchen [this message]
2016-02-08 23:50     ` 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=1455039656.2511.177.camel@mattmccutchen.net \
    --to=matt@mattmccutchen.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mikko.rapeli@iki.fi \
    /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).