mbox series

[RFC,0/2] Example of pull.mode

Message ID 20230228140236.4175835-1-felipe.contreras@gmail.com (mailing list archive)
Headers show
Series Example of pull.mode | expand

Message

Felipe Contreras Feb. 28, 2023, 2:02 p.m. UTC 
The discussions about the default mode of pull never end, since there's
yet another discussion [1] about the relationship with
pull.rebase=merges I'm sending a condensed version of my git update
patches [2] which were not properly considered, but they solve the
issue.

The two configurations in particular that are currently broken are:

    git config pull.mode merge
    git config pull.rebase merges
    git pull --rebase # same as --rebase=merges

And:

    git config pull.rebase true
    git pull --no-ff # no mode specified

These patches are *not* meant to be merged, they are just meant as
reference for the new discussion.

I have the patches properly split and with tests, which I avoided here
for the sake of simplicity.

[1] https://lore.kernel.org/git/pull.1474.git.1675614276549.gitgitgadget@gmail.com/
[2] https://lore.kernel.org/git/20210705123209.1808663-1-felipe.contreras@gmail.com/

Felipe Contreras (2):
  Add pull.mode
  pull: improve --rebase and pull.rebase interaction

 Documentation/config/branch.txt |   5 +
 Documentation/config/pull.txt   |   6 ++
 Documentation/git-pull.txt      |  15 +--
 builtin/pull.c                  | 157 ++++++++++++++++++++++----------
 rebase.c                        |  12 +++
 rebase.h                        |  13 ++-
 t/t7601-merge-pull-config.sh    |  30 +++---
 7 files changed, 166 insertions(+), 72 deletions(-)