Changes between one version of a file and a former version of the same file
326
votes
16answers
128k views
How do I view 'git diff' output with a visual diff program?
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?
215
votes
4answers
39k views
How do I show the changes which have been staged?
I staged a few changes to be committed; how can I see the diff of all files which are staged for the next commit? I'm aware of git status, but I'd like to see the actual diffs - not just the names of ...
190
votes
21answers
87k views
Compare two MySQL databases [closed]
I have a database in MySQL that I am currently developing. I have a copy of this database on my development machine which I modify as fast as I develop and a copy on a test server. My question is:
Is ...
138
votes
4answers
53k views
How to apply `git diff` patch without Git installed?
How can my client apply patch created by git diff without git installed?
I have tried to use patch command but it always asks file name to patch.
94
votes
13answers
35k views
MySQL Diff Tool [closed]
Does anyone know any visual MySQL diff tools?
I have about 10 machines all with their own instance of MySQL. No replication is taking place, since each machine acts independently of the others. ...
90
votes
16answers
58k views
Graphical DIFF programs for linux [closed]
I really like Araxis Merge for a graphical DIFF program for the PC. I have no idea
what's available for linux, though. We're running SUSE linix on our z800 mainframe.
I'd be most grateful if I could ...
85
votes
3answers
28k views
Vimdiff: What are the most frequently used commands/shortcuts that could get a newbie started?
I've started using vimdiff today, and wanted to do some of the things that I've taken for granted on Windows based diff editors (like expand/collapse a diff section, have full file expansion/only ...
78
votes
12answers
54k views
Best free 3-Way Merge Tool for Windows [closed]
I'm looking for a good free 3-way Merge/Diff tool for Windows.
I know of KDiff3. But I was looking for further recommendations.
75
votes
8answers
10k views
git diff - handling long lines?
I'm running git-diff on a file, but the change is at the end of a long line.
If I use cursor keys to move right it loses colour coding and worse the lines don't line up, making it harder to track the ...
70
votes
20answers
59k views
How do I diff two spreadsheets?
We have a lot of spreadsheets (xls) in our subversion repository. These are usually edited with gnumeric or openoffice.org, and are mostly used to populate databases for unit testing with dbUnit. ...
67
votes
11answers
46k views
Binary diff tool for very large files?
I need a utility to diff two binary files. The files are large (6-50 GB).
Note: It needs to be specifically pointed out here: most diff programs work by mapping the file into their virtual address ...
61
votes
10answers
5k views
Semantic Diff Utilities
I'm trying to find some good examples of semantic diff/merge utilities. The traditional paradigm of comparing source code files works by comparing lines and characters.. but are there any utilities ...
60
votes
8answers
32k views
Highlight the difference between two strings in PHP
What is the easiest way to highlight the difference between two strings in PHP?
I'm thinking along the lines of the Stack Overflow edit history page, where new text is in green and removed text is in ...
60
votes
14answers
34k views
How do I apply a diff patch on Windows?
There are plenty of programs out there that can create a diff patch, but I'm having a heck of a time trying to apply one. I'm trying to distribute a patch, and I got a question from a user about how ...
57
votes
2answers
14k views
Viewing all `git diffs` with vimdiff
I have setup git diff to wrap into vimdiff (using this guide) and it's working as expected unless there are many files with changes. When there are multiple files with changes and I run git diff, it ...
