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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jul 27, 2021 at 2:45 AM Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> Alex Henrie <alexhenrie24@xxxxxxxxx> 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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux