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

2 votes146 views1 answer
Unable to locate package brave-browser ubuntu 20
Shell/Bash
1 vote146 views1 answer
Link php with php 8 mac
Shell/Bash
9 votes238 views3 answers
Remove phpmyadmin from ubuntu
Shell/Bash
12 votes151 views2 answers
How to tar linux
Shell/Bash
0 vote141 views2 answers
Video trimmer ubuntu
Shell/Bash
0 vote152 views2 answers
Symbolic link wsl mnt .ssh
Shell/Bash
3 votes142 views1 answer
Paint for ubuntu
Shell/Bash
0 vote154 views1 answer
Xcode is not installed or not configured properly. Download, install, set it up and run this script again
Shell/Bash
3 votes166 views3 answers
Bash split string into array
Shell/Bash
0 vote141 views2 answers
Git diff ignore file
Shell/Bash