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

31 votes124 views6 answers
Update git
Shell/Bash
1 vote122 views2 answers
Powershell if file exists
Shell/Bash
1 vote127 views2 answers
Kazam install ubuntu
Shell/Bash
2 votes136 views2 answers
Substring in shell script
Shell/Bash
0 vote112 views1 answer
Select my keyboard ubuntu server
Shell/Bash
0 vote108 views1 answer
Bind mount on linux
Shell/Bash
0 vote122 views1 answer
Install kali synaptic software manager
Shell/Bash
0 vote142 views1 answer
Pretty print csv ubuntu terminal
Shell/Bash
0 vote116 views1 answer
Tools for debuging a server
Shell/Bash
0 vote103 views1 answer
Best code editors 2022
Shell/Bash