Stack Overflow
Stack Overflow

Questions tagged [difftool]

107 questions
4
votes
1 answer

View full file diff of `x` commits of a single file's history (that's hosted in git)

Say I have a file in git called filex.code, and I want to see the full code of the last x versions of that file with each changed section highlighted -- all in one place. So an x-paned commit history of filex.code, almost as if I were doing an…
ruffin
  • 16,507
  • 9
  • 88
  • 138
3
votes
1 answer

git difftool --cached stops working after the ninth file

I'm using Windows 10 and I've configured git to use Araxis Merge as the external diff tool. When I do a git difftool --cached everything goes well unless I have more than 9 files staged. Once I close the window for the 9th difference, no more…
sixeyes
  • 483
  • 3
  • 14
3
votes
2 answers

How to use different merge and diff tool in git?

I prefer to use meld as the diff tool. However it doesn't have an option to quickly solve all simple conflicts so in case of merging I'd like to use kdiff3 I've set merge.tool to kdiff3 and diff.guitool to meld but git difftool still always run…
phuclv
  • 37,963
  • 15
  • 156
  • 475
3
votes
1 answer

Make meld display user friendly title when used as git difftool

I use meld as my git difftool. Often when comparing my current state against a particular branch (for example) like this: git difftool -d branchname Unless it's obvious from the code state, I have a hard time figuring out which is my current…
Spacemoose
  • 3,856
  • 1
  • 27
  • 48
3
votes
0 answers

Git difftool -- how to ignore images?

i'm a git / osx / unix newbie but in my current job, i'm using them all. i run "git difftool" a lot to compare changes in a commit, but any time it runs into an image, i get an error from FileMerge and i have to make a few unnecessary clicks to…
Doug Varn
  • 31
  • 2
3
votes
1 answer

Using git difftool to view differences in entire directory

I'm having trouble trying to use git difftool (in this case, opendiff for mac) to visualise the differences made in the latest git commit. I don't want to launch opendiff for each pair of files that has changed, I just want to launch one instance of…
Eddy
  • 6,661
  • 21
  • 58
  • 71
3
votes
1 answer

git difftool --dir-diff: how to copy back changed files

I use git-diffall before, but the author said it was obsolete by the git difftool --dir-diff command. The command git difftool --dir-diff cannot copy back what I change code in the difftool which like git-diffall's --copy-back option do. I searched…
HaveF
  • 2,995
  • 2
  • 26
  • 36
2
votes
2 answers

git difftool is not working as configured in .gitconfig

I am using Beyond Compare as my external diff tool. It does not work when I configure it on my new computer in the .gitconfig as I did on other computers. If I specify the extcmd with too many quotes then it does work. One big difference between now…
Sirius 5
  • 103
  • 9
2
votes
1 answer

Can I get character highlighting in VS Code difftool mode?

When VS Code is used as a diff tool, e.g. with git difftool, it shows changed lines in red and green. Is there a way to highlight the changed characters (in addition to or instead of the lines) so that they stand out more?
Felix Dombek
  • 13,664
  • 17
  • 79
  • 131
2
votes
0 answers

Git mergetool will not launch, but difftool will

I have conflicts after a merge. To resolve the conflicts, I am trying to use Meld. I don't have any trouble viewing the differences using the difftool. However, when I use the mergetool, Meld will not open. Git Bash after using the mergetool…
asd asdf
  • 21
  • 4
2
votes
2 answers

how to end git difftool session (beyond compare )?

I'm using the command git difftool --tool=bc3, git opens the first file with beyond compare and wait for me to close it, than it opens the next file and it go over and over again. How can I force git to close this session? Thanks.
aviyaChe
  • 145
  • 1
  • 9
2
votes
2 answers

Why can't I configure an external difftool or mergetool for Git?

I'm trying to configure an external difftool and mergetool for Git under Windows 10. Everything keeps telling me to type out two Git commands like the ones below. Some say to use a wrapper.sh while others say it's not necessary. git config --global…
Ag71191
  • 83
  • 1
  • 9
2
votes
1 answer

git difftool, winmerge with new files

I've seen the entries on only showing modified files etc. with difftool but has anyone found a way yet to also show the new files? I still want to see what someone added as part of the commit, even though it's a new file and not a modification. …
Papadeltasierra
  • 233
  • 1
  • 9
2
votes
1 answer

Problems using diffmerge mergetool with git

I was trying to resolve some merging conflicts in git using diffmerge, which I just set op on my machine, but it fails and thie error appears: Hit return to start merge resolution tool (diffmerge): C:\Program Files…
Pontiacks
  • 1,118
  • 2
  • 13
  • 23
2
votes
2 answers

git bash: Can't spawn kdiff3 as difftool

I'm trying to use KDiff3 as a difftool in Git Bash on a Windows 8.1 system, and I'm admittedly pretty new to Git. I can't get KDiff3 to open when I try comparing a staged file to the committed file, and I'm confused about what to do about it. I…
shirewoman2
  • 1,842
  • 4
  • 19
  • 31
1 2 3
4
5 6 7 8