* Git Pull --ff-only should imply --no-rebase
@ 2019-02-25 8:42 Shane Carr
0 siblings, 0 replies; only message in thread
From: Shane Carr @ 2019-02-25 8:42 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-02-25 8:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-25 8:42 Git Pull --ff-only should imply --no-rebase Shane Carr
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).