Hi, On Wed, 29 Nov 2006, Junio C Hamano wrote: > Perhaps we would want a new option to git-merge to allow preserving the > local changes, but the obvious candidate -m is taken for something else > per recent popular request X-<... How about "-k|--keep-changes" or "-l|--local-changes", or "-p|--preserve-changes"? BTW from a user's perspective, this operation _is_ a merge, not a checkout. So, IMHO the compatibility with that rarely used option of git-checkout is neglectable. Ciao, Dscho - 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