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

Re: [PATCH] git-am: create a config setting for reject control.

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 29, 2010, 16:20 UTC
Message-ID
<7vlj5h6kda.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1288315650-2488-1-git-send-email-paul.gortmaker@windriver.com>
Paul Gortmaker <paul.gortmaker@windriver.com> writes:
> git am already accepts a "--reject" switch, which basically means
> apply the bits you can, but you can't set it as enabled by default
> currently.

Does this work correctly with all four combinations of (have/do not have) config, (have/do not have) command line option, when "am" stops in the middle due to conflict and you say "git am --continue" after dealing with the first such conflict? The first choice needs to be remembered and used.

Previous: Jonathan Nieder
Message 3 of 3 in “git-am: create a config setting for reject control.”
  1. git-am: create a config setting for reject control.Paul Gortmaker, Oct 29, 2010
  2. Jonathan NiederOct 29, 2010
  3. Junio C HamanoOct 29, 2010

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.