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

Re: git-{diff,merge} refactor round 2

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 6, 2009, 00:33 UTC
Message-ID
<7vocvaoc24.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<200904060015.17145.markus.heidelberg@web.de>
Markus Heidelberg <markus.heidelberg@web.de> writes:
Show 11 quoted lines
> David Aguilar, 05.04.2009:
> ...
>> 1. Base it on the current master, completely throwing away
>> the existing da/difftool branch.  That would include throwing
>> away the commit that's in next if we really want to be clean
>> about the history.  In the process, move Markus' mergetool
>> fixes for windows to the top so that they can be applied
>> independently if necessary.  This series would then depend
>> on them.
>
> This is my favourite, too.

Ok. You two forgot another obvious option of not doing anything, but since both of you seem to be Ok with the rewrite, let's take that approach. It is easy to revert the one premature merge out of next and then merge the cleaned-up version.

> Yes, some squashing would be nice. Similar commit messages are confusing
> when reading the history.
Agreed.
Previous: Markus Heidelberg
Message 26 of 26 in “git-{diff,merge} refactor round 2”
  1. David AguilarApr 1, 2009
  2. 01/10 difftool: add support for a difftool.prompt config variableDavid Aguilar, Apr 1, 2009
  3. 02/10 mergetool: use $( ... ) instead of `backticks`David Aguilar, Apr 1, 2009
  4. 03/10 Add a mergetool-lib scriptlet for holding common merge tool functionsDavid Aguilar, Apr 1, 2009
  5. 04/10 mergetool: use get_mergetool_path from git-mergetool-libDavid Aguilar, Apr 1, 2009
  6. 05/10 difftool: use get_mergetool_path from git-mergetool-libDavid Aguilar, Apr 1, 2009
  7. 06/10 mergetool: use valid_tool from git-mergetool-libDavid Aguilar, Apr 1, 2009
  8. 07/10 difftool: use valid_tool from git-mergetool-libDavid Aguilar, Apr 1, 2009
  9. 08/10 mergetool-lib: introduce run_mergetoolDavid Aguilar, Apr 1, 2009
  10. 09/10 difftool: use run_mergetool from git-mergetool-libDavid Aguilar, Apr 1, 2009
  11. 10/10 mergetool: use run_mergetool from git-mergetool-libDavid Aguilar, Apr 1, 2009
  12. Markus HeidelbergApr 1, 2009
  13. Charles BaileyApr 2, 2009
  14. Markus HeidelbergApr 2, 2009
  15. Markus HeidelbergApr 2, 2009
  16. David AguilarApr 3, 2009
  17. Markus HeidelbergApr 1, 2009
  18. Markus HeidelbergApr 1, 2009
  19. David AguilarApr 2, 2009
  20. Charles BaileyApr 2, 2009
  21. Markus HeidelbergApr 5, 2009
  22. David AguilarApr 5, 2009
  23. Junio C HamanoApr 5, 2009
  24. David AguilarApr 5, 2009
  25. Markus HeidelbergApr 5, 2009
  26. Junio C HamanoApr 6, 2009

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.