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

3 votes316 views3 answers
Find linux
Shell/Bash
8 votes311 views2 answers
What is git
Shell/Bash
7 votes327 views3 answers
Git bash mac
Shell/Bash
11 votes330 views3 answers
Find the size of file in linux
Shell/Bash
0 vote249 views1 answer
Power shell scribt to copy files
Shell/Bash
0 vote320 views1 answer
How to install nipe
Shell/Bash
4 votes311 views2 answers
Unable to snap ubuntu software
Shell/Bash
1 vote295 views1 answer
Bash store script output in variable
Shell/Bash
0 vote301 views1 answer
Install minisom
Shell/Bash
2 votes301 views1 answer
Apache2 change directory root
Shell/Bash