`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
How to setup external difftool for windows 10
I am trying to setup an external difftool, I've read many pages but no one has provided a solution that works, or they leave out information.
I have gotten to where the program opens but only one file is showing, the other is missing. I used the…
Galivan
- 4,842
- 9
- 44
- 76
0
votes
3 answers
Git - Get the difference between branches of two repositories
How can we get the list of files differences between two branches residing in two separate repositories
Scenario: Suppose we have 2 repositories 'A' & 'B', B was created from A since A is the base repo. Now the development work has been taking place…
Mitul Panchal
- 143
- 2
- 13
0
votes
1 answer
How to debug git difftool command ( WinMerge , git on windows)
I have spend some time to configure git (git version 2.35.3.windows.1) to use WinMerge (2.16.20) as a external difftool. This post was my entry point and this Gist seem to help some people. Still no luck on my side.
$ git config --global --list
…
dim
- 136
- 1
- 12
0
votes
1 answer
Git with ExamDiff Pro prompts for file changes during directory comparison
I am using ExamDiff Pro with git for Windows under Windows 10.
When I run git difftool --dir-diff , the directory comparison screen of EDP is brought up, showing the different files, but then I start getting popups that the files…
Alex O
- 1,429
- 2
- 13
- 20
0
votes
1 answer
How can I stop git difftool?
I use Meld as tool for difftool and mergetool in Git Bash.
When I run git difftool it opens a window of Meld and, every time I close the window with a difference, it opens a new window with the next difference. And so on, they could be…
Filippo
- 126
- 1
- 12
0
votes
1 answer
Using git difftool for files comparsion in Debian Linux v. 10 (buster)
In Debian Linux v. 9 I use following command to do files comparison and this command is working OK:
git difftool /file/a /file/b
In Debian Linux v. 10 I use this command in the same way and have following error:
fatal: not a git repository (or any…
mshta
- 3
- 2
0
votes
0 answers
How to let `git diff` invoke `git difftool -t opendiff -y`?
The short question is: how to make
git diff
invoke
git difftool -t opendiff -y
? The second line is to invoke opendiff to diff some files, even when there is no configuration whatsoever done beforehand (I am using git version 1.9.2 and the current…
nonopolarity
- 146,324
- 131
- 460
- 740
0
votes
0 answers
how to display changed code in a PR in UI before git push
I am using VScode and git together and I am wondering whether there is a way or plugin to display the changes in UI in this PR before I git push. The current vscode diff tool does not display changes after git commit.
derek
- 9,358
- 11
- 53
- 94
0
votes
0 answers
See only the first line change using `diff` command
Say I want to diff two files:
diff --ignore-space-change foo.go bar.go
is there a way to print only the first line change - basically to tell diff to stop working after the first line change is detected - and print that change?
For example, say…
user12211419
0
votes
1 answer
Show Original File Names With git-difftool
I use xxdiff with git-difftool, but other GUI diff tools have the same problem. Often, git-difftool has to save the files being compared as temporary files with names like /tmp/i2mLYu_MyHeader.h. That's for a file that, relative to the working…
Jim
- 474
- 5
- 17
0
votes
1 answer
In git, how can I avoid conflicts merging minor corrections into a branch where a line of new content was inserted between every line of the original?
Someone asked why does a seemingly possible merge using git have conflicts with code similar to mine, but (1) mine is a little different and (2) I seek a solution to the problem not just an explanation.
edit: this is something I need to do for many…
Aaron Surrain
- 366
- 4
- 11
0
votes
1 answer
Git: how can I mark a file as reviewed before commit?
I'm a Perforce veteran who is moving our organization over to git. One thing I'm stuck on is how to manage large commits (I'm not referring to many different changes at once -- which I know isn't optimal -- but rather, a single type of change that…
Kevin Meboe
- 143
- 1
- 6
0
votes
1 answer
Git - apply change made in the difftool
I'm sure this is very basic, but I've read the docs, and still can't figure it out.
I have two branches, and I need to merge some changes in a couple of files in manually (don't ask). I am viewing the files side by side, with the difference…
Alex
- 2,270
- 3
- 33
- 65
0
votes
1 answer
Better highlighting for current selection in diff viewer
I'm used to check all my changes before committing anything. Therefore I mainly use the keyboard this way:
Open the files diff-viewer
Use shortcut for command workbench.action.compareEditor.nextChange to navigate through all changes (Alt+Down in my…
suamikim
- 5,350
- 9
- 40
- 75
0
votes
2 answers
Git difftool with beyond compare
I am trying to compare two git branches.
With git I would do
git diff banch1..branch2
With the Beyond Compare tool I tried
git difftool branch1..branch2
but now it looks like it's comparing the branches file by file. So I added the --dir-diff…
Manfredo
- 1,760
- 4
- 25
- 53