Add 'merge' mode to 'git reset'