Stack Overflow
Stack Overflow

Questions tagged [difftool]

107 questions
6
votes
1 answer

Using meld as difftool for git but listing all files in one window

I want to use meld as my diff tool for git. If I configure my .gitconfig like this : [difftool] prompt = false [diff] tool = meld and run command : $ git difftool then git open a meld window for each file which have changes. But I want one…
Benjamin
  • 490
  • 1
  • 5
  • 19
6
votes
2 answers

Can I use WinMerge as my merge/diff tool within Visual Studio?

I need to compare two files in my project, which is written in C#. Can I integrate WinMerge (or any other diff tool) with Visual Studio and use it easily from within?
Neeraj Dubey
  • 4,401
  • 8
  • 30
  • 49
6
votes
2 answers

git difftool runs git diff

I am obviously overlooking something very simple here, but I am not seeing it. The command webstorm diff ~/test.txt ~/test2.txt runs the JetBrains graphical diff tool. I am running git 1.8.3.2 and have a git .config that includes [diff] tool…
baldmark
  • 699
  • 11
  • 23
6
votes
1 answer

git difftool: how to measure progress, that is number of files diff'ed and to diff?

I know I can use git difftool with the --dir-diff option in order to compare all the files in one go. But using difftool with prompt has its use (for a reasonably small number of files to diff), especially since git 1.7.8, where you can skip a…
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
6
votes
1 answer

Invoking external difftool from git-gui?

I have p4merge configured so that from the command line if I do a "git difftool ... " then the external diff tool opens up correctly. I would like to open the external difftool from "git gui" instead of the command line. Is this possible? Is seems…
Debajit
  • 46,327
  • 33
  • 91
  • 100
5
votes
1 answer

opendiff (FileMerge) on OS X: choose left by default

Can I configure this tool to default the choice for each differing block to the left side rather than the right side? Right now the workaround is to swap the sides, but this is slightly confusing.
Steven Lu
  • 41,389
  • 58
  • 210
  • 364
5
votes
0 answers

git difftool dir-diff symlinks issue

I'm running msysgit 1.8.3 on a larger project under Windows 8.1. When I issue git difftool --dir-diff, any changes I perform to source files on the left pane will persist back to the working dir. This is good and is the desired behavior. But when I…
AVIDeveloper
  • 2,954
  • 1
  • 25
  • 32
4
votes
2 answers

`git difftool` refuses to run under Emacs inferior shell

When I type git difftool under plain cygwin shell, I just receive benign exit: ~/sb/ws> git difftool ~/sb/ws> But when I type exactly the same thing under Emacs inferior shell (running the same cygwin bash), I receive the following error: ~/sb/ws>…
WinWin
  • 7,493
  • 10
  • 44
  • 53
4
votes
1 answer

git difftool -- how to skip a certain file?

when I do a git difftool, I get the message Hit return to launch 'araxis':. I found out that I can terminate the whole diffing by pressing CTRL-C, but how about skipping a single file? Is this possible? Edit: as of git 1.7.7.1 (and msysgit…
eckes
  • 64,417
  • 29
  • 168
  • 201
4
votes
4 answers

Git difftool not opening sometimes

I have 2 folders (with different code) with git initialized. But when I do git difftool -t meld one repo is working fine and asking me if I want to open files in meld to compare. The other one just output everything in the console and didn't…
Shih-Min Lee
  • 9,350
  • 7
  • 37
  • 67
4
votes
0 answers

Git under Windows - Cannot launch external diff tool

I have a problem with launching meld tool for seeing diff. In my .gitconfig i have: [diff] tool = meld and 'meld' is present in environment path (i can run it just by typing 'meld' in command prompt). Reading lot of tuts how to configure…
dahel
  • 73
  • 1
  • 3
4
votes
1 answer

Why isn't git reading the added file?

I was reading an article that told me to add a file and place it in my path. Not knowing what the author meant by path, i simply put it in my root directory. Trying to run 'git diffall', git says diffall is not a command, any ideas? Thanks in…
FoxyGio
  • 765
  • 1
  • 5
  • 5
4
votes
0 answers

How to set Visual Studio 2013 as default git difftool and mergetool?

I've followed some tutorials and posts but still seems to not work. Is it even possible to set VS2013 as default merge/diff tool for git on Windows? Config [mergetool "vs13"] cmd = "C:\\Program Files (x86)\\Microsoft Visual Studio…
Stan
  • 25,744
  • 53
  • 164
  • 242
4
votes
2 answers

Configure git difftool to edit an uncommited file?

I'd like to compare two files, one file is in another branch and the other is the uncommitted version of the same file in the current branch. So I do : git difftool other_branch_name file_to_compare now I want to edit uncommitted version in the…
PinkFloyd
  • 2,103
  • 4
  • 28
  • 47
4
votes
1 answer

opendiff ( FileMerge ) stopped working with git on Mac OS X

I was using opendiff with git as the difftool on Mac OS X and today it just stopped working. It does not give an error message, it just defaults to dumping the diff on the terminal. I've followed the common guides on how to configure this, but to…
Petruza
  • 11,744
  • 25
  • 84
  • 136
1 2
3
4 5 6 7 8