It should come back to the n+1 commit. You probably have a merge commit in there as well. You can also do a git reset --hard <sha1_of_where_you_want_to_be>
WARNING!!
--hard
means that any uncommitted changes you currently have
will be thrown away permanently.