diff

Is there possibility of copy ONLY difference of two files? Like in winmerge, but, I can't find this option Just like on this screen- i want to copy only 'yellow part' . Of course I can do that manually, but in big file it's not too funny :-) WinMerge has a built-in and simple way to generate such "diff only" files, that they called "patches". Click on "Tool", then on "Generate Patch...", and enter where you want to store the result: You will obtain (for your example) the file 4,8c4,8 < HELLO WORLD < HELLO WORLD < HELLO WORLD < HELLO WORLD < HELLO WORLD --- > > > > > That uses the standard,

This question already has answers here : Show both staged & working tree in git diff? (3 answers) 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 <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: conf/application.conf This happens when I stage a change and then I modify the file again, without staging it. EDIT The git status -vv command is not good

I'd like to ignore newlines when I compare c source files. For example I want following two codes are reported they are same. // codeA int main(int argc, char *argv[]) { // codeB int main(int argc, char *argv[]) { I already have tried following options but could not get the result. diff -b codeA codeB diff -w codeA codeB You can pretty print both files using, for example, GNU Indent, http://www.gnu.org/software/indent/ , and then compare them with diff. There is a tool called "word diff" (tool command line must be 'wdiff') which might help. http://www.gnu.org/software/wdiff/manual/wdiff.html

The linux file command does a very good job in recognising file types and gives very fine-grained results. The diff tool is able to tell binary files from text files, producing a different output. Is there a way to tell binary files form text files? All I want is a yes/no answer whether a given file is binary. Because it's difficult to define binary, let's say I want to know if diff will attempt a text-based comparison. To clarify the question: I do not care if it's ASCII text or XML as long as it's text. Also, I do not want to differentiate between MP3 and JPEG files, as they're all binary.

I have a small scripting project that consists of five different source files in one directory called "Droid XX-XX-XX". Each time I created a new backup copy of the source directory, I put the date in the X's. So there are about 15 different versions from different dates. I want to add each of these to my bare new Git repository starting from the earliest. However I have run into several problems. One problem is that some of the files use tabs for indentation, while others use spaces -- but Git treats a whole line as different even when the only difference is the tab vs. space issue. How can I