From: brian m. carlson Date: Sat, 12 Dec 2020 11:29:28 GMT Subject: Re: Why does "git pull --rebase" require a clean git directory? Message-ID: In-Reply-To: On 2020-12-11 at 21:23:23, Shupak, Vitaly wrote: > Thanks for the explanation. It seems like some optimizations may still > be possible. For example, if the pull could be done with a > fast-forward merge, then you don't need to rebase at all. This could > be an option like pull.rebase=noffonly. Yeah, I agree that if our operation is a fast-forward, that could be done in a pretty straightforward way. It's still a little tricky because of how the current code works (the fast-forward logic is in the sequencer, which gets called after the check), but it's something that we could add more easily. -- brian m. carlson (he/him or they/them) Houston, Texas, US