Re: [PATCH v2] pull: introduce --merge option
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 27, 2021, 08:45 UTC
- Message-ID
- <xmqqwnpcdu1w.fsf@gitster.g>
- In-Reply-To
- <CAMMLpeTL92cDmMHsE3iuhHQrVjwLFWHxE0CwD+uDBoPGAQCrkg@mail.gmail.com>
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.