git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Shourya Shukla <shouryashukla.oo@gmail.com>
Cc: git@vger.kernel.org, sandals@crustytoothpaste.net, newren@gmail.com
Subject: Re: [PATCH v5 1/4] gitfaq: files in .gitignore are tracked
Date: Mon, 04 May 2020 09:41:29 -0700	[thread overview]
Message-ID: <xmqqimhbhcue.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200504054223.11125-1-shouryashukla.oo@gmail.com> (Shourya Shukla's message of "Mon, 4 May 2020 11:12:20 +0530")

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>
> ---
> Thank you Junio and Elijah for the review! :)
> I have tried to make the solutions to the issues as concise and crisp
> as possible, linking the Documentation wherever necessary. Also, I have
> converted 1SP -> 2 SP after full stops(.).

Indeed I find it concise and very much to the point.  Looks quite
well written.

Thanks, will queue (and please ping me if I forget ;-))

>
>  Documentation/gitfaq.txt | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
> index 1cf83df118..11d9bac859 100644
> --- a/Documentation/gitfaq.txt
> +++ b/Documentation/gitfaq.txt
> @@ -223,6 +223,16 @@ 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 ensures that certain file(s) which are not
> +	tracked by Git remain untracked.  However, sometimes particular
> +	file(s) may have been tracked before adding them into the
> +	`.gitignore`, hence they still remain tracked.  To untrack and
> +	ignore files/patterns, use `git rm --cached <file/pattern>`
> +	and add a pattern to `.gitignore` that matches the <file>.
> +	See linkgit:gitignore[5] for details.
> +
>  Hooks
>  -----

      parent reply	other threads:[~2020-05-04 16:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-04  5:42 [PATCH v5 1/4] gitfaq: files in .gitignore are tracked Shourya Shukla
2020-05-04  5:42 ` [PATCH v5 2/4] gitfaq: changing the remote of a repository Shourya Shukla
2020-05-04  5:42 ` [PATCH v5 3/4] gitfaq: shallow cloning " Shourya Shukla
2020-05-04 17:11   ` Elijah Newren
2020-05-04  5:42 ` [PATCH v5 4/4] gitfaq: fetching and pulling " Shourya Shukla
2020-05-04 16:42   ` Elijah Newren
2020-05-04 16:41 ` Junio C Hamano [this message]

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=xmqqimhbhcue.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=sandals@crustytoothpaste.net \
    --cc=shouryashukla.oo@gmail.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.
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).