{"thread":{"id":"50076","subject":"rebase: Ask before doing anything not undoable","startedAt":"2018-12-20T17:33:55Z","lastAt":"2018-12-21T00:23:43Z","messageCount":6,"participants":["Ricardo Biehl Pasquali","Thomas Braun"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"365662","messageId":"20181220173348.GA5203@localhost.localdomain","threadId":"50076","inReplyTo":null,"subject":"rebase: Ask before doing anything not undoable","fromName":"Ricardo Biehl Pasquali","fromEmail":"pasqualirb@gmail.com","sentAt":"2018-12-20T17:33:48Z","receivedAt":"2018-12-20T17:33:55Z","isPatch":false,"sender":{"key":"pasqualirb@gmail.com","avatar":"https://gravatar.com/avatar/bd8c62e172a3cb7f578f15b260e7863b28aae6a0ca86e25bbdf1f6f30bfaef4d?d=mp&s=160"},"body":"It was the second time I've typed \"git rebase --co\",\nhit tab (for completion) and enter, and the result was\n--committer-date-is-author-date instead of --continue .\n\nPlease do ask user before run actions like these! I have\nnot found a way to undo that. I had to perform a reset in\nthe repository.\n\nPS: Notice I was expecting a command of interactive rebase,\n    and I got a bunch of commits's date (and hash) changed.\n\nCheers!\n\n\tpasquali\n"},{"id":"365664","messageId":"3a7a52c3-3ae7-6e5e-b660-49fb21dc7d17@virtuell-zuhause.de","threadId":"50076","inReplyTo":"20181220173348.GA5203@localhost.localdomain","subject":"Re: rebase: Ask before doing anything not undoable","fromName":"Thomas Braun","fromEmail":"thomas.braun@virtuell-zuhause.de","sentAt":"2018-12-20T18:28:20Z","receivedAt":"2018-12-20T18:28:37Z","isPatch":false,"sender":{"key":"thomas.braun@virtuell-zuhause.de","avatar":"https://avatars.githubusercontent.com/u/1185677?v=4"},"body":"Am 20.12.2018 um 18:33 schrieb Ricardo Biehl Pasquali:\n> It was the second time I've typed \"git rebase --co\",\n> hit tab (for completion) and enter, and the result was\n> --committer-date-is-author-date instead of --continue .\n> \n> Please do ask user before run actions like these! I have\n> not found a way to undo that. I had to perform a reset in\n> the repository.\n> \n> PS: Notice I was expecting a command of interactive rebase,\n>     and I got a bunch of commits's date (and hash) changed.\n\nDo you know about the reflog? This let's you undo these kind of changes.\nSee git help reflog.\n\n"},{"id":"365665","messageId":"20181220185636.GA5853@localhost.localdomain","threadId":"50076","inReplyTo":"3a7a52c3-3ae7-6e5e-b660-49fb21dc7d17@virtuell-zuhause.de","subject":"Re: rebase: Ask before doing anything not undoable","fromName":"Ricardo Biehl Pasquali","fromEmail":"pasqualirb@gmail.com","sentAt":"2018-12-20T18:56:36Z","receivedAt":"2018-12-20T18:56:43Z","isPatch":false,"sender":{"key":"pasqualirb@gmail.com","avatar":"https://gravatar.com/avatar/bd8c62e172a3cb7f578f15b260e7863b28aae6a0ca86e25bbdf1f6f30bfaef4d?d=mp&s=160"},"body":"On Thu, Dec 20, 2018 at 07:28:20PM +0100, Thomas Braun wrote:\n> Do you know about the reflog? This let's you undo these kind of changes.\n> See git help reflog.\n\nI didn't. This should be documented in rebase manual page.\n\nPerhaps a message after the command might be interesting\n(e.g.: \"to undo use git reflog\").\n\nThank you!\n\n\tpasquali\n"},{"id":"365702","messageId":"20181220211147.GA7426@localhost.localdomain","threadId":"50076","inReplyTo":"20181220182653.GB4823@alpha","subject":"Re: rebase: Ask before doing anything not undoable","fromName":"Ricardo Biehl Pasquali","fromEmail":"pasqualirb@gmail.com","sentAt":"2018-12-20T21:11:47Z","receivedAt":"2018-12-20T21:11:55Z","isPatch":false,"sender":{"key":"pasqualirb@gmail.com","avatar":"https://gravatar.com/avatar/bd8c62e172a3cb7f578f15b260e7863b28aae6a0ca86e25bbdf1f6f30bfaef4d?d=mp&s=160"},"body":"Ccing the mailing list.\n\nOn Thu, Dec 20, 2018 at 07:26:53PM +0100, Kevin Daudt wrote:\n> It would be anoying for users to have to constantly confirm when they\n> run git rebase --continue. Rather than asking confirmation, it would be\n> better to make it easy to go back to the previous state.\n\nI meant confirmation for --committer-date-is-author-date\noption.\n\nAs Thomas said, it should be possible to undo the action\nusing reflog, although this seems not as easy as it should\nbe yet.\n\n\tpasquali\n"},{"id":"365703","messageId":"53e97c08-1eaf-5f83-a699-5666376bb4c4@virtuell-zuhause.de","threadId":"50076","inReplyTo":"20181220211147.GA7426@localhost.localdomain","subject":"Re: rebase: Ask before doing anything not undoable","fromName":"Thomas Braun","fromEmail":"thomas.braun@virtuell-zuhause.de","sentAt":"2018-12-20T21:37:00Z","receivedAt":"2018-12-20T21:37:13Z","isPatch":false,"sender":{"key":"thomas.braun@virtuell-zuhause.de","avatar":"https://avatars.githubusercontent.com/u/1185677?v=4"},"body":"Am 20.12.2018 um 22:11 schrieb Ricardo Biehl Pasquali:\n> Ccing the mailing list.\n> \n> On Thu, Dec 20, 2018 at 07:26:53PM +0100, Kevin Daudt wrote:\n>> It would be anoying for users to have to constantly confirm when they\n>> run git rebase --continue. Rather than asking confirmation, it would be\n>> better to make it easy to go back to the previous state.\n> \n> I meant confirmation for --committer-date-is-author-date\n> option.\n> \n> As Thomas said, it should be possible to undo the action\n> using reflog, although this seems not as easy as it should\n> be yet.\n\nThe git rebase documentation has\n\nORIG_HEAD is set to point at the tip of the branch before the reset.\n\nso doing\n\ngit reset ORIG_HEAD\n\ndoes reset to the state before the rebase.\n\nFor avoiding the original problem of --co completing to\n--committer-date-is-author-date I'm using the alias rc for git rebase\n--continue.\n"},{"id":"365714","messageId":"20181221002336.GA10482@localhost.localdomain","threadId":"50076","inReplyTo":"53e97c08-1eaf-5f83-a699-5666376bb4c4@virtuell-zuhause.de","subject":"Re: rebase: Ask before doing anything not undoable","fromName":"Ricardo Biehl Pasquali","fromEmail":"pasqualirb@gmail.com","sentAt":"2018-12-21T00:23:36Z","receivedAt":"2018-12-21T00:23:43Z","isPatch":false,"sender":{"key":"pasqualirb@gmail.com","avatar":"https://gravatar.com/avatar/bd8c62e172a3cb7f578f15b260e7863b28aae6a0ca86e25bbdf1f6f30bfaef4d?d=mp&s=160"},"body":"On Thu, Dec 20, 2018 at 10:37:00PM +0100, Thomas Braun wrote:\n> The git rebase documentation has\n>\n> ORIG_HEAD is set to point at the tip of the branch before the reset.\n>\n> so doing\n>\n> git reset ORIG_HEAD\n>\n> does reset to the state before the rebase.\n\nThat's pretty easy :-)\n\n> For avoiding the original problem of --co completing to\n> --committer-date-is-author-date I'm using the alias rc for git rebase\n> --continue.\n\nIt's definetly an alternative. Anyway, ORIG_HEAD reset is\nsufficient for the cases when enter is hit before noticing\nthe completion string.\n\nThank you!\n\n\tpasquali\n"}]}