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.
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.
Thanks,
-- Sergey Organov
From: Alex Henrie <hidden> Date: 2021-05-14 00:49:18
On Thu, May 13, 2021 at 7:23 AM Sergey Organov [off-list ref] 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.
-Alex
From: Đoàn Trần Công Danh <hidden> Date: 2021-05-14 00:58:21
On 2021-05-13 18:49:03-0600, Alex Henrie [off-list ref] wrote:
On Thu, May 13, 2021 at 7:23 AM Sergey Organov [off-list ref] wrote:
quoted
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
--
Danh
From: Alex Henrie <hidden> Date: 2021-05-14 01:01:22
On Thu, May 13, 2021 at 6:58 PM Đoàn Trần Công Danh
[off-list ref] wrote:
On 2021-05-13 18:49:03-0600, Alex Henrie [off-list ref] wrote:
quoted
On Thu, May 13, 2021 at 7:23 AM Sergey Organov [off-list ref] wrote:
quoted
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
I forgot that you can do that. Thanks for the better answer!
-Alex