How to diff one file to an arbitrary version in Git?
How can I diff a file, say pom.xml, from the master branch to an arbitrary older version in Git? 13 Answers 13
diff
Git diff -w ignore whitespace only at start & end of lines
I love to use git diff -w to ignore whitespace differences. But, I just noticed that it ignores even whitespace differences in the middle of lines. How could I only ignore whitespace differences that come at the start (^) or end ($) of lines? 2 Answers 2
Comparing the contents of two files in Sublime Text
I have two cloned repositories of two very similar open-source projects, which I have been working on in different instances in Sublime Text 2 to arrive at my desired result. Code from both of these projects was used. I have been using Git as version control for my project, but have not included the original … Read more
How do I exit the results of ‘git diff’ in Git Bash on windows? [duplicate]
This question already has answers here: How to exit a ‘git status’ list in a terminal? (16 answers) Closed 6 years ago. I’m using Git Bash on Windows 7. When I run git diff, I see this: However, I’m unable to get back to a regular prompt. Pressing Ctrl+C seems to work, but as soon … Read more
How to colorize diff on the command line
When I have a diff, how can I colorize it so that it looks good? I want it for the command line, so please no GUI solutions. 16 s 16 Man pages for diff suggest no solution for colorization from within itself. Please consider using colordiff. It’s a wrapper around diff that produces the same … Read more
git-diff to ignore ^M
In a project where some of the files contains ^M as newline separators. Diffing these files are apparently impossible, since git-diff sees it as the entire file is just a single line. How does one diff with the previous version? Is there an option like “treat ^M as newline when diffing” ? prompt> git-diff “HEAD^” … Read more
How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?
I have a .diff file created by a coworker, and would like to apply the changes listed in that diff file to my local branch of the exact same repository. I do not have access to that worker’s pc or branch that was used to generate this diff file. Obviously I could go line by … Read more
How to see the changes between two commits without commits in-between?
How do you make git diff only show the difference between two commits, excluding the other commits in-between? 15 s 15 you can simply pass the 2 commits to git diff like : -> git diff 0da94be 59ff30c > my.patch -> git apply my.patch
How do I view ‘git diff’ output with my preferred diff tool/ viewer?
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? 26 s 26 Since Git1.6.3, you can use the git difftool script: see my answer below. May be this article will help you. Here are … Read more
Given two directory trees, how can I find out which files differ by content? [closed]
Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers. Want to improve this question? Update the question so it’s on-topic for Stack Overflow. Closed 12 months ago. Improve this question If I want find the differences between two directory trees, I usually just execute: diff -r dir1/ dir2/ This … Read more
