Questions tagged [difftool]
107 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
283
votes
13 answers
git difftool, open all diff files immediately, not in serial
The default git diff behavior is to open each diff file in serial (wait for previous file to be closed before opening next file).
I'm looking for a way to open all the files at once - in BeyondCompare for example this would open all the files in…
Seba Illingworth
- 5,672
- 3
- 27
- 25
184
votes
2 answers
Why does "git difftool" not open the tool directly?
I configured git like this:
git config --global diff.tool meld
When I run:
git difftool
I get the following message:
Viewing: 'hello.txt'
Hit return to launch 'meld':
Then, if I press Enter, meld will launch.
How can I disable this message, so…
Misha Moroshko
- 166,356
- 226
- 505
- 746
68
votes
16 answers
How can I make WinMerge my git mergetool?
I'm trying to integrate WinMerge with Git as I've seen others done before on Windows 7 Ultimate.
I've followed the following steps, but an error continues to show up when I do a git mergetool which defaults to vimdiff.
Created a file called…
Wei Jin
- 701
- 1
- 6
- 3
47
votes
3 answers
Git and DiffTool problems : What do LOCAL and REMOTE point to?
Ive been working on getting tortoisemerge working as the difftool option in Git with my .gitconfig file currently showing :
[diff]
tool = tortoise
[difftool "tortoise"]
cmd = tortoisemerge.exe -mine:$LOCAL -base:$REMOTE
…
x1886x
- 1,217
- 2
- 12
- 21
32
votes
3 answers
View already-committed Git merge in external 3-way diff tool
Is there any way to view a merge that has already been committed in a 3-way diff?
If a huge merge between branches was committed 3 weeks ago, is there any way I can see a 3-way diff of it in an external diff-tool like BeyondCompare3? I'm looking for…
Sean
- 533
- 1
- 5
- 6
25
votes
3 answers
How to prevent git vimdiff from opening files as read-only?
I'm trying to use vimdiff as a diff tool for Git but, for some reason, the files are always open in read-only mode. It makes sense for the original file but not for the ones that I have modified (since I haven't committed them yet).
This is my…
laurent
- 88,262
- 77
- 290
- 428
22
votes
3 answers
git-difftool: full file tree compare using meld?
Is there an easy way to compare the file tree of an old git commit with the working file tree, in meld?
git-difftool does something very similar, but I don't want it to actually do any diffing; the whole point is that the tool it is calling can…
Andrew Wagner
- 22,677
- 21
- 86
- 100
18
votes
2 answers
Getting Beyond Compare to Diff 2 Branches Simultaneously
>>git difftool branch1 branch2 opens my difftool (Beyond Compare:BC) with every file that has a diff between the branches.
I have to close BC after each file just for it to reopen with the next file.
BC can diff whole directories and multiple…
Adi Shavit
- 16,743
- 5
- 67
- 137
18
votes
5 answers
Git Diff and Meld on Windows
Has anyone ever made Meld work with Git on Windows?
I am trying to make it work and I have no success.
I have Meld installed and when I call it from the command line with two files as parameters it diffs them well so Meld is installed correctly.…
Jacob Krieg
- 2,834
- 15
- 68
- 140
18
votes
1 answer
p4merge fails when doing a directory diff?
I am trying to use p4merge as my diff/merge tool in git.
But I got a serious problem.
I can use p4merge as a difftool with git difftool it works well. And I can also use it as a mergetool. But when I try to let it do a directory diff…
shengy
- 9,461
- 4
- 37
- 61
16
votes
1 answer
How do I jump to the next/prev diff in GIT difftool?
I am using git difftool to compare 2 large files in VIM. I want to navigate only to the lines that differ.
How do I navigate quickly between lines that differ using GIT difftool ?
I am looking for something like winmerge shortcut keys :
Alt+down -…
FacePalm
- 10,992
- 5
- 48
- 50
15
votes
2 answers
Differences between the staged and unstaged versions of the same file, using difftool
Is there a way of viewing the differences between the staged and unstaged versions of the same file?
For example:
Changes to be committed:
modified: conf/application.conf
Changes not staged for commit:
(use "git add/rm ..." to update…
DrKaoliN
- 1,346
- 4
- 25
- 39
15
votes
3 answers
Visual Studio Diff Tool - When is Editing Allowed?
I'm using Visual Studio 2013 and tfs 2013. Sometimes I'll make a code change and click compare with latest version. The diff tool will open and allows me to edit the file in the diff tool. However other times it will not let me edit but will read…
Rafi
- 2,433
- 1
- 25
- 33
14
votes
1 answer
Compare and Edit Branches in Git with a Mergetool
I have 2 branches that I can compare/diff using my difftool (Beyond Compare).
However, the files used for the diff are temporary copies and not the actual files from the current branch.
This means that if I want to make a change to an existing file,…
Adi Shavit
- 16,743
- 5
- 67
- 137