From: Sam Lee <skynare@gmail.com>
To: git@vger.kernel.org
Subject: Reverting a range of commits with conflict
Date: Mon, 1 Apr 2019 13:25:54 -0400 [thread overview]
Message-ID: <CACrt3pyZ7XNHLfFM46qymLYft4+jXSU_HBD2Wk+cL6MSzryFhA@mail.gmail.com> (raw)
Given:
A-B-C-D-E (HEAD)
I want to create a single commit that reverts A-B-C
So, I execute:
git revert --no-commit A~..C
which causes conflict (while reverting C, it seems).
I resolve conflicts and I continue:
git revert --continue --no-commit
And, it complains:
fatal: revert: --no-commit cannot be used with --continue
If I revert --continue without --no-commit:
git revert --continue
It brings up EDITOR twice and I end up with two commits.
I can squash them. But, I don't know if this is a desired behavior.
Should I be able to revert --continue with --no-commit?
Should revert --continue remember that initial revert invocation was
with --no-commit option?
Thanks.
next reply other threads:[~2019-04-01 17:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 17:25 Sam Lee [this message]
2019-04-02 0:50 ` Reverting a range of commits with conflict 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=CACrt3pyZ7XNHLfFM46qymLYft4+jXSU_HBD2Wk+cL6MSzryFhA@mail.gmail.com \
--to=skynare@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).