From: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Date: Mon, 23 Jul 2007 22:54:02 GMT
Subject: when git-rebase -i fails to cherry-pick
Message-ID: <20070723225402.GB22513@informatik.uni-freiburg.de>

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