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

[REQ] Better error reporting when git rebase cannot rebase

From
Jake Goulding <goulding@vivisimo.com>
Date
Apr 2, 2008, 15:44 UTC
Message-ID
<47F3A9CA.9090307@vivisimo.com>

Right now, if you have modified files in the working directory and attempt to do a git rebase, you will see messages like:

$ git rebase origin/master
Makefile: needs update

However, it isn't always clear that that means the rebase *did not work*. This has bitten a few of my developers a few times when they think that a rebase worked and that they need to perform some sort of "update" to the files in question.

I would suggest making this more explicit:
$ git rebase origin/master
* error: rebasing branch master on branch origin/master failed
Makefile: uncommitted changes would be overwritten
Thanks!
-Jake
Next: Jeff King
Message 1 of 3 in “[REQ] Better error reporting when git rebase cannot rebase”
  1. Jake GouldingApr 2, 2008
  2. Jeff KingApr 3, 2008
  3. Jake GouldingApr 3, 2008

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.