Re: Weird merge records

From: Dan Stromberg <strombrg@gmail.com>
Date: May 8, 2023, 14:53 UTC
Message-ID: <CAOvKW55MbXF8sDaGTTk9XJxw6Ln9E9G8qOF4wbXzEKY=GH=Zag@mail.gmail.com>
In-Reply-To: <CAMP44s23Qsw3behbm57BNKeT9w_u1OunV04A9uzz85rDcD_Uug@mail.gmail.com>

On Sun, May 7, 2023 at 1:34 PM Felipe Contreras <felipe.contreras@gmail.com> wrote:

Show 15 quoted lines

>
> On Sat, May 6, 2023 at 10:20 AM Thomas Guyot <tguyot@gmail.com> wrote:
>
> > You shouldn't change the user's config - you can instead use
> > command-line switches with git-pull to force the desired behavior. In
> > this case (which is also the default if there is no pull.rebase config)
> > it will merge with the remote (and that merge will be a fast-forward if
> > you have no added commits).
>
> Actually no: it won't merge the current branch with the remote, it
> will merge the remote with the current branch, which is not the same.
>
> This is one of the many reasons many git veterans recommend most users
> to simply avoid doing `git pull` [1]: it very rarely does what you
> want.

You seem to be implying that I shouldn't use 'git pull --rebase upstream "$branch"'.

If that's the case, what would you recommend?