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 votes235 views2 answers
Linux cannot upgrade pip
Shell/Bash
0 vote243 views1 answer
Aexprot bash varible to another script
Shell/Bash
-1 vote264 views2 answers
Putty ubuntu
Shell/Bash
2 votes303 views2 answers
Git delete local branch except master
Shell/Bash
12 votes242 views5 answers
How to remove git from project
Shell/Bash
6 votes252 views2 answers
Install tree in linux
Shell/Bash
7 votes238 views2 answers
How to upload on github with command
Shell/Bash
122 votes247 views6 answers
Git create a new repository
Shell/Bash
0 vote270 views1 answer
Install siege on mac
Shell/Bash
1 vote286 views1 answer
Lxde desktop shortcut not runable
Shell/Bash