Check actually prevents from rebasing sometimes

[rpitonak]

I did some changes locally and git add the changed files. I wanted to do a commit but pre-commit yield that I have to rebase.

But running git pull --rebase upstream master outputs:

error: cannot pull with rebase: Your index contains uncommitted changes.
error: please commit or stash them.

So, I should commit the changes to rebase but I have to rebase to commit the changes?

[lachmanfrantisek]

Maybe this could help: https://git-scm.com/book/en/v1/Git-Tools-Stashing

[lachmanfrantisek]

Or skip the check:

env SKIP=check-rebase git commit

[lachmanfrantisek]

We need to print that advice. What is the prefered way?

• use the env-var
• commit with -n
• stash

[rpitonak]

I think it is best to use stash because using env var user can avoid to actually rebase after.

[TomasTomecek]

I'd print all of them - so that people can pick the preferred solution (all of them at once: stash && commit -n with the the env var, force push and run)

[csomh]

We decided to close this in favour of other work. If you still think it's important, please re-open it.