From: "David Kågedal" <davidk@lysator.liu.se>
To: git@vger.kernel.org
Subject: git-am and git-rebase inconsistency
Date: Sat, 20 Jan 2007 00:53:11 +0100 [thread overview]
Message-ID: <873b66infc.fsf@morpheus.local> (raw)
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
next reply other threads:[~2007-01-19 23:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-19 23:53 David Kågedal [this message]
2007-01-20 0:25 ` git-am and git-rebase inconsistency Junio C Hamano
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=873b66infc.fsf@morpheus.local \
--to=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox