{"thread":{"id":"50581","subject":"Git Pull --ff-only should imply --no-rebase","startedAt":"2019-02-25T08:42:13Z","lastAt":"2019-02-25T08:42:13Z","messageCount":1,"participants":["Shane Carr"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"370107","messageId":"CABxsp=msDSGGFjn178ze-s3XR3UJU=NEkV1jzS9QN-zjZisMgg@mail.gmail.com","threadId":"50581","inReplyTo":null,"subject":"Git Pull --ff-only should imply --no-rebase","fromName":"Shane Carr","fromEmail":"sffc@google.com","sentAt":"2019-02-25T08:42:00Z","receivedAt":"2019-02-25T08:42:13Z","isPatch":false,"sender":{"key":"sffc@google.com","avatar":null},"body":"Greetings,\n\nI have the pull.rebase config enabled for my branch.  Sometimes I want\nto pull and I know that the pull is going to be a fast-forward.\nHowever, if I run\n\n    git pull --ff-only   # (with pull.rebase config enabled)\n\nI get the error\n\n    error: Cannot pull with rebase: You have unstaged changes.\n\nInstead, if my working directory is not clean, I have to do\n\n    git pull --ff-only --no-rebase\n\nSince --ff-only implies that there is going to be neither a merge nor\na rebase taking place, Git should not complain about unstaged changes\nand should have the same behavior on --ff-only whether or not the\npull.rebase config is enabled.\n\nShane\n"}]}