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

Re: [PATCH 12/13] Build in merge

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jun 27, 2008, 13:17 UTC
Message-ID
<20080627131713.GO29404@genesis.frugalware.org>
In-Reply-To
<4864E574.70700@freesurf.fr>
On Fri, Jun 27, 2008 at 03:04:52PM +0200, Olivier Marin <dkr@freesurf.fr> wrote:
Show 9 quoted lines
> >> +       if (diff_use_color_default == -1)
> >> +               diff_use_color_default = git_use_color_default;
> >> +
> >>         argc = parse_options(argc, argv, builtin_merge_options,
> >>                         builtin_merge_usage, 0);
> > 
> > Have you tried this?
> 
> I did. I forget to say that it's on top of your patch, sorry.
Aah. I should have noticed that.

I see now, your hunk is necessary when color.diff and diff.color is not set but color.ui is.

Thanks.
Previous: Olivier MarinNext: Johannes Schindelin
Message 13 of 15 in “Build in merge”
  1. 00/13 Build in mergeMiklos Vajna, Jun 21, 2008
  2. 09/13 Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna, Jun 21, 2008
  3. 10/13 Introduce get_merge_bases_many()Miklos Vajna, Jun 21, 2008
  4. 11/13 Introduce reduce_heads()Miklos Vajna, Jun 21, 2008
  5. 12/13 Build in mergeMiklos Vajna, Jun 21, 2008
  6. 13/13 Add new test case to ensure git-merge filters for independent parentsMiklos Vajna, Jun 21, 2008
  7. 13/13 Add new test case to ensure git-merge reduces octopus parents when possibleMiklos Vajna, Jun 21, 2008
  8. Olivier MarinJun 25, 2008
  9. Miklos VajnaJun 27, 2008
  10. Olivier MarinJun 27, 2008
  11. Miklos VajnaJun 27, 2008
  12. Olivier MarinJun 27, 2008
  13. Miklos VajnaJun 27, 2008
  14. Johannes SchindelinJun 27, 2008
  15. Miklos VajnaJun 27, 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.