git-wip: Add -d option for fast-forward or recursive merge

8d35d016-4468-11e4-bf31-c80aa9e67bbd