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

1 vote226 views1 answer
Bash set -x
Shell/Bash
0 vote220 views1 answer
Powershell script clear cach at end
Shell/Bash
9 votes213 views3 answers
Flutter devices
Shell/Bash
1 vote199 views1 answer
Vlc not playing any video in linux
Shell/Bash
0 vote301 views1 answer
Windows run powershell script from task scheduler
Shell/Bash
0 vote216 views1 answer
Path/to/sdkmanager --install "cmdline-tools;latest"
Shell/Bash
35 votes288 views6 answers
Docker permission denied
Shell/Bash
0 vote219 views1 answer
Bash curl weather report
Shell/Bash
4 votes218 views1 answer
Git host key verification failed
Shell/Bash
15 votes202 views1 answer
Download dart manual mac
Shell/Bash