Git diff

Git diff two commits one file

$ git diff HEAD^^ HEAD main.c
$ # show diff between HEAD(current commit) and HEAD^^(two commits back) for main.c

Source: stackoverflow.com

Git diff of a file between two commits

git diff <branch_hash> <other_branch_hash> -- <file_path>

Git diff files only

Just specify your local branch1 or remote origin/branch2
git diff branch1 origin/branch2	#show diff referenced from second branch
git diff branch1 branch2 file.txt #show diff only between file.txt

Git diff

## View all the merge conflicts:
git diff

## View the conflicts against the base file:
git diff --base <filename>

## Preview changes, before merging:
git diff <sourcebranch> <targetbranch>

Similar codes

1 vote235 views2 answers
Find mtime rm
Shell/Bash
0 vote189 views1 answer
Uninstall appx
Shell/Bash
11 votes202 views4 answers
Git pull all branches
Shell/Bash
0 vote193 views1 answer
TypeError: 'InputExample' object does not support indexing
Shell/Bash
0 vote245 views1 answer
Dos search include subdirectories
Shell/Bash
2 votes160 views2 answers
Install nginx ubuntu 20.04
Shell/Bash
0 vote212 views1 answer
Pull file from specific commit git
Shell/Bash
4 votes199 views4 answers
Kill all screens linux
Shell/Bash
49 votes193 views6 answers
Tar.gz
Shell/Bash
1 vote184 views1 answer
Replace the sound of mp4 video linux
Shell/Bash