Aborting 'rebase main feat' removes unversioned files
- From
- Fedor Biryukov <fedor.birjukov@gmail.com>
- Date
- Sep 3, 2021, 20:33 UTC
- Message-ID
- <C357A648-8B13-45C3-9388-C0C7F7D40DAE@gmail.com>
- In-Reply-To
- <CAG2t84Uaw-Kdp+EXU8CY1QYfykFQj-hGLJnTSH8MYO8Vi_yqgA@mail.gmail.com>
Looks like a bug in git rebase main feat.
To reproduce: git init git commit -m 'init' --allow-empty git checkout -b feat echo 123 > readme.txt git add readme.txt git commit -m 'txt=123' git checkout main echo 012 > readme.txt git rebase main feat git rebase --abort
Expected result: readme.txt contains 012
Actual result: readme.txt contains 123
According to the docs, git rebase main feat is a shorthand for git checkout feat followed by git rebase main. I have checked that doing checkout and rebase separately instead of using the shorthand does not have the same issue.
Cheers!
Fedor