Preview a merge without merging. git merge --no-commit --no-ff <otherbranch> Diff the filenames only, with status git diff --name-status <hash1> <hash2>