{"thread":{"id":"43236","subject":"A call for better git-rebase messages","startedAt":"2006-12-19T10:17:35Z","lastAt":"2006-12-19T10:30:30Z","messageCount":2,"participants":["Jakub Narebski","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"294100","messageId":"em8e32$s7b$1@sea.gmane.org","threadId":"43236","inReplyTo":null,"subject":"A call for better git-rebase messages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-12-19T10:17:35Z","receivedAt":"2006-12-19T10:17:35Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":" $ git rebase abort\n mkdir: cannot create directory `.dotest': File exists\n\n It seems that I cannot create a .dotest directory, and I wonder if you\n are in the middle of patch application or another rebase.  If that is not\n the case, please rm -fr .dotest and run me again.  I am stopping in case\n you still have something valuable there.\n\nWhy we do not tell to run \"git rebase --abort\" here? I think the command\nknow that it is a middle of git-rebase, not the middle of git-am...\n\n\n $ git rebase --onto origin next gitweb/web\n Nothing to do.\n\nI'm not sure, but I think gitweb/web which was empty branch based off\nformer next is now empty branch based off current gitweb, i.e. at least\nhead of this branch has changed... but I'm not sure because\n\n $ git rebase --abort\n\nis _not_ recorded as such, but as \"reset --hard ORIG_HEAD\" (I think).\nIt looks like it is, because after \"reset --hard ORIG_HEAD\" (which was\nresult of \"git rebase --abort\" of \"git rebase origin\" (I forgot\ngitweb/web was based off other branch) there is \"reset --hard <sha1>\",\nand this sha1 is sha1 of both gitweb/web and origin.\n\nI'd rather rebase told me that it did something (moved head), but\nthere are no patches to be applied.\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n\n"},{"id":"295980","messageId":"7v64c8rxdl.fsf@assigned-by-dhcp.cox.net","threadId":"43236","inReplyTo":"em8e32$s7b$1@sea.gmane.org","subject":"Re: A call for better git-rebase messages","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-19T10:30:30Z","receivedAt":"2006-12-19T10:30:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n>  $ git rebase abort\n>  mkdir: cannot create directory `.dotest': File exists\n>\n>  It seems that I cannot create a .dotest directory, and I wonder if you\n>  are in the middle of patch application or another rebase.  If that is not\n>  the case, please rm -fr .dotest and run me again.  I am stopping in case\n>  you still have something valuable there.\n>\n> Why we do not tell to run \"git rebase --abort\" here? I think the command\n> know that it is a middle of git-rebase, not the middle of git-am...\n\nDoes it?  At least the original author of the command does not\nknow if you did this:\n\n\t$ git am mbox\n        ... ugh, conflicted.\n\t$ git rebase master\n"}]}