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 votes118 views1 answer
Command to get number of commits
Shell/Bash
0 vote164 views1 answer
Postgres ubuntu
Shell/Bash
0 vote125 views1 answer
Scrapy spider shell from spider
Shell/Bash
15 votes139 views6 answers
Ssh keygen
Shell/Bash
1 vote131 views3 answers
Afficher le contenu de la variable path
Shell/Bash
2 votes147 views1 answer
Kumaran km github
Shell/Bash
0 vote118 views1 answer
Grep example linux
Shell/Bash
1 vote127 views1 answer
Failed to open stream: Permission denied in path on mac
Shell/Bash
16 votes349 views4 answers
Clear cache ubuntu
Shell/Bash
18 votes153 views2 answers
Mac terminal find process by port
Shell/Bash