git-am: propagate --3way options as well