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

Re: [PATCH] add -C[NUM] to git-am

From
Junio C Hamano <junkio@cox.net>
Date
Feb 7, 2007, 20:23 UTC
Message-ID
<7vejp17m3t.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20070207201511.GF12140@mellanox.co.il>
"Michael S. Tsirkin" <mst@mellanox.co.il> writes:
Show 11 quoted lines
> Add -C[NUM] to git-am so that patches can be applied even
> if context has changed a bit.
>
> Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
>
> ---
>
> I just had to apply a largish number of patches on a project
> that has evolved since, and I found the following to be useful.
>
> What do others think.

FWIW, I am in favor although I do not foresee myself ever using it. However, this has slight ramifications.

 - we will be keeping applymbox after all.  shouldn't this be
   side-ported to it?
 - am is used as a workhorse for rebase.  shouldn't this be
   accessible through its command line as well?
The same goes for Andy's --patchdepth thing.
Previous: Michael S. TsirkinNext: Michael S. Tsirkin
Message 2 of 11 in “add -C[NUM] to git-am”
  1. add -C[NUM] to git-amMichael S. Tsirkin, Feb 7, 2007
  2. Junio C HamanoFeb 7, 2007
  3. Michael S. TsirkinFeb 7, 2007
  4. Junio C HamanoFeb 8, 2007
  5. Jakub NarebskiFeb 8, 2007
  6. Michael S. TsirkinFeb 8, 2007
  7. Junio C HamanoFeb 8, 2007
  8. Johannes SchindelinFeb 7, 2007
  9. Jakub NarebskiFeb 7, 2007
  10. Johannes SchindelinFeb 8, 2007
  11. Junio C HamanoFeb 8, 2007

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.