git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/8] apply: accept --threeway command line option

From
Junio C Hamano <gitster@pobox.com>
Date
May 10, 2012, 15:31 UTC
Message-ID
<7vvck4njc6.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CACsJy8B18gua5kRCTY6aE13J1T0YROmvSFP+88XCunOZm32mww@mail.gmail.com>
Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:
Show 7 quoted lines
> On Thu, May 10, 2012 at 1:02 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> This is the beginning of teaching the three-way merge fallback logic "git
>> am -3" uses to the underlying "git apply". It only implements the command
>> line parsing part, and does not do anything interesting yet.
>
> Can we reuse '-3/--3way' instead of --threeway? I already have hard
> time remembering which command uses -m/--merge, which one -3.

Oh, not just "Can we reuse", but we definitely should. Thanks for pointing it out.

It was just that I didn't check what "am" exactly calls it, as I always just type "am -s3c" these days ;-).

Previous: Nguyen Thai Ngoc DuyNext: Junio C Hamano
Message 5 of 19 in “"git apply --threeway"”
  1. 0/8 "git apply --threeway"Junio C Hamano, May 10, 2012
  2. 1/8 apply: reformat commentJunio C Hamano, May 10, 2012
  3. 2/8 apply: accept --threeway command line optionJunio C Hamano, May 10, 2012
  4. Nguyen Thai Ngoc DuyMay 10, 2012
  5. Junio C HamanoMay 10, 2012
  6. 3/8 apply: split load_preimage() helper function outJunio C Hamano, May 10, 2012
  7. 4/8 apply: clear_image() clears things a bit moreJunio C Hamano, May 10, 2012
  8. 5/8 apply: refactor read_file_or_gitlink()Junio C Hamano, May 10, 2012
  9. 6/8 apply: fall back on three-way mergeJunio C Hamano, May 10, 2012
  10. Matthieu MoyMay 10, 2012
  11. Junio C HamanoMay 10, 2012
  12. Matthieu MoyMay 10, 2012
  13. Jeff KingMay 10, 2012
  14. Junio C HamanoMay 10, 2012
  15. Jeff KingMay 10, 2012
  16. 7/8 apply: plug the three-way merge logic inJunio C Hamano, May 10, 2012
  17. 8/8 apply: register conflicted stages to the indexJunio C Hamano, May 10, 2012
  18. Matthieu MoyMay 10, 2012
  19. Junio C HamanoMay 10, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.