`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
1
vote
0 answers
git diff directories commit with inplace working tree files
My question is related to a question I asked some time ago: Git diff directories.
This works but it copies the current working tree files to a temporary folder. So actually I am only comparing copies.
What I would like to do is compare a commit to…
Uwe Hafner
- 4,889
- 2
- 27
- 44
1
vote
1 answer
GitConfig backslash problem IntelliJ mergetool and difftool
I currently have in C:\Users\me\.gitconfig the following contents
[merge]
tool = intellij
[mergetool "intellij"]
cmd = cmd.exe //c "\"C:/Program Files/JetBrains/IntelliJ IDEA 2018.1.5/bin/idea.bat\" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\"…
Saravanabalagi Ramachandran
- 8,551
- 11
- 53
- 102
1
vote
1 answer
git difftool on ubuntu only returns diff on terminal not with meld
I have meld installed on the ubuntu machine and I've been able to open files using meld.
I followed the answer on Setting up and using Meld as your git difftool and mergetool to setup gifftool to use meld.
the following is my git…
nogeek001
- 713
- 1
- 7
- 14
1
vote
1 answer
How to alter context ("unified") on `git difftool`?
I tried -U9("--unified") and git config --global diff.context - it affects only git diff but neither git difftool (I prefer vimdiff) nor git commit -p (commit by hunks).
Vitaly Zdanevich
- 13,032
- 8
- 47
- 81
1
vote
1 answer
Why is my difftool not working anymore?
It used to work but after changing my laptop, it is not recognized anymore. Any help is highly appreciated!
Here is what I tried using Git Bash (git version 2.16.2.windows.1):
$ git config --list…
Christoph
- 6,841
- 4
- 37
- 89
1
vote
0 answers
git difftool gives strange results with staged and also unstaged changes
meld (for example) is selected for git difftool invocation:
git config --list | grep diff
gives:
diff.tool=meld
I have one file with only staged changes, and another file with unstaged changes.
When I run git difftool, I expect only the unstaged…
Bludzee
- 2,733
- 5
- 38
- 46
1
vote
1 answer
How to identify what exactly happened in the git difftool output
I used git difftool to get the diff in between 2 commits in context format by using
git difftool -y -x "diff -c" $1 $2 >>./tempFiles/diffAll.txt
here $1 and $2 are two commit hashes which are passed as command line arguments to the shell script…
Kasun Siyambalapitiya
- 3,956
- 8
- 38
- 58
1
vote
1 answer
Using OS X FileMerge/opendiff to view git differences, loading all files at once in the directory view
We are version controlling our project using git. Developing under OS X, we'd like to use the FileMerge application distributed with the development tools to display git generated differences:
If we understood correctly, it is possible to configure…
Ad N
- 7,930
- 6
- 36
- 80
1
vote
0 answers
Why my MsysGit bash can not use winmerge as difftool
I tried to use winmerge as a difftool, but my git bash just can not use it.
I tried to use follow cmds.
git config --replace --global diff.tool winmerge
git config --replace --global difftool.winmerge.cmd "winmerge.sh \"$LOCAL\" \"$REMOTE\""
git…
Yu Li
- 11
- 4
1
vote
1 answer
Weird terminal behavior with "git difftool"
When I try to use "git difftool", the terminal seems to enter a mode where hitting the "enter" key outputs ^M instead of accepting the default option:
$ git difftool --tool=tkdiff file
Viewing (1/1): 'file'
Launch 'tkdiff' [Y/n]:…
dfrankow
- 20,191
- 41
- 152
- 214
1
vote
1 answer
Git diff of branches or commits showing file list overview in visual difftool and then selectable single file diff
tl;dr: How can I get my custom difftool to open a directory/file view of a branch or commit diff so I can jump inside of my difftool in single file diffs and back to directory list to select the next pair of files? Using git and Beyond Compare 4.…
Uwe Hafner
- 4,889
- 2
- 27
- 44
1
vote
1 answer
Export local Git changes into some diff file for viewing externally
What's the best way in Git to save my local changes into some file format so that others can review it before I make the commit? I know one way to do this is to use git stash save -p and others can view the patch file. However, I was wondering if…
user1715925
- 607
- 9
- 26
1
vote
0 answers
git difftool beyond compare - can edit files from diff?
I am using Beyond Compare 4 (beta) as the difftool in git on windows.
Here are the settings:
[diff]
tool = bc4
[difftool]
prompt = false
[difftool "bc4"]
cmd = \"C:/Program Files (x86)/Beyond Compare 4/BComp.exe\" "$LOCAL"…
Malki
- 2,335
- 8
- 31
- 61
0
votes
0 answers
Unable to Copy Changes Back Using git-difftool with Beyond Compare 4/Meld
I have been using git-difftool along with Beyond Compare 4 and Meld to review and revert changes in the working directory. While this process works smoothly for most files, I have encountered an issue where certain files do not have their changes…
Aleksandr Amirkhanov
- 11
- 3
0
votes
1 answer
Git difftool with missing file locally
I am using BeyondCompare to do merge, but I have an issue with not existing files locally.
On branch dev I have the file src/foo.hpp, but on master I don't have this file.
When I do :
git checkout master
git difftool dev
I cannot save my file,…
nowox
- 25,978
- 39
- 143
- 293