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

Re: git-am and git-rebase inconsistency

From
Junio C Hamano <junkio@cox.net>
Date
Jan 20, 2007, 00:25 UTC
Message-ID
<7vzm8ebl3d.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<873b66infc.fsf@morpheus.local>
David Kågedal <davidk@lysator.liu.se> writes:
Show 10 quoted lines
> The git-am and git-rebase commands have some similarities in that both
> try to apply patches and may fail in the middle.  Both commands can be
> rerun to continue the application.  The --skip option is used in both
> to skip one patch, but when a conflict has been resolved, git-rebase
> uses --continue, and git-am uses --resolved for what seems to me to be
> the equivalent action.
>
> It would probably be good, although not terribly important, if these
> commands were change to be in harmony.  But I'm not sure which option
> I like best...

Well, git-rebase did not have any options like them in the beginning, so a logical option would be to add --resolved as a synonym to the latter.

Previous: David Kågedal
Message 2 of 2 in “git-am and git-rebase inconsistency”
  1. David KågedalJan 19, 2007
  2. Junio C HamanoJan 20, 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.