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

A call for better git-rebase messages

From
Jakub Narebski <jnareb@gmail.com>
Date
Dec 19, 2006, 10:17 UTC
Message-ID
<em8e32$s7b$1@sea.gmane.org>
 $ git rebase abort
 mkdir: cannot create directory `.dotest': File exists
 It seems that I cannot create a .dotest directory, and I wonder if you
 are in the middle of patch application or another rebase.  If that is not
 the case, please rm -fr .dotest and run me again.  I am stopping in case
 you still have something valuable there.

Why we do not tell to run "git rebase --abort" here? I think the command know that it is a middle of git-rebase, not the middle of git-am...

 $ git rebase --onto origin next gitweb/web
 Nothing to do.

I'm not sure, but I think gitweb/web which was empty branch based off former next is now empty branch based off current gitweb, i.e. at least head of this branch has changed... but I'm not sure because

 $ git rebase --abort

is _not_ recorded as such, but as "reset --hard ORIG_HEAD" (I think). It looks like it is, because after "reset --hard ORIG_HEAD" (which was result of "git rebase --abort" of "git rebase origin" (I forgot gitweb/web was based off other branch) there is "reset --hard <sha1>", and this sha1 is sha1 of both gitweb/web and origin.

I'd rather rebase told me that it did something (moved head), but there are no patches to be applied.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Next: Junio C Hamano
Message 1 of 2 in “A call for better git-rebase messages”
  1. Jakub NarebskiDec 19, 2006
  2. Junio C HamanoDec 19, 2006

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.