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

0 vote350 views1 answer
Post webhook bash
Shell/Bash
13 votes278 views10 answers
Install docker on linux
Shell/Bash
1 vote351 views1 answer
Node install mint
Shell/Bash
8 votes349 views3 answers
Git revert commit but keep changes
Shell/Bash
8 votes366 views1 answer
How do i get the last commit
Shell/Bash
1 vote378 views1 answer
Pip install boto3
Shell/Bash
7 votes346 views2 answers
Ping a port linux
Shell/Bash
42 votes330 views3 answers
Cli check what is listening on port
Shell/Bash
0 vote444 views1 answer
Linux red hat version
Shell/Bash
1 vote351 views1 answer
Nginx stop if proxy_pass is down
Shell/Bash