git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Rebase options via git pull

From
Sergey Organov <sorganov@gmail.com>
Date
May 14, 2021, 06:37 UTC
Message-ID
<875yzlu8gt.fsf@osv.gnss.ru>
In-Reply-To
<YJ3LJ++lsAuSkCUJ@danh.dev>
Đoàn Trần Công Danh <congdanhqx@gmail.com> writes:
Show 25 quoted lines
> On 2021-05-13 18:49:03-0600, Alex Henrie <alexhenrie24@gmail.com> wrote:
>> On Thu, May 13, 2021 at 7:23 AM Sergey Organov <sorganov@gmail.com> wrote:
>> >
>> > Hello,
>> >
>> > 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.
>> 
>> It would be cumbersome, but you could run `git config rebase.forkPoint
>> false` before pulling and `git config rebase.forkPoint true` after.
>
> Or, for this *specific* case:
>
> 	git -c rebase.forkpoint=false pull --rebase

That's nice, thanks! Doesn't solve entire issue, but definitely better than nothing.

Probably add generic cmd.<cmd>.opts config support, so that I can say:
  git -c cmd.rebase.opts="--no-fork-point --empty=keep" pull --rebase
Thoughts?

Thanks, -- Sergey Organov

Previous: Alex HenrieNext: Ævar Arnfjörð Bjarmason
Message 8 of 13 in “Rebase options via git pull”
  1. Sergey OrganovMay 13, 2021
  2. Junio C HamanoMay 13, 2021
  3. Ævar Arnfjörð BjarmasonMay 14, 2021
  4. Sergey OrganovMay 15, 2021
  5. Alex HenrieMay 14, 2021
  6. Đoàn Trần Công DanhMay 14, 2021
  7. Alex HenrieMay 14, 2021
  8. Sergey OrganovMay 14, 2021
  9. Ævar Arnfjörð BjarmasonMay 17, 2021
  10. Sergey OrganovMay 17, 2021
  11. Đoàn Trần Công DanhMay 17, 2021
  12. Sergey OrganovMay 17, 2021
  13. Đoàn Trần Công DanhMay 17, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.