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

4 votes178 views2 answers
Open pdf command line linux
Shell/Bash
1 vote173 views1 answer
Cordova ios emulators
Shell/Bash
1 vote182 views1 answer
Check osx version
Shell/Bash
2 votes183 views2 answers
String to array bash
Shell/Bash
1 vote171 views1 answer
Remove last space from line
Shell/Bash
1 vote173 views1 answer
Remove space at end of each line file
Shell/Bash
0 vote215 views1 answer
Awk last match
Shell/Bash
1 vote195 views1 answer
Awk skip first line
Shell/Bash
0 vote217 views1 answer
Vite js install
Shell/Bash
3 votes194 views1 answer
Change default directory from screenshots to directory ubuntu
Shell/Bash