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

0 vote140 views1 answer
Kill background job
Shell/Bash
0 vote143 views1 answer
Bash print file permissions
Shell/Bash
25 votes135 views3 answers
Jupyter command install
Shell/Bash
1 vote96 views1 answer
How to print shell variables
Shell/Bash
0 vote146 views1 answer
How to install altair graphql on manjaro linux
Shell/Bash
9 votes139 views3 answers
Vim replace all
Shell/Bash
16 votes229 views4 answers
Create a new branch based on another branch
Shell/Bash
0 vote127 views1 answer
Terminal find containing directory of file and cd to directory
Shell/Bash
0 vote138 views1 answer
Nano edit a file
Shell/Bash
1 vote137 views1 answer
Git soft reset keeping changes
Shell/Bash