Re: [PATCH] pull: abort if --ff-only is given and fast-forwarding is impossible
- From
Alex Henrie <alexhenrie24@gmail.com>
- Date
- Jul 12, 2021, 18:24 UTC
- Message-ID
- <CAMMLpeSBgURtX+MKbABKdmFuuoTA-Dw3h8uONwNeiP5aqcnfpA@mail.gmail.com>
- In-Reply-To
- <CAMMLpeRX3iMwT9NJ+ULHgAhS3A=nAybgDYFHomkY3sif-H+F4g@mail.gmail.com>
On Mon, Jul 12, 2021 at 12:20 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
> > And it's not really necessary to make > --ff-only imply --no-rebase because we're going to make `git pull` > handle --ff-only itself without invoking `git merge`.
Sorry, I misspoke. I was thinking of the case where fast-forwarding is impossible. If fast-forwarding is possible, --ff-only already effectively implies --no-rebase, and we might want to make that explicit in the documentation.
-Alex