This question calls for “line numbers”. If you do not care about line numbers in the output, see this question and answer. Basically, I don’t want to see the changed content, just the file names and line numbers. 11 Answers 11
How do I show uncommitted changes in Git? I STFW’ed, and these commands are not working: teyan@TEYAN-THINK MINGW64 /d/nano/repos/PSTools/psservice (teyan/psservice) $ git status On branch teyan/psservice Your branch is up-to-date with ‘origin/teyan/psservice’. Changes to be committed: (use “git reset HEAD <file>…” to unstage) modified: psservice.c modified: psservice.vcxproj.filters teyan@TEYAN-THINK MINGW64 /d/nano/repos/PSTools/psservice (teyan/psservice) $ git diff teyan@TEYAN-THINK … Read more
The man page for git-diff is rather long, and explains many cases which don’t seem to be necessary for a beginner. For example: git diff origin/master 6 Answers 6
I am trying to exclude a file (db/irrelevant.php) from a Git diff. I have tried putting a file in the db subdirectory called .gitattributes with the line irrelevant.php -diff and I have also tried creating a file called .git/info/attributes containing db/irrelevant.php. In all cases, the db/irrelevant.php file is included in the diff as a Git … Read more
I am using Git on Ubuntu 10.04 (Lucid Lynx). I have made some commits to my master. However, I want to get the difference between these commits. All of them are on my master branch. For example: commit dj374 made changes commit y4746 made changes commit k73ud made changes I want to get the difference between … Read more
How can I diff a file, say pom.xml, from the master branch to an arbitrary older version in Git? 13 Answers 13
Aside from writing an alias or script, is there a shorter command for getting the diff for a particular commit? git diff 15dc8^..15dc8 If you only give the single commit id git diff 15dc8, it diffs that commit against HEAD. 8 s 8 Use git show $COMMIT. It’ll show you the log message for the … Read more
Some Git commands take commit ranges and one valid syntax is to separate two commit names with two dots .., and another syntax uses three dots …. What are the differences between the two? 4 s 4
This often happens to me: I’m working on a couple related changes at the same time over the course of a day or two, and when it’s time to commit, I end up forgetting what changed in a specific file. (This is just a personal git repo, so I’m ok with having more than one … Read more
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
