From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Apr 2020 16:55:35 GMT
Subject: Re: [PATCH v4 1/4] gitfaq: files in .gitignore are tracked
Message-ID: <xmqqimhixmd4.fsf@gitster.c.googlers.com>
In-Reply-To: <20200429093811.8475-1-shouryashukla.oo@gmail.com>

Shourya Shukla <shouryashukla.oo@gmail.com> writes:

> Add issue in 'Common Issues' section which addresses the problem of
> Git tracking files/paths mentioned in '.gitignore'.
>
> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
> ---
>  Documentation/gitfaq.txt | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
> index 1cf83df118..b1e758ffd1 100644
> --- a/Documentation/gitfaq.txt
> +++ b/Documentation/gitfaq.txt
> @@ -223,6 +223,15 @@ a file checked into the repository which is a template or set of defaults which
>  can then be copied alongside and modified as appropriate.  This second, modified
>  file is usually ignored to prevent accidentally committing it.
>  
> +[[files-in-.gitignore-are-tracked]]
> +I asked Git to ignore various files, yet they are still tracked::
> +	A `gitignore` file specifies intentionally untracked files
> +	that Git should ignore. Files already tracked by Git are
> +	not affected. See linkgit:gitignore[5] for details.
> +	To ignore and untrack the files appearing in the staging are
> +	it is advised to use `git rm --cached <file>`as well as make
> +	the file pattern is mentioned in the '.gitignore'.

After trimming down, it got a lot more readable.  The last sentence
is not quite, though, with riddled with typos.  Also the order of
untrack/ignore and steps to achieve these two things should match in
the description.

	To untrack and ignore files, use `git rm --cached <file>`
	and add a pattern to `.gitignore` that matches the <file>.

may be the minimum fix.

Thanks.