From: "Uwe Kleine-König" <ukleinek@informatik.uni-freiburg.de>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: when git-rebase -i fails to cherry-pick
Date: Tue, 24 Jul 2007 00:54:02 +0200 [thread overview]
Message-ID: <20070723225402.GB22513@informatik.uni-freiburg.de> (raw)
Hello,
even though git-rebase -i is still young, I'm already a big fan of it.
I just want to suggest two minor things:
- If a cherry-pick fails, it tells me to resolve my conflicts, 'git add
<paths>' and to do 'git commit -c $sha1id'.
But it doesn't tell me, how I continue to rebase after that.
'git rebase -i --continue' works.
- If a cherry-pick of a commit to be squashed fails, the instruction to
do 'git commit -c $sha1id' is wrong, because then I don't get both
message to squash.
Best regards
Uwe
--
Uwe Kleine-König
http://www.google.com/search?q=12+mol+in+dozen
next reply other threads:[~2007-07-23 22:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-23 22:54 Uwe Kleine-König [this message]
2007-07-23 23:08 ` when git-rebase -i fails to cherry-pick Johannes Schindelin
2007-07-24 20:05 ` Uwe Kleine-König
2007-07-24 20:43 ` [PATCH] rebase -i: fix interrupted squashing Johannes Schindelin
2007-07-27 17:18 ` Johannes Schindelin
2007-07-27 19:20 ` Junio C Hamano
2007-07-27 19:35 ` Johannes Schindelin
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=20070723225402.GB22513@informatik.uni-freiburg.de \
--to=ukleinek@informatik.uni-freiburg.de \
--cc=Johannes.Schindelin@gmx.de \
--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).