`git difftool` is a built-in Git Perl script that helps users to invoke an external diff tool for their diffs, instead of using the `git diff` command.
Questions tagged [git-difftool]
101 questions
6
votes
3 answers
Git diff between staged or unstaged changes with a remote branch
Is there a way to do a git diff between staged/unstaged changes with a remote branch say origin/branch1. Is there a similar option with git difftool?
OR
Is there a way to diff changes in my local file system (forget about staged or unstaged) with…
maverick112
- 63
- 1
- 4
6
votes
1 answer
Git Difftool Meld Doesn't Work in Babun
I'm currently setting up the Meld difftool to work in Babun using the following commands:
git config --global diff.tool meld
git config --global difftool.prompt false
git config --global difftool.meld.path "/cygdrive/c/Program\ Files\…
JCollerton
- 3,227
- 2
- 20
- 25
6
votes
2 answers
git difftool holding the shell
I'm using git bash for Windows with Beyond & Compare as my difftool (but the same thing occures with any external difftool).
I would like my terminal not to be waiting for the difftool to exit in order to give terminal control back. It would be…
Sbu
- 910
- 11
- 22
6
votes
2 answers
Why git difftool does not open vimdiff in case of conflicts?
After reading this,
I configured git to use vimdiff as diff/merge tool by adding following lines to my ~/.gitconfig:
[diff]
tool = vimdiff
[merge]
tool = vimdiff
[difftool]
prompt = false
[alias]
d = difftool
But…
Vram Vardanian
- 539
- 1
- 5
- 15
6
votes
1 answer
Using meld as difftool for git but listing all files in one window
I want to use meld as my diff tool for git.
If I configure my .gitconfig like this :
[difftool]
prompt = false
[diff]
tool = meld
and run command : $ git difftool
then git open a meld window for each file which have changes.
But I want one…
Benjamin
- 490
- 1
- 5
- 19
5
votes
1 answer
Can I abort git difftool when multiple files are being compared?
I've made a huge mistake.
I've configured git difftool to use vimdiff, and then I've executed a command that compares the entire repository:
git difftool tag1 tag2
Now the difftool launches vim in diff mode for each file that has changed. When I…
Alexander Rechsteiner
- 5,694
- 5
- 34
- 47
4
votes
2 answers
meld doesn't automatically open at the forefront
I am using MacBook Pro. I have set up git difftool to work with meld. Here is my
~/.gitconfig:
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args \"$LOCAL\"…
techguy2000
- 4,861
- 6
- 32
- 48
4
votes
2 answers
Meld error “Cannot import: GTK+; DLL load failed" when launching meld.exe as external git difftool
I'm trying to use Meld as Git Difftool on Windows and was facing following issue:
Launch 'meld' [Y/n]? Y
Cannot import: GTK+
DLL load failed: Das angegebene Modul wurde nicht gefunden.
The following Python error occured:
cx_Freeze: Python error in…
Julia K.
- 111
- 6
4
votes
2 answers
Difftool doesn't open, and command line hangs
I have Meld configured as my difftool. I'm pretty sure it's configured correctly, because if I do git config -l, I get
merge.tool=meld
diff.tool=meld
mergetool.meld.path=C:\Program Files (x86)\Meld\Meld.exe
difftool.meld.path=C:\Program Files…
Ben Rubin
- 6,909
- 7
- 35
- 82
4
votes
2 answers
git - set KDiff3 as default mergetool
After installing KDiff3 for managing conflicts in git, still the default one is opening for me:
Here is the configuration that mentioned in this answer:
git config --global --add merge.tool kdiff3
git config --global --add mergetool.kdiff3.path…
Vahid Najafi
- 4,654
- 11
- 43
- 88
4
votes
2 answers
Beyond Compare 4 failing as git difftool on OSX when already running
I've recently switched to using Beyond Compare as my git difftool/mergetool on OSX. It works fine when Beyond Compare is not already running - git difftool A B works as expected with A appearing in the left pane and B appearing in the right…
DaveAlden
- 30,083
- 11
- 93
- 155
4
votes
1 answer
Is git difftool on binaries possible? If so, how does one configure it?
I've been following guides like these here and here on how to diff binaries in git - more specifically .odt files and microsoft word files.
They have allowed me to $git diff on .odt files and microsoft word files to display the difference…
Jack
- 195
- 2
- 8
4
votes
2 answers
How to diff .odt files with difftool? kdiff3 diff outputs unreadable characters
In git I'm trying to use .gitattributes to compare .odt files, libreofice writer files, with difftool.
From following this guide: http://www-verimag.imag.fr/~moy/opendocument/ I made a .gitattributes file .gitattributes with this:
*.ods…
Jack
- 195
- 2
- 8
4
votes
0 answers
Use meld as git diff tool without a wrapper script
I have installed meld on my system; $ meld works from the command line.
I do
$ git config --global diff.tool meld
and then
$ cd path/to/my/repo
$ git config --list
diff.tool=meld
core.repositoryformatversion=0
core.filemode=true
DanielSank
- 3,303
- 3
- 24
- 42
4
votes
2 answers
How to perform a 3-way visual diff on git?
I'd like to do a 3-way diff of a single file that exist in 2 different branches, that is, the last commit in each branch and also consider the common ancestor.
I want to use an external tool that allows to do 3-way comparison.
I was considering to…
Sergio
- 311
- 1
- 4
- 7