Re: [PATCH v2] pull: introduce --merge option
- From
Alex Henrie <alexhenrie24@gmail.com>
- Date
- Jul 27, 2021, 15:52 UTC
- Message-ID
- <CAMMLpeQ-Qpct4TX__KVuCyjbgxtB49qTMRHYc9R9-o0cRu4MuA@mail.gmail.com>
- In-Reply-To
- <xmqqwnpcdu1w.fsf@gitster.g>
On Tue, Jul 27, 2021 at 2:45 AM Junio C Hamano <gitster@pobox.com> wrote:
Show 15 quoted lines
> > 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".
-Alex