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

Re: Git difftool / mergetool on directory tree

From
NKNeal Kreitzinger <nkreitzinger@gmail.com>
Date
Dec 15, 2011, 19:53 UTC
Message-ID
<4EEA501D.3050401@gmail.com>
In-Reply-To
<4EE8618E.7020902@gmail.com>
On 12/14/2011 2:42 AM, Daniele Segato wrote:
Show 13 quoted lines
> many diff / merge tool around have the ability to compare a directory
> tree (meld is one, but there are many).
>
> Is there a way to start a difftool or a mergetool on a folder instead of
> the single file?
>
> It would be an handsome feature to git.
>
> I googled a little before popping out this question and I only found
> suggestion on how to open "many" file at once instead of opening them
> serially but that's not the same thing not as powerful as directory
> comparison.
>
(This works with kdiff3 as the mergetool/difftool on git 1.7.1 on linux):
git difftool <commit>:<dir>/ <commit-2>:<dir>/
e.g., git difftool mycommit:ourdir/ yourcommit:ourdir/

<commit> = pointer to a commit (ie: sha-1, branchname, tag, ref) <dir> = path of dir relative to worktree

v/r, neal

Previous: Junio C Hamano
Message 4 of 4 in “Git difftool / mergetool on directory tree”
  1. Daniele SegatoDec 14, 2011
  2. Thomas RastDec 14, 2011
  3. Junio C HamanoDec 14, 2011
  4. Neal KreitzingerDec 15, 2011

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.