Greetings,
I have the pull.rebase config enabled for my branch. Sometimes I want to pull and I know that the pull is going to be a fast-forward. However, if I run
git pull --ff-only # (with pull.rebase config enabled)
I get the error
error: Cannot pull with rebase: You have unstaged changes.
Instead, if my working directory is not clean, I have to do
git pull --ff-only --no-rebase
Since --ff-only implies that there is going to be neither a merge nor a rebase taking place, Git should not complain about unstaged changes and should have the same behavior on --ff-only whether or not the pull.rebase config is enabled.
Shane