* git-am and git-rebase inconsistency
@ 2007-01-19 23:53 David Kågedal
2007-01-20 0:25 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: David Kågedal @ 2007-01-19 23:53 UTC (permalink / raw)
To: git
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...
--
David Kågedal
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git-am and git-rebase inconsistency
2007-01-19 23:53 git-am and git-rebase inconsistency David Kågedal
@ 2007-01-20 0:25 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2007-01-20 0:25 UTC (permalink / raw)
To: David Kågedal; +Cc: git
David Kågedal <davidk@lysator.liu.se> writes:
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-01-20 0:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-19 23:53 git-am and git-rebase inconsistency David Kågedal
2007-01-20 0:25 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox