Regarding code formatting I’m kind of purist :). I very often remove unnecessary white spaces (lines with only ws, ws at the end of lines etc). I even have set vim to show that kind of lines colored to red. My problem is that using git-diff I often see something like this: – else{ + … Read more
In HEAD (the latest commit), I have a file named foo. In my current working tree, I renamed it to bar, and also edited it. I want to git diff foo in HEAD, and bar in my current working tree. 3 Answers 3
I have a large file A (consisting of emails), one line for each mail. I also have another file B that contains another set of mails. Which command would I use to remove all the addresses that appear in file B from the file A. So, if file A contained: A B C and file … Read more
There are two files called “a.txt” and “b.txt” both have a list of words. Now I want to check which words are extra in “a.txt” and are not in “b.txt”. I need a efficient algorithm as I need to compare two dictionaries. 12 Answers 12
I have a series of text files for which I’d like to know the lines in common rather than the lines which are different between them. Command line Unix or Windows is fine. File foo: linux-vdso.so.1 => (0x00007fffccffe000) libvlc.so.2 => /usr/lib/libvlc.so.2 (0x00007f0dc4b0b000) libvlccore.so.0 => /usr/lib/libvlccore.so.0 (0x00007f0dc483f000) libc.so.6 => /lib/libc.so.6 (0x00007f0dc44cd000) File bar: libkdeui.so.5 => /usr/lib/libkdeui.so.5 … Read more
How can I get the difference between two images? I have the original image. Someone has written on an exact duplicate of the original image. Now, I need to compare the original to the written on image and extract just the writing in image format. Example: I have a picture of a house. Someone took … Read more
This answer is great for seeing a visual diff between two files that are checked into git: How do I view ‘git diff’ output with a visual diff program? However, I’d like to see a visual diff between two branches. So far, my best bet seems to be: git diff –name-status master dev which isn’t … Read more
I’ve read through a few questions regarding file permissions in Git and I’m still a bit confused. I’ve got a repo on GitHub forked from another. Post merge, they should be identical. However: $ git diff –summary origin/epsilon master/epsilon mode change 100644 => 100755 ants/dist/sample_bots/csharp/compile.sh mode change 100644 => 100755 ants/dist/starter_bots/coffeescript/MyBot.coffee mode change 100644 => … Read more
As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for … Read more
How does the patience algorithm differ from the default git diff algorithm, and when would I want to use it? 3 Answers 3
