From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Phillip Susi <psusi@ubuntu.com>,
Chris Packham <judge.packham@gmail.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: New directory lost by git am
Date: Wed, 05 Mar 2014 11:10:46 -0800 [thread overview]
Message-ID: <xmqqtxbch361.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140305171334.GA31252@sigill.intra.peff.net> (Jeff King's message of "Wed, 5 Mar 2014 12:13:34 -0500")
Jeff King <peff@peff.net> writes:
> But I have not thought hard about it, so maybe there is a good reason
> not to (it is a little weird just because the resulting index is a
> partial application of the patch).
Originally ".rej" was a deliberate attempt to be "not very Git but
more like 'patch'", so I wouldn't be surprised if the combination
between "--reject" and "--index" did not work, in the sense that we
did not add such a partial change to the index.
I do not offhand think of a reason to forbid the combination,
though, as long as we make sure that "git apply --index --reject"
still exits with failure to prevent a partial application to be
auto-committed.
prev parent reply other threads:[~2014-03-05 19:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-05 2:49 New directory lost by git am Phillip Susi
2014-03-05 3:08 ` Chris Packham
2014-03-05 3:22 ` Phillip Susi
2014-03-05 8:10 ` Chris Packham
2014-03-05 14:26 ` Phillip Susi
2014-03-05 16:34 ` Jeff King
2014-03-05 16:47 ` Phillip Susi
2014-03-05 17:13 ` Jeff King
2014-03-05 18:29 ` Phillip Susi
2014-03-05 19:10 ` 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=xmqqtxbch361.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=judge.packham@gmail.com \
--cc=peff@peff.net \
--cc=psusi@ubuntu.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 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.