visionmedia/git-extras — pull request #141 by jups23 (2012-10-07 18:10:04+00:00)
Title: INtroduce 'dry-merge' command

I would appreciate a command to check if a merge can be performed automatically or which files need manual merging. In this pull request I already implemented a simple version of it.

### Proposal:

`git dry-merge ` prints which files can be automatically merged and which files need a manual merge.

### Current Implementation
It currently just runs

git merge --no-commit --no-ff $1
git merge --abort # to unstage automatically merged files

### Future Work

It should check the result of `git merge --no-commit --no-ff $1`. If it states 'Already up-to-date' it exits and prints no 'fatal: There is no merge to abort (MERGE_HEAD missing)'.
In addition it should not stop at the first 'error: Your local changes to the following files would be overwritten by merge' and just print one file that would be overwritten but ALL the files that would be overwritten.

What is your opinion about it?

---
Note: I was inspired by: http://stackoverflow.com/questions/501407/