问题
When I do git diff COMMIT
I see the changes between that commit and HEAD (as far as I know), but I would like to see the changes that were made by that single commit.
I haven't found any obvious options on diff
/ log
that will give me that output.
回答1:
To see the diff for a particular COMMIT
hash:
git diff COMMIT~ COMMIT
will show you the difference between that COMMIT
's ancestor and the COMMIT
. See the man pages for git diff for details about the command and gitrevisions about the ~
notation and its friends.
Alternatively, git show COMMIT
will do something very similar. (The commit's data, including its diff - but not for merge commits.) See the git show manpage.
回答2:
As mentioned in "Shorthand for diff of git commit with its parent?", you can also use git diff with:
git diff COMMIT^!
or
git diff-tree -p COMMIT
With git show, you would need (in order to focus on diff alone) to do:
git show --color --pretty=format:%b $COMMIT
The COMMIT
parameter is a commit-ish:
A commit object or an object that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a tag object that points to a commit object, a tag object that points to a tag object that points to a commit object, etc.
See gitrevision "SPECIFYING REVISIONS" to reference a commit-ish.
See also "What does tree-ish mean in Git?".
回答3:
You can also try this easy way:
git show <COMMIT>
回答4:
git show
shows the changes made in the most recent commit.
Equivalent to git show HEAD
.
git show HEAD~1
takes you back 1 commit.
回答5:
First get the commit ID using,
git log #to list all
Or
git log -p -1 #last one commit id
Copy commit id.
Now we use two methods to list changes from a specific commit,
Method 1:
git diff commit_id^! #commit id something like this 1c6a6000asad012
Method 2:
git show commit_id
For example: git show 1c6a600a
回答6:
git show <commit_sha>
This will show you just what's in that commit. I think you can do a range it by just putting a space between two commit shas.
git show <beginning_sha> <ending_sha>
which is pretty helpful if you're rebasing often because your feature logs will all be in a row.
回答7:
I usually do:
git diff HEAD~1
To show the changes regarding the last commit. If you have more commits just increase the number 1 to how many commits diff you want to see.
回答8:
From the man page for git-diff(1):
git diff [options] [<commit>] [--] [<path>…]
git diff [options] --cached [<commit>] [--] [<path>…]
git diff [options] <commit> <commit> [--] [<path>…]
git diff [options] <blob> <blob>
git diff [options] [--no-index] [--] <path> <path>
Use the 3rd one in the middle:
git diff [options] <parent-commit> <commit>
Also from the same man page, at the bottom, in the Examples section:
$ git diff HEAD^ HEAD <3>
Compare the version before the last commit and the last commit.
Admittedly it's worded a little confusingly, it would be less confusing as
Compare the most recent commit with the commit before it.
回答9:
The following seems to do the job; I use it to show what has been brought in by a merge.
git whatchanged -m -n 1 -p <SHA-1 hash of merge commit>
回答10:
Another possibility:
git log -p COMMIT -1
回答11:
You could use git diff HEAD HEAD^1
to see the diff with the parent commit.
If you only want to see the list of files, add the --stat
option.
回答12:
git difftool COMMIT^ <commit hash>
is also possible if you have configured your difftool.
See here how to configure difftool Or the manual page here
Additionally you can use git diff-tree --no-commit-id --name-only -r <commit hash>
to see which files been changed/committed in a give commit hash
回答13:
I like the below command to compare a specific commit and its last commit:
git diff <commit-hash>^-
Example:
git diff cd1b3f485^-
回答14:
To see author and time by commit use git show COMMIT
. Which will result in something like this:
commit 13414df70354678b1b9304ebe4b6d204810f867e
Merge: a2a2894 3a1ba8f
Author: You <you@you.com>
Date: Fri Jul 24 17:46:42 2015 -0700
Merge remote-tracking branch 'origin/your-feature'
If you want to see which files had been changed, run the following with the values from the Merge line above git diff --stat a2a2894 3a1ba8f
.
If you want to see the actual diff, run git --stat a2a2894 3a1ba8f
回答15:
I'm running Git version 2.6.1.windows.1 on Windows 10, so I needed a slight modification to Nevik's answer (tilde instead of caret):
git diff COMMIT~ COMMIT
Another option is to quote the caret:
git diff "COMMIT^" COMMIT
回答16:
For checking complete changes:
git diff <commit_Id_1> <commit_Id_2>
For checking only the changed/added/deleted files:
git diff <commit_Id_1> <commit_Id_2> --name-only
NOTE: For checking diff without commit in between, you don't need to put the commit ids.
回答17:
This command will get you the Git parent commit-hash:
git log -n 2 <commit-hash>
After that git diff-tool <commit-hash> <parent-commit-hash>
Example:
bonnie@bonnie ~/ $ git log -n 2 7f65b9a9d3820525766fcba285b3c678e889fe3
commit 7f65b9a9d3820525766fcba285b3c678e889fe3b
Author: souparno <souparno.majumder@gmail.com>
Date: Mon Jul 25 13:17:07 2016 +0530
CSS changed to maintain the aspect ratio of the channel logos and to fit them properly.
commit c3a61f17e14e2b80cf64b172a45f1b4826ee291f
Author: souparno <souparno.majumder@gmail.com>
Date: Mon Jul 25 11:28:09 2016 +0530
The ratio of the height to width of the channel images are maintained.
After this
git difftool 7f65b9a9d3820525766fcba285b3c678e889fe3b c3a61f17e14e2b80cf64b172a45f1b4826ee291f
回答18:
In case of checking the source change in a graphical view,
$gitk (Mention your commit id here)
for example:
$gitk HEAD~1
来源:https://stackoverflow.com/questions/17563726/how-to-see-the-changes-in-a-git-commit