So it used to be that when upstream rebased, you'd get an error when you
tried to pull again and have to fix things up with some git reset or
rebase hackery. Trying to demo this today I found that the pull
*worked*, using an automatic recursive merge.
Am I crazy in thinking this used to error, and if not, when did it change?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html