From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Josef Wolf <jw@raven.inka.de>, git@vger.kernel.org
Subject: Re: Why won't "git rebase -Xrenormalize -i $REBASE_SHA" do anything?
Date: Mon, 31 Jan 2022 23:30:25 +0000 [thread overview]
Message-ID: <YfhxESEsZo7CwFiz@camp.crustytoothpaste.net> (raw)
In-Reply-To: <20220131110149.GE16463@raven.inka.de>
[-- Attachment #1: Type: text/plain, Size: 1158 bytes --]
On 2022-01-31 at 11:01:50, Josef Wolf wrote:
> Hello,
>
> I've added "* text=auto" to an existing repo with a completely linear history.
>
> Now, as expected, every rebase operation gives me lots of conflicts, which are
> hard to resolve.
>
> So I'd like to clean up the history:
>
> $ git rebase -Xrenormalize -i $REBASE_SHA
>
> But this turns out to be a no-op? It says immediately
>
> Successfully rebased and updated refs/heads/wip-normalize
>
> without even the counter which is usually output to show progress during an
> interactive rebase as it is working through the rebase-todo. I can confirm
> that nothing has happened by checking the sha of the branch.
>
> So, what am I missing? How would I renormalize all the commits of a branch?
> The branch has linear history, no merges there.
I think what you probably want is to add the -f option. By default, Git
doesn't perform a rebase when the current branch is up to date with the
base branch. If you want to do it anyway, in this case, to rewrite
commits, then -f should make that happen.
--
brian m. carlson (he/him or they/them)
Toronto, Ontario, CA
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
prev parent reply other threads:[~2022-01-31 23:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-31 11:01 Why won't "git rebase -Xrenormalize -i $REBASE_SHA" do anything? Josef Wolf
2022-01-31 15:51 ` Torsten =?unknown-8bit?Q?B=C3=B6gershausen?=
2022-01-31 23:30 ` brian m. carlson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YfhxESEsZo7CwFiz@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=jw@raven.inka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).