From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Rupinderjeet Singh <rupinderjeet47@gmail.com>, git@vger.kernel.org
Subject: Re: [suggestion] Fail cherry-pick if it overwrites untracked files with the matching file names
Date: Sun, 16 Oct 2022 09:57:54 -0700 [thread overview]
Message-ID: <xmqqo7ub4sfh.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BG=pm8gfRZNW8Rk1V77s40Do1FZy0mxH6epubHbzF8U5w@mail.gmail.com> (Elijah Newren's message of "Sat, 15 Oct 2022 19:07:45 -0700")
Elijah Newren <newren@gmail.com> writes:
> There is a command line option meant to allow tweaking this behavior:
> --[no-]overwrite-ignore.
Ah, I totally forgot that relatively recent invention. Thanks for
bringing it up.
I personally consider it a bit too blunt an instrument, and in the
longer term, it would probably be a better direction to introduce a
new class of paths that are not tracked, and call the class
"precious", which (1) is similar to "ignored" in that the paths in
the class do not get added with "git add ." but (2) unlike "ignored"
but like "untracked", they are not considered to be expendable.
Until that happens, though, treating all "ignored" paths as if they
are "precious" may be a usable workaround.
prev parent reply other threads:[~2022-10-16 16:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-15 18:09 [suggestion] Fail cherry-pick if it overwrites untracked files with the matching file names Rupinderjeet Singh
2022-10-15 18:33 ` Junio C Hamano
2022-10-15 18:35 ` Junio C Hamano
2022-10-15 19:09 ` Rupinderjeet Singh
2022-10-16 17:08 ` Junio C Hamano
2022-10-16 2:07 ` Elijah Newren
2022-10-16 16:57 ` 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=xmqqo7ub4sfh.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=rupinderjeet47@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).