Re: [PATCH v2] pull: introduce --merge option

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jul 27, 2021, 16:48 UTC
Message-ID: <610038c0e1056_8fd52084a@natae.notmuch>
In-Reply-To: <CAMMLpeQ-Qpct4TX__KVuCyjbgxtB49qTMRHYc9R9-o0cRu4MuA@mail.gmail.com>

Alex Henrie wrote:

Show 20 quoted lines

> On Tue, Jul 27, 2021 at 2:45 AM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > Alex Henrie <alexhenrie24@gmail.com> writes:
> >
> > > Junio, would you be willing to accept adding -m without adding --merge also?
> >
> > My gut feeling is that "-m" without "--merge" in the context of
> > "pull" is extremely unlikely to fly well.
> >
> > As "git pull" is a "git fetch" followed by a "git merge" (or "git
> > rebase"), it takes the union of common command line options from
> > both phases, and "git merge" takes "-m 'message'" which is an option
> > fairly familiar to users (since it comes from "git commit").  Even
> > if we are never going to pass "-m message" from "git pull" down to
> > underlying "git merge", squatting on short and common "-m" would be
> > a bad idea.
> 
> Thanks for the explanation. I forgot that "-m" usually means
> "message". That does seem like a good reason to not use "-m" for
> "merge".

It means --merge plenty of times:

 * git restore -m
 * git checkout -m
 * git rebase -m
 * git diff -m
 * git read-tree -m
 * git diff-tree -m

-- 
Felipe Contreras