Re: Rebase options via git pull

From: Junio C Hamano <gitster@pobox.com>
Date: May 13, 2021, 20:18 UTC
Message-ID: <xmqq1raabd5d.fsf@gitster.g>
In-Reply-To: <87r1iakbyn.fsf@osv.gnss.ru>

Sergey Organov <sorganov@gmail.com> writes:

Show 17 quoted lines

> Is there a way to specify additional options for "git rebase" when it's
> invoked via:
>
>   git pull --rebase
>
> ? What if rebase is used implicitly due to "pull.rebase" being set
> accordingly?
>
> In particular, I'd like to be able to:
>
>   git pull --rebase --no-fork-point
>
> but it doesn't work.
>
> From documentation is looks like "git pull --rebase" is still a
> second-class citizen. There is whole section about merge options in the
> manual, and none about rebase options.

Yeah, it does feel like so.

Just like we can pass merge-strategy specific options via -X<opt>=<val>, e.g.

    $ git pull -Xsubtree=gitk git://ozlabs.org/~paulus/gitk.git

to ask the command to invoke "git merge -Xsubtree=gitk" after fetching from the remote repository, we should allow rebase specific options via a similar mechanism, e.g. -Yno-fork-point=yes (or something along that line---exact syntax does not matter).

But I do not think there currently is anything like that.