Re: About "git rebase"

[Bruce Steers <bsteers4@xxxxxxxxx>]

On Wed, 11 Sept 2024 at 13:08, Benoît Minisini <
benoit.minisini@xxxxxxxxxxxxxxxx> wrote:

> Hi,
>
> I have a question about git: I have a friend I work with that uses "git
> rebase" sometimes, and half the time it breaks the contents of its local
> repository, and then the share git repository when it pushes its commits.
>
> Does anyone use "git rebase"? If so, can he explain what the purpose of
> this command is exactly? I have never used it myself.
>
> Thanks in advance!
>
> --
> Benoît Minisini.
>

I'm no expert but here's the docs..
https://git-scm.com/docs/git-rebase
I used to get problems when using git pull with the wrong setting but then
found using the config pull.rebase=false seems to be okay.

git config --global pull.rebase false

someone on this stackoverflow thread talks like they know what it all means
https://stackoverflow.com/questions/73876703/what-are-the-pull-rebase-false-pull-ff-true-differences

pull.rebase can be set to false | true | interactive | merges.

possibly the docs about rebase and ff (fastforward) may make more sense to
you :)
Respects
BruceS