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

Re: [PATCH] mergetool merge/skip/abort

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 23, 2009, 17:26 UTC
Message-ID
<7vwscmue5z.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<81bfc67a0901230716i166bfc4chd9a5c0990b0cd3b6@mail.gmail.com>
Caleb Cushing <xenoterracide@gmail.com> writes:
> so does my patch satisfy now? what's it take to get it included in the
> next version of git?

I do not use mergetool myself so I generally do not pay attention to patches on this tool, but I would want to pick up ones that people involved in mergetool discussion can agree to be good patches.

There are a few mergetool updates in flight from various authors. How does your submission compare with others' in both form/presentation and clarity of logic (remember, I am not keeping track)?

Previous: Caleb CushingNext: Caleb Cushing
Message 10 of 17 in “mergetool merge/skip/abort”
  1. mergetool merge/skip/abortCaleb Cushing, Jan 21, 2009
  2. Caleb CushingJan 21, 2009
  3. Johannes SchindelinJan 21, 2009
  4. Markus HeidelbergJan 21, 2009
  5. Caleb CushingJan 22, 2009
  6. Charles BaileyJan 21, 2009
  7. Caleb CushingJan 22, 2009
  8. Charles BaileyJan 22, 2009
  9. Caleb CushingJan 23, 2009
  10. Junio C HamanoJan 23, 2009
  11. Caleb CushingJan 24, 2009
  12. Nanako ShiraishiJan 24, 2009
  13. Caleb CushingJan 25, 2009
  14. Junio C HamanoJan 25, 2009
  15. Theodore TsoJan 26, 2009
  16. Charles BaileyJan 27, 2009
  17. Junio C HamanoJan 27, 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.