`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
3
votes
4 answers
git diff, with external diff program, just once
When doing a git diff, sometimes I want to use a different diff tool (like, for example, cmp, or a homebrew word-diff program I have in my own bin directory).
Many diff-like programs have an option along the lines of
-D
to tell them to…
Steve Summit
- 45,437
- 7
- 70
- 103
3
votes
0 answers
How to diff docx files with git difftool
Whereas it is not so difficult, to get docx files diffed through
git diff xxx.docx
i did not find a way to do so using git difftool
which would be quite convenient.
To recall configuration for diff:
in gitattributes place a line *.docx…
Reissner
- 31
- 2
3
votes
1 answer
How to exit git difftool when using with Beyond Compare?
I have configured Beyond Compare as difftool.
When I run $ git difftool, it opens all the diff files in BC, but sequentially i.e. the first diff file opens, which I have to close so that the next one opens, and so on.
When the file count is too…
indojin
- 139
- 7
3
votes
1 answer
How do I get araxis merge to work as a git difftool
I've been trying to setup araxis as git difftool, but it never works.
I looked at this thread but it is incomplete:
How do I configure Araxis Merge for use with Git?
here is part of my global config.
[difftool "araxis"]
path = "C:/Program…
gmmo
- 2,577
- 3
- 30
- 56
3
votes
1 answer
git difftool -d to view difference between two historic commits
I'm trying to do something which I think should be simple. I have two old commits in the log, X and Y (where X and Y are commit hashes). I want to see a visual, Directory representation of the differences between the two commits, so I run:
git…
Spacemoose
- 3,856
- 1
- 27
- 48
2
votes
1 answer
Reset external diff tool per command
I've recently installed a new diff tool (difftastic), which messes with my habbit of copying diffs to clipboard (or to file) to send those:
[diff]
external = difft # As per https://difftastic.wilfred.me.uk/git.html
…
Ulysse BN
- 10,116
- 7
- 54
- 82
2
votes
1 answer
how to set VSCodium as git difftool
I tried to set VS-codium (VSCode[Visual-Studio Code] without telemetry data) as git difftool in Fedora linux when I used git difftool command I had an error for not existin --wait command.
I used these command in my terminal:
git config…
Pedram Siavashi
- 135
- 1
- 7
2
votes
0 answers
git difftool with -I option
Since git 2.30, we have the option to specify ignore patterns in git diff. However, I can't get the -I option working with git difftool.
Example
Let's say I add a line with text.
git diff -I"text"
returns nothing, as expected.
However,
git difftool…
Mustafa Zengin
- 2,885
- 5
- 21
- 24
2
votes
0 answers
When using git difftool --dir-diff I would like the modification dates to match to original files / repo
When I use git difftool --dir-diff the files are copied to temporary folders and in my diff tool the dates are the time the files were copied.
I'd like the files to have the dates from the working folder / repo.
Is it possible and if so how?
Using…
sixeyes
- 483
- 3
- 14
2
votes
3 answers
Why does git difftool return "cannot run git-difftool--helper" error?
git difftool stopped working and I have no idea why.
# git difftool --tool=vimdiff
error: cannot run git-difftool--helper: No such file or directory
fatal: external diff died, stopping at ...
vimdiff is installed on /bin/vimdiff and working…
Amir Gonnen
- 3,525
- 4
- 32
- 61
2
votes
3 answers
How to open all files at once using VS Code as a Git difftool and mergetool?
Currently, I have VS Code configured to be my git difftool and git mergetool
My ~\.gitconfig file looks like this:
[user]
email = myemail@gmail.com
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
[diff]
tool =…
Kellen Stuart
- 7,775
- 7
- 59
- 82
2
votes
2 answers
How to filter only the lines that are modified in the git context format
I use the following command to identify the no of lines which are been modified in between 2 commits. the b26e..and the e1f5... are the commit hashes
git difftool -y -x "diff -c" b26ea5c511970d0211186c3b1e119224465ad365…
Kasun Siyambalapitiya
- 3,956
- 8
- 38
- 58
2
votes
2 answers
Gui for git to select revision to compare?
I want to compare different revisions of a single file.
On the commandline I can do this by
git difftool : :.
But I want to use a gui to select which revisions are compared.
So, the gui should show a list of…
cknoll
- 2,130
- 4
- 18
- 34
2
votes
1 answer
Sublime Text 3 + Git package: won't launch difftool (Meld)
I'm using Sublime Text 3 plus the Git package to manage my repo. I have the .gitconfig file set up to use the Meld tool (Meld v3.14.2):
[diff]
external = meld
tool = meld
which I can launch from a command prompt with $ git difftool with no…
Gabriel
- 40,504
- 73
- 230
- 404
2
votes
0 answers
Git difftool allowing to make changes on both side
I would like to do a git difftool to make changes on both, the left and the right side.
Suppose that I am working on a branch named feature on which I found and corrected some cosmetic issues such as indentation or spelling errors. However I don't…
nowox
- 25,978
- 39
- 143
- 293