linux@xxxxxxxxxxx writes: > But I notice that --no-commit actually changes git's merging > technique. If it's specified, the trivial in-index merge doesn't > appear to be attempted. I don't think it makes a huge difference, > but is any difference desirable? This was done in response to a specific request from the list but I do not remember the details. If I were to research the background I would (1) first, look at the authordate of the commit that introduced the change. For this, I would most likely use: git log -p -S--no-commit -- git-pull.sh (2) go back to the list archive and find the thread that predates that commit by a few days. - 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