{"thread":{"id":"57340","subject":"Why won't \"git rebase -Xrenormalize -i $REBASE_SHA\" do anything?","startedAt":"2022-01-31T11:04:23Z","lastAt":"2022-01-31T23:30:28Z","messageCount":3,"participants":["Josef Wolf","Torsten B��gershausen","brian m. carlson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"447327","messageId":"20220131110149.GE16463@raven.inka.de","threadId":"57340","inReplyTo":null,"subject":"Why won't \"git rebase -Xrenormalize -i $REBASE_SHA\" do anything?","fromName":"Josef Wolf","fromEmail":"jw@raven.inka.de","sentAt":"2022-01-31T11:01:50Z","receivedAt":"2022-01-31T11:04:23Z","isPatch":false,"sender":{"key":"jw@raven.inka.de","avatar":null},"body":"Hello,\n\nI've added \"* text=auto\" to an existing repo with a completely linear history.\n\nNow, as expected, every rebase operation gives me lots of conflicts, which are\nhard to resolve.\n\nSo I'd like to clean up the history:\n\n  $ git rebase -Xrenormalize -i $REBASE_SHA\n\nBut this turns out to be a no-op? It says immediately\n\n  Successfully rebased and updated refs/heads/wip-normalize\n\nwithout even the counter which is usually output to show progress during an\ninteractive rebase as it is working through the rebase-todo. I can confirm\nthat nothing has happened by checking the sha of the branch.\n\nSo, what am I missing? How would I renormalize all the commits of a branch?\nThe branch has linear history, no merges there.\n\nThanks,\n\n-- \nJosef Wolf\njw@raven.inka.de\n"},{"id":"447339","messageId":"20220131155124.u25j4bit3ahusgsc@tb-raspi4","threadId":"57340","inReplyTo":"20220131110149.GE16463@raven.inka.de","subject":"Re: Why won't \"git rebase -Xrenormalize -i $REBASE_SHA\" do anything?","fromName":"Torsten B��gershausen","fromEmail":"tboegi@web.de","sentAt":"2022-01-31T15:51:24Z","receivedAt":"2022-01-31T15:51:28Z","isPatch":false,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"On Mon, Jan 31, 2022 at 12:01:50PM +0100, Josef Wolf wrote:\n> Hello,\n>\n> I've added \"* text=auto\" to an existing repo with a completely linear history.\n\nWhat exactly does this mean ?\nIs there one branch, several branches ?\nNo merges at all ?\n\n>\n> Now, as expected, every rebase operation gives me lots of conflicts, which are\n> hard to resolve.\n>\n> So I'd like to clean up the history:\n>\n>   $ git rebase -Xrenormalize -i $REBASE_SHA\n>\n> But this turns out to be a no-op? It says immediately\n>\n>   Successfully rebased and updated refs/heads/wip-normalize\n>\n> without even the counter which is usually output to show progress during an\n> interactive rebase as it is working through the rebase-todo. I can confirm\n> that nothing has happened by checking the sha of the branch.\n>\n> So, what am I missing? How would I renormalize all the commits of a branch?\nThat is a tricky question.\nIf you renormalize all commits of one branch,\nyou create a complete new history, right ?\nJust out of interest:\nWhy do you want to do this ?\nAnd I have the slight feeling, that Git does not support this\n\"renormalize all the commits of a branch\" workflow, but I may be wrong.\n\nIs you repo public ?\nOr could you come up with an example ?\n\n> The branch has linear history, no merges there.\n>\n> Thanks,\n>\n> --\n> Josef Wolf\n> jw@raven.inka.de\n"},{"id":"447384","messageId":"YfhxESEsZo7CwFiz@camp.crustytoothpaste.net","threadId":"57340","inReplyTo":"20220131110149.GE16463@raven.inka.de","subject":"Re: Why won't \"git rebase -Xrenormalize -i $REBASE_SHA\" do anything?","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2022-01-31T23:30:25Z","receivedAt":"2022-01-31T23:30:28Z","isPatch":false,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On 2022-01-31 at 11:01:50, Josef Wolf wrote:\n> Hello,\n> \n> I've added \"* text=auto\" to an existing repo with a completely linear history.\n> \n> Now, as expected, every rebase operation gives me lots of conflicts, which are\n> hard to resolve.\n> \n> So I'd like to clean up the history:\n> \n>   $ git rebase -Xrenormalize -i $REBASE_SHA\n> \n> But this turns out to be a no-op? It says immediately\n> \n>   Successfully rebased and updated refs/heads/wip-normalize\n> \n> without even the counter which is usually output to show progress during an\n> interactive rebase as it is working through the rebase-todo. I can confirm\n> that nothing has happened by checking the sha of the branch.\n> \n> So, what am I missing? How would I renormalize all the commits of a branch?\n> The branch has linear history, no merges there.\n\nI think what you probably want is to add the -f option.  By default, Git\ndoesn't perform a rebase when the current branch is up to date with the\nbase branch.  If you want to do it anyway, in this case, to rewrite\ncommits, then -f should make that happen.\n-- \nbrian m. carlson (he/him or they/them)\nToronto, Ontario, CA\n"}]}