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

Re: feature request mergetool, skip, abort

From
Charles Bailey <charles@hashpling.org>
Date
Jan 21, 2009, 11:22 UTC
Message-ID
<20090121112236.GC18488@hashpling.org>
In-Reply-To
<81bfc67a0901200839q361923f1xb25ddadfdac37981@mail.gmail.com>
On Tue, Jan 20, 2009 at 11:39:59AM -0500, Caleb Cushing wrote:
Show 8 quoted lines
> firstly my patch sucks, and I know it. but hopefully it'll give some
> idea of what I'm trying to do and someone can implement it properly.
> 
> basically there are some files, that I can't merge with git, but I
> need to merge other files before I can fix those and I like to use
> mergetool, so I want a way to skip the files I'm not going to be able
> to merge.
>

For some reason I couldn't see a patch, but I like the idea of this from the description and I was at very early stage of working on something similar myself but it stalled due to other commitments.

For the moment the only way to 'skip' files is by passing full paths of what you *don't* want to skip to mergetool which isn't really the same thing at all.

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
Previous: Caleb CushingNext: Caleb Cushing
Message 2 of 3 in “feature request mergetool, skip, abort”
  1. Caleb CushingJan 20, 2009
  2. Charles BaileyJan 21, 2009
  3. Caleb CushingJan 21, 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.