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

Re: Suggestion: make --left-right work with --merge

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 29, 2008, 07:49 UTC
Message-ID
<7vbq60dwx6.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<18373.58839.636432.448970@cargo.ozlabs.ibm.com>
Paul Mackerras <paulus@samba.org> writes:
Show 7 quoted lines
> Junio C Hamano writes:
>
>> Like this?
>> 
>> A trivial feature that can be implemented in -4 lines ;-)
>
> Cool!  Yes, that works nicely.

I did not check this myself, but do arrows point in the right direction? I just randomly painted HEAD side left (and other side right) in the patch.

Previous: Linus Torvalds
Message 13 of 13 in “Suggestion: make --left-right work with --merge”
  1. Paul MackerrasFeb 27, 2008
  2. Junio C HamanoFeb 27, 2008
  3. Paul MackerrasFeb 27, 2008
  4. Junio C HamanoFeb 27, 2008
  5. Paul MackerrasFeb 28, 2008
  6. Junio C HamanoFeb 29, 2008
  7. Paul MackerrasFeb 29, 2008
  8. Junio C HamanoFeb 29, 2008
  9. Paul MackerrasMar 1, 2008
  10. Junio C HamanoMar 1, 2008
  11. Paul MackerrasMar 1, 2008
  12. Linus TorvaldsFeb 29, 2008
  13. Junio C HamanoFeb 29, 2008

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.