From: Paul Sokolovsky <pmiscml@gmail.com>
To: git@vger.kernel.org
Subject: git rebase is confused about commits w/o textual changes (e.g. chmod's)
Date: Tue, 24 Sep 2013 22:56:48 +0300 [thread overview]
Message-ID: <20130924225648.48af3f4e@x34f> (raw)
Hello,
git rebase is confused about commits like
https://github.com/pfalcon/civetweb/commit/ce8493837bf7676c6d824cdcb1d5e3a7ed476fe1
- it stops, telling user to just run rebase --continue. I remember like
few years ago rebase was confused like that oftentimes, which is in turn
confused novices trying rebase-based workflow. There's big progress
over years, and it would be nice to make it just perfect.
The exact messages are:
+ git rebase --preserve-merges --onto upstream-master e61d4efbe4d34d64e6be50ad5009045e4ff06764 HEAD
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
# rebase in progress; onto a0b43ae
# You are currently rebasing.
# (all conflicts fixed: run "git rebase --continue")
#
nothing to commit, working directory clean
Could not pick 5831bf1affad12bfa3146c37b8b622ba4e584ca3
--
Best regards,
Paul mailto:pmiscml@gmail.com
next reply other threads:[~2013-09-24 19:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-24 19:56 Paul Sokolovsky [this message]
2013-09-27 22:28 ` git rebase is confused about commits w/o textual changes (e.g. chmod's) brian m. carlson
2013-09-27 23:32 ` Paul Sokolovsky
2013-10-04 20:28 ` brian m. carlson
2013-10-04 20:45 ` Paul Sokolovsky
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=20130924225648.48af3f4e@x34f \
--to=pmiscml@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).