Questions tagged [difftool]
107 questions
14
votes
4 answers
How to get directory git branch diff using kdiff
I have configured kDiff3 with my git.
What I need is to see directory difference between two branches. when I run
git difftool
command it opens all files one by one. But that is not I want.
Mahesh Chavda
- 141
- 1
- 3
13
votes
5 answers
Git diff tool on every commit?
I would like to run git difftool HEAD~3.. path/to/file and have git open the difftool for each of those three commits so that I can see a side-by-side view of each commit.
How would I go about getting git-difftool to do that?
Dale Forester
- 18,145
- 10
- 27
- 27
10
votes
2 answers
.gitattributes not making a difference, trying to skip files when using git difftool
I've read the Git Pro website and I've read multiple answers on StackOverflow, but sadly I am simply unable to make .gitattributes work for me.
Whenever I'm using git difftool, it will attempt to display the difference between binary files, such as…
hbCyber
- 773
- 8
- 17
9
votes
1 answer
Use Xcode 4 as Git difftool
I want to use Xcode 4's "Version Editor" view as my standard difftool for Git.
In other words, I want to be able to set this option:
git config --global diff.external
And have the diff open in Xcode's diff viewer (because it's cool).
Is…
andrhamm
- 3,924
- 4
- 33
- 46
9
votes
1 answer
WinMerge via git difftool keeps prompting for second file
I used @VonC's excellent instructions to configure my development system so that git difftool will invoke WinMerge. Here is what I did:
Placed the following in ~/.gitconfig:
[diff]
tool = winmerge
[difftool "winmerge"]
cmd =…
WinWin
- 7,493
- 10
- 44
- 53
9
votes
2 answers
Git difftool - KDiff3 can't edit a file
I have the following difftool configuration for KDiff3 in file .gitconfig,
[difftool "kdiff3"]
external = '"C:/Program Files/KDiff3/kdiff3.exe" "$LOCAL" "$REMOTE" --output "$MERGED"'
trustExitCode = false
[difftool]
prompt =…
B Dev
- 91
- 1
- 3
9
votes
1 answer
View changes from "git log -p" in "difftool"
I'm getting branch changes for review by using git log -p master..newbranch, but it just gives me diff file. How can I view this diff with external tool like meld? I want to see what was changed only in this specific branch (from branch start to…
Kuroki Kaze
- 8,161
- 4
- 36
- 48
8
votes
1 answer
Meld has errors on OSX 10.10
I installed Meld 3.14.0 (current version as of this post) via Homebrew on OSX. Whenever I launch it, it gives me this:
Couldn't bind the translation domain. Some translations won't work.
'module' object has no attribute 'bindtextdomain'
2015-08-13…
boltup_im_coding
- 6,345
- 6
- 40
- 52
7
votes
1 answer
Git: configure patterns for difftool and mergetool
In Mercurial, one can define a pattern for external diff and merge tools (so that they are called only for files matching the pattern specified):
[diff-patterns]
**.ext = difftool
[merge-patterns]
**.ext = mergetool
How to define such patterns in…
utapyngo
- 6,946
- 3
- 44
- 65
7
votes
2 answers
What is the default git diff tool(and merge tool)?
What is the default git diff tool(and merge tool)?
Where(and how) can I find it out?
I've never set any configuration for git difftool(nor mergetool) explicitly,
so git config --get difftool shows nothing.
The git documentation…
ALittleDiff
- 1,191
- 1
- 7
- 24
7
votes
0 answers
Git difftool submodules
I'm thinking about using submodules in a way that they aren't really meant for but my goal is to streamline some things for the devs. I've got a project that is basically made up of only submodules - 4 of them. It is important that they are…
BLowe
- 306
- 1
- 11
7
votes
3 answers
git difftool does not launch Beyond Compare
I am struggling with git making run Beyond Compare as my difftool.
I'm using "Git For Windows", Windows 7 32 bits and Beyond Compare 4
$ git --version
git version 1.9.5.msysgit.1
$ git config --list
[diff]
tool = bc3
[difftool "bc3"]
path =…
diegot
- 71
- 1
- 5
6
votes
1 answer
Git difftool problem: unable to create temp-file
I'm using git with Kaleidoscope configured as the difftool. It's been working fine for months. It was working a day or two ago as well. Today, when I tried doing a "git difftool", suddenly, git reports
fatal: unable to create temp-file: No such…
odie
- 63
- 1
- 5
6
votes
1 answer
How to get winmerge to show diff for new file in git?
I can get winmerge to show me diffs for modified file. But for new files, winmerge gives a dialog saying 'Left path is invalid!'. I want it to show the left pane as empty and right pane with the contents of the file.
$ git difftool head^…
hIpPy
- 4,649
- 6
- 51
- 65
6
votes
0 answers
/usr/lib/git-core/git-difftool line 266: File exists
I try to diff an entire directory with git-difftool and I get the following error:
$ git difftool -d
/usr/lib/git-core/git-difftool line 266: File exists
The alternative is to use the --no-symlinks option, but that means that I cannot edit the…
Lucian M
- 61
- 2