All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: Matt McCutchen <matt@mattmccutchen.net>, git@vger.kernel.org
Subject: Re: [PATCH] Documentation/git-clean.txt: don't mention deletion of .git/modules/*
Date: Tue, 09 Feb 2016 09:34:22 -0800	[thread overview]
Message-ID: <xmqqpow54wkh.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160209075553.GI6104@lakka.kapsi.fi> (Mikko Rapeli's message of "Tue, 9 Feb 2016 09:55:53 +0200")

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.

-- >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 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::
-- 
2.7.1-358-gd2e280b

  reply	other threads:[~2016-02-09 17:34 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 [this message]
2016-02-09 17:40           ` Matt McCutchen
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=xmqqpow54wkh.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=matt@mattmccutchen.net \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.