From: Junio C Hamano <junkio@cox.net>
To: "David Kågedal" <davidk@lysator.liu.se>
Cc: git@vger.kernel.org
Subject: Re: git-am and git-rebase inconsistency
Date: Fri, 19 Jan 2007 16:25:26 -0800 [thread overview]
Message-ID: <7vzm8ebl3d.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <873b66infc.fsf@morpheus.local> (David Kågedal's message of "Sat, 20 Jan 2007 00:53:11 +0100")
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.
prev parent reply other threads:[~2007-01-20 0:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-19 23:53 git-am and git-rebase inconsistency David Kågedal
2007-01-20 0:25 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vzm8ebl3d.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=davidk@lysator.liu.se \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.