git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: New directory lost by git am

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 5, 2014, 19:10 UTC
Message-ID
<xmqqtxbch361.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20140305171334.GA31252@sigill.intra.peff.net>
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.

Previous: Phillip Susi
Message 10 of 10 in “New directory lost by git am”
  1. Phillip SusiMar 5, 2014
  2. Chris PackhamMar 5, 2014
  3. Phillip SusiMar 5, 2014
  4. Chris PackhamMar 5, 2014
  5. Phillip SusiMar 5, 2014
  6. Jeff KingMar 5, 2014
  7. Phillip SusiMar 5, 2014
  8. Jeff KingMar 5, 2014
  9. Phillip SusiMar 5, 2014
  10. Junio C HamanoMar 5, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.