On Tue, 2016-02-09 at 09:34 -0800, Junio C Hamano wrote: > Mikko Rapeli <mikko.rap...@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 <m...@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 <m...@mattmccutchen.net> > Acked-by: Mikko Rapeli <mikko.rap...@iki.fi> > Signed-off-by: Junio C Hamano <gits...@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:: -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
