`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
0
votes
1 answer
git difftool directories between branches
This question contains two separated but closely related questions:
First;
I am attempting to compare two files which are located in different branches (THIS_BRANCH, OTHER_BRANCH)
The file (file.txt) path has been moved around between the branches.…
orialz
- 75
- 1
- 9
0
votes
1 answer
Overlay A' project over earlier A project: Seeking Git Use Case/Pattern to delete A files no longer needed?
Assume a non-version controlled project directory with sub-directories (A).
A year later, that directory is COPIED and further development occurs (A').
I've just added the earlier version, A, to Git. In the spirit of version control I wish to copy…
Pete Alvin
- 4,646
- 9
- 39
- 56
0
votes
1 answer
git difftool diff history version, show up so many windows
When I use git difftool to compare 2 history version of 1 file. I met a problem. After I enter the command, it will show hundreds of windows.
> git log --pretty=oneline
...
>…
BBKing
- 5
- 4
0
votes
3 answers
git difftool Beyond Compare 4 not diffing local with remote
I am using CYGWIN and Beyond Compare 4 Pro Edition. I have set up the following .gitconfig file:
[diff]
tool = bc3
[difftool "bc3"]
path = c:/program files/beyond compare 4/bcomp.exe
[merge]
tool = bc3
[mergetool "bc3"]
path =…
jipot
- 304
- 3
- 13
- 34
0
votes
0 answers
Using git difftool to compare current branch to other branch commit
Current git branch I'm using is X.
I Would like to use installed difftool (in my case, kdiff3) in order to diff X against branch Y-specific commit.
e.g. git difftool branch_X..branch_Y$commit_hash --tool=kdiff3
What is the correct syntax to achieve…
Adiel
- 1,203
- 3
- 18
- 31
0
votes
2 answers
How to prevent `git difftool` from calling another `vimdiff`?
I have git configured (like below) to use vimdiff as difftool and compare another pair of files without prompting as soon as I call :qa. It's awesome. The only problem is sometimes there are differences in many files. How do I prevent git from…
cprn
- 1,561
- 1
- 19
- 25
0
votes
1 answer
Git difftool not working on diffing two branches
Im trying to diff 2 branches with the
git difftool master..presentation
Command. I tried both Meld and vsdiffmerge but for some reason they're not working. All the command does is repeatedly asking me if I want to diff the file with the current…
Kevin Kuegler
- 75
- 1
- 10
0
votes
1 answer
difftool - Only loading 1 version of gitfile instead of 2
I'm trying to use INET PDFC as a difftool for comparing different versions of a pdf file.
Config file
...
[diff]
tool = pdfc
[difftool "pdfc"]
cmd = 'C:/Program Files (x86)/i-net PDFC/PDFC.exe' $LOCAL $REMOTE
When I run git difftool HEAD…
Cedric Berlanger
- 63
- 6
0
votes
1 answer
How to merge file changes through git difftool
I have another front end developer working with me who is just beginning in Javascript. I'd like to review his code for a while as he comes up to speed. Is it possible that as I merge his branch in that each file changed kicks out a call to difftool…
risingtiger
- 851
- 1
- 11
- 21
0
votes
1 answer
How to use winmerge as the merge/diff tool for git installed on Linux
$ cd testGit/
$ ls
first.txt second.txt
$ git log --oneline
9c88fb7 add second lines to 1st & 2nd files
9c3da6c add 1st & 2nd files
$ git diff 9c88fb7 9c3da6c first.txt
warning: LF will be replaced by CRLF in first.txt.
The file will have its…
q0987
- 34,938
- 69
- 242
- 387
0
votes
1 answer
Git diff with textutil
I want to compare .doc or .docx files with git diff using textutil. For example: textutil 'Hello.doc' -convert txt -stdout. But I cannot figure out how to put that in my configuration file with arguments without writing a new git difftool. I also…
Max Isom
- 98
- 3
- 11