git/list[1] front-page[2] threads[3] people[4] search[5] about
 

when git-rebase -i fails to cherry-pick

From
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Date
Jul 23, 2007, 22:54 UTC
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
Next: Johannes Schindelin
Message 1 of 7 in “when git-rebase -i fails to cherry-pick”
  1. Uwe Kleine-KönigJul 23, 2007
  2. Johannes SchindelinJul 23, 2007
  3. Uwe Kleine-KönigJul 24, 2007
  4. rebase -i: fix interrupted squashingJohannes Schindelin, Jul 24, 2007
  5. Johannes SchindelinJul 27, 2007
  6. Junio C HamanoJul 27, 2007
  7. Johannes SchindelinJul 27, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.