How do you view merge changes in a single git command?

Question

If master was merged into the topic after branching "git diff master ... topic" will show the changes that are already in master.

What you want is equivalent to the following:

git merge topic --no-commit
git diff --staged
git merge -abort

+3

Alex June 16 15 at 19:42

1 answer

Tristan vigil · Answer 1 · 2015-06-16T19:51:07+0000

You can write a bash script with these commands.

#!/bin/sh

git merge topic --no-commit
git diff --staged
git merge --abort