`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
819
votes
26 answers
How do I view 'git diff' output with my preferred diff tool/ viewer?
When I type git diff, I want to view the output with my visual diff tool of choice (SourceGear "diffmerge" on Windows). How do I configure git to do this?
user3891
- 9,101
- 4
- 24
- 18
189
votes
15 answers
How can I see 'git diff' on the Visual Studio Code side-by-side file?
I would like to know how to see as a file with the command git diff master origin/master in the terminal on Visual Studio Code.
I did a git fetch from my remote repository, and now I want to see the diff, but with the command just show me in the…
Ricardo Jesus Jarquin Perez
- 2,029
- 2
- 10
- 17
27
votes
6 answers
How to setup kdiff3 in Mac OS?
In.gitconfig file I setup up the git diff as follows:
[diff]
tool = kdiff3
[difftool "kdiff3"]
path = path_directory/kdiff3.app
In this setting kdiff is not accessible and I get the following error when I run in terminal
>> git…
J4cK
- 30,459
- 8
- 42
- 54
25
votes
2 answers
OSX Using Beyond Compare as git difftool
When trying to launch Beyond Compare using git, I get this error:
The diff tool bc3 is not available as 'bcompare'
fatal: external diff died, stopping at plugins/PushPlugin.m
Set up diff tool:
$ git config --global diff.tool bc3
Try to compare…
scw
- 5,450
- 8
- 36
- 49
24
votes
2 answers
The diff tool in Visual Studio when using the Git Plugin
Microsoft has released a Git plugin for Visual Studio 2012. I have found it to be excellent, but there doesn't seem to be any option to change the default Diff tool. Worse, I cannot do a diff at all on ascx codebehind files. It only shows a diff…
JosephStyons
- 57,317
- 63
- 160
- 234
11
votes
5 answers
Is it possible to configure the temp file folder in git diff?
When calling git difftool in a repository, git compares the modified files in the local repository with their match in the remote. To do so, it creates a temporary file for the remote, sets the variables LOCAL and REMOTE and calls whichever tool is…
GPhilo
- 18,519
- 9
- 63
- 89
11
votes
1 answer
How to configure SourceGear DiffMerge as mergetool and difftool for github windows?
I know we should use the commands "git mergetool" to resolve the conflicts and "git difftool" to compare the changes.
But how do we set up SourceGear DiffMerge as github mergetool and difftool in github windows?
vineel
- 3,483
- 2
- 29
- 33
9
votes
1 answer
Git diff -cc mode won't be displayed by difftool
I'm not sure what's going on but I just set up my diff tool to be called by git difftool, yet the very first file difftool encounters is displayed in the standard diff manner - on the console with line-by line replacements
diff --cc…
Charles
- 988
- 1
- 11
- 28
9
votes
1 answer
why vsdiffmerge alway open a new VisualStudio and not show the diff
I want to use vsdiffmerge as git diff tool. And I set the .git/config below.
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual…
lindexi
- 4,182
- 3
- 19
- 65
9
votes
2 answers
How to configure visual studio 2017 to use external difftool and mergetool
I configured DiffMerge for difftool and mergetool in git global configuration. I read that Visual Studio honors this settings of global git configuration. Here is my git config:
git config --global --list
difftool.DiffMerge.cmd='C:/Program…
masiboo
- 4,537
- 9
- 75
- 136
9
votes
2 answers
In git how to diff microsoft word documents?
I've been following this guide here on how to diff Microsoft Word documents, but I ran into this error:
Usage: /usr/bin/docx2txt.pl [infile.docx|-|-h] [outfile.txt|-]
/usr/bin/docx2txt.pl < infile.docx
/usr/bin/docx2txt.pl <…
Jack
- 195
- 2
- 8
8
votes
3 answers
Git difftool ridiculously slow in Cygwin/MinGW
I noticed that git difftool is very slow. An delay of about 1..2 seconds appears between each diff invocation.
To benchmark it I have written a custom difftool command:
#!/bin/sh
echo $0 $1 $2
And configured Git to use this tool in my…
nowox
- 25,978
- 39
- 143
- 293
7
votes
2 answers
How to make git log show file paths relative to current directory?
The current Git-based project that I am working on, I am generally always in a sub-directory.
Below is the output when I run the command git log --name-only from a sub-directory of the root of the repository.
commit…
thegreendroid
- 3,239
- 6
- 31
- 40
6
votes
2 answers
How can I get my git merge conflicts into a diff-like format?
I'm merging two git changesets (or perhaps - in the process of git rebase'ing, which merges changesets) involving file foo, and have some merge conflicts. The file looks like so:
text appearing in all changesets
<<<<<<< HEAD
text added on the…
einpoklum
- 118,144
- 57
- 340
- 684
6
votes
2 answers
`git config interactive.diffFilter diff-highlight`: the same diff by lines - and without color
After git config --global interactive.diffFilter diff-highlight my .gitconfig:
# This is Git's per-user configuration file.
[user]
name = Vitaly Zdanevich
email = vitaly.zdanevich@xxx.com
[core]
excludesfile =…
Vitaly Zdanevich
- 13,032
- 8
- 47
- 81