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

Re: [PATCH v4 4/4] mergetool: honor -O<orderfile>

From
David Aguilar <davvid@gmail.com>
Date
Oct 11, 2016, 05:06 UTC
Message-ID
<20161011050623.GA14278@gmail.com>
In-Reply-To
<xmqqa8ecf48c.fsf@gitster.mtv.corp.google.com>
On Mon, Oct 10, 2016 at 11:28:35AM -0700, Junio C Hamano wrote:
Show 15 quoted lines
> David Aguilar <davvid@gmail.com> writes:
> 
> > Teach mergetool to pass "-O<orderfile>" down to `git diff` when
> > specified on the command-line.
> >
> > Helped-by: Johannes Sixt <j6t@kdbg.org>
> > Signed-off-by: David Aguilar <davvid@gmail.com>
> > ---
> > Since v3:
> >
> > I missed one last piped invocation of "git mergetool" in the tests,
> > which has been fixed.
> 
> I only see 4/4 in v4; am I correct to assume that 1-3/4 of v4 are
> the same as their counterparts in v3?

Yes, 1-3 are unchanged since v3. Thanks for checking,

-- 
David
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 5 in “mergetool: honor -O<orderfile>”
  1. 4/4 mergetool: honor -O<orderfile>David Aguilar, Oct 8, 2016
  2. Johannes SixtOct 8, 2016
  3. Junio C HamanoOct 10, 2016
  4. David AguilarOct 11, 2016
  5. Junio C HamanoOct 11, 2016

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.