{"thread":{"id":"26131","subject":"Allow empty commits to be rebased","startedAt":"2010-12-24T00:48:08Z","lastAt":"2010-12-24T00:48:08Z","messageCount":1,"participants":["Mihai Rusu"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"158541","messageId":"AANLkTim4pHZ=d3XwEP_ZM8P7ZO6FbMJbMDGzssuL5kVj@mail.gmail.com","threadId":"26131","inReplyTo":null,"subject":"Allow empty commits to be rebased","fromName":"Mihai Rusu","fromEmail":"dizzy@google.com","sentAt":"2010-12-24T00:48:08Z","receivedAt":"2010-12-24T00:48:08Z","isPatch":false,"sender":{"key":"dizzy@google.com","avatar":null},"body":"Hi\n\nWhen trying to rebase empty Git commits (git commit --allow-empty),\n\"git rebase\" (and \"git rebase -i\") just skip the empty commits. This\nmay make some sense in the context of \"git rebase\" trying to determine\nif the code to be rebased already exists in \"upstream\" but in our case\nwe need to rebase purely because of parent changes. Playing with \"git\nrebase\", the only way to force it to rebase empty commits was to do\nsomething like:\n$ git rebase -i --onto upstream HEAD~N # where N is the number of\ncommits we want rebased\n\nAnd then for every empty commit it stops as if it got a conflict, I\nhave to issue git commit --allow-empty and then git rebase --continue\n(if I just run git rebase --continue as I should it skips the empty\ncommit). If I drop \"-i\" or if I don't use the onto/HEAD~N trick I'm\nnot able to rebase empty commits.\n\nIf you don't think that \"git rebase\" should support rebasing of empty\ncommits by default then please consider adding an --allow-empty\nargument to enable such functionality.\n\nThanks!\n\n-- \nMihai Rusu\n"}]}