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

5 votes104 views1 answer
Git new branch push to remote
Shell/Bash
0 vote96 views1 answer
How to create tmp directories in hpc
Shell/Bash
1 vote100 views1 answer
Reverse search command mac
Shell/Bash
0 vote95 views1 answer
Install tar.xz in ubuntu 20.4
Shell/Bash
24 votes106 views3 answers
Ubuntu apt uninstall
Shell/Bash
0 vote106 views1 answer
Purge apache 2
Shell/Bash
0 vote96 views1 answer
Git config pull with prune
Shell/Bash
0 vote101 views1 answer
Ubuntu aide compare file structure
Shell/Bash
3 votes96 views2 answers
Php extension php.ini
Shell/Bash
0 vote99 views1 answer
Creating windows 10 usb on ubuntu
Shell/Bash