From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Alex Henrie" <alexhenrie24@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"Ævar Arnfjörð" <avarab@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: Re: [PATCH] pull: abort if --ff-only is given and fast-forwarding is impossible
Date: Mon, 12 Jul 2021 16:00:25 -0700 [thread overview]
Message-ID: <xmqqbl772l4m.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BH+LPbfdgixvSEGpLxwCHHSK99PFmE3q04jPZjLaqr5Xg@mail.gmail.com> (Elijah Newren's message of "Mon, 12 Jul 2021 13:51:18 -0700")
Elijah Newren <newren@gmail.com> writes:
>> When we cannot fast-forward (i.e. we have our own development that
>> is not in the tip of their history),
>>
>> --ff-only would cause the operation fail
>> --ff would become no-op (as it merely allows fast-forwarding)
>> --no-ff would become no-op (as it merely forbids fast-forwarding)
>>
>> and the latter two case, we'd either merge or rebase (with possibly
>> specified mode like --preserve-merges). I thought the current
>> documentation is already fairly clear on this point?
>
> git pull's --no-ff is documented to "create a merge commit in all
> cases", and thus as worded, seems incompatible with rebasing to me.
It smells like a "too literally to be useful" interpretation of a
pice of documentation that has no relevance to "pull --rebase" to
me, though. It comes from merge-options.txt and would not be
relevant to "git pull --rebase" to begin with.
next prev parent reply other threads:[~2021-07-12 23:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-11 1:26 [PATCH] pull: abort if --ff-only is given and fast-forwarding is impossible Alex Henrie
2021-07-11 17:08 ` Felipe Contreras
2021-07-11 20:00 ` Alex Henrie
2021-07-11 21:41 ` Felipe Contreras
2021-07-12 10:21 ` Phillip Wood
2021-07-12 16:04 ` Felipe Contreras
2021-07-12 16:29 ` Alex Henrie
2021-07-12 17:43 ` Felipe Contreras
2021-07-12 17:08 ` Junio C Hamano
2021-07-12 17:30 ` Felipe Contreras
2021-07-12 17:50 ` Elijah Newren
2021-07-12 18:20 ` Felipe Contreras
2021-07-12 18:20 ` Alex Henrie
2021-07-12 18:24 ` Alex Henrie
2021-07-12 19:55 ` Junio C Hamano
2021-07-12 20:19 ` Felipe Contreras
2021-07-12 20:51 ` Elijah Newren
2021-07-12 23:00 ` Junio C Hamano [this message]
2021-07-12 23:05 ` Felipe Contreras
2021-07-12 23:24 ` Elijah Newren
2021-07-12 20:37 ` Elijah Newren
2021-07-12 21:06 ` Felipe Contreras
2021-07-12 17:54 ` Phillip Wood
2021-07-14 8:37 ` Son Luong Ngoc
2021-07-14 15:14 ` Felipe Contreras
2021-07-14 15:22 ` Elijah Newren
2021-07-14 17:19 ` Junio C Hamano
2021-07-14 17:31 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbl772l4m.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=avarab@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.