查找当前版本和最新版本之间的差异

Question

使用 Git，您如何找到当前版本和上一个版本之间的差异？

git diff last version:HEAD

Answer 1

I don't really understand the meaning of "last version".

As the previous commit can be accessed with HEAD^, I think that you are looking for something like:

git diff HEAD^ HEAD

As of Git 1.8.5, @ is an alias for HEAD , so you can use:

git diff @~..@

The following will also work:

git show

If you want to know the diff between head and any commit you can use:

git diff commit_id HEAD

And this will launch your visual diff tool (if configured):

git difftool HEAD^ HEAD

Since comparison to HEAD is default you can omit it (as pointed out by Orient ):

git diff @^
git diff HEAD^
git diff commit_id

Warnings

• @ScottF and @Panzercrisis explain in the comments that on Windows the ~ character must be used instead of ^ .

Answer 2

Assuming "current version" is the working directory (uncommitted modifications) and "last version" is HEAD (last committed modifications for the current branch), simply do

git diff HEAD

Credit for the following goes to user Cerran .

And if you always skip the staging area with -a when you commit, then you can simply use git diff .

Summary

1. git diff shows unstaged changes.
2. git diff --cached shows staged changes.
3. git diff HEAD shows all changes (both staged and unstaged).

Source: git-diff(1) Manual Page – Cerran

Answer 3

正如amalloy的评论所指出的那样，如果“当前和最新版本”是指最后一次提交和之前的提交，则可以简单地使用

git show

Answer 4

Difference between last but one commit and last commit (plus current state, if any):

git diff HEAD~

or even (easier to type)

git diff @~

where @ is the synonim for HEAD of current branch and ~ means "give me the parent of mentioned revision".

Answer 5

You can do it this way too:

Compare with the previous commit

git diff --name-status HEAD~1..HEAD

Compare with the current and previous two commits

git diff --name-status HEAD~2..HEAD

Answer 6

如果您添加但尚未提交，只需使用cached标志：

git diff --cached --color

Answer 7

Quick and simple, assuming you're in the master:

    git diff (checkout_id):file.txt file.txt

Example:

    git diff asdfioei91819280din198:file.txt file.txt

Answer 8

Firstly, use " git log " to list the logs for the repository.

Now, select the two commit IDs, pertaining to the two commits. You want to see the differences ( example - Top most commit and some older commit (as per your expectation of current-version and some old version) ).

Next, use:

git diff <commit_id1> <commit_id2>

or

git difftool <commit_id1> <commit_id2>

Answer 9

If the top commit is pointed to by HEAD then you can do something like this:

commit1 -> HEAD
commit2 -> HEAD~1
commit3 -> HEAD~2

Diff between the first and second commit:

git diff HEAD~1 HEAD

Diff between first and third commit:

git diff HEAD~2 HEAD

Diff between second and third commit:

git diff HEAD~2 HEAD~1

And so on...

Answer 10

If you want the changes for the last n commits, you can use the following:

git diff HEAD~n

So for the last 5 commits (count including your current commit) from the current commit, it would be:

git diff HEAD~5

Answer 11

I use Bitbucket with the Eclipse IDE with the Eclipse EGit plugin installed.

I compare a file from any version of its history (like SVN ).

Menu Project Explorer → File → right click → Team → Show in history .

This will bring the history of all changes on that file. Now Ctrl click and select any two versions→ "Compare with each other" .

Answer 12

This will also work for tags (remove the 'uniq' below and other parts if you need to see all changes):

 git diff v1.58 HEAD 

The below is the same, and that could be useful for continuous integration (CI) for microservices in a monolithic repository:

git diff v1.58 HEAD  --name-only | sort -u | awk 'BEGIN {FS="/"} {print $1}' | uniq
<Folder Name> 

(Credit - https://dzone.com/articles/build-test-and-deploy-apps-independently-from-a-mo )

Answer 13

to show individual changes in a commit, to head.

git show Head~0

to show accumulated changes in a commit, to head.

git diff Head~0

where 0 is the desired number of commits.

Answer 14

If last versions means last tag , and current versions means HEAD (current state), it's just a diff with the last tag:

Looking for tags :

$ git tag --list
...
v20.11.23.4
v20.11.25.1
v20.11.25.2
v20.11.25.351

The last tag would be:

$ git tag --list | tail -n 1
v20.11.25.351

Putting it together:

tag=$(git tag --list | tail -n 1)
git diff $tag