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

25 votes312 views3 answers
Git clone to path
Shell/Bash
3 votes321 views2 answers
Install seaborn
Shell/Bash
1 vote347 views1 answer
Find saved wifi password in linux
Shell/Bash
1 vote378 views1 answer
Install dia for linux ubuntu
Shell/Bash
0 vote341 views1 answer
Bluettoth device not shwoing as output in ubuntu
Shell/Bash
10 votes305 views1 answer
Update composer globally
Shell/Bash
1 vote336 views1 answer
Git status just shows directory and not files
Shell/Bash
1 vote325 views2 answers
Install seaborn in anaconda
Shell/Bash
0 vote334 views1 answer
Kali tools
Shell/Bash
0 vote347 views1 answer
Increaments in shell
Shell/Bash