Christian Couder <chriscool@xxxxxxxxxxxxx> writes: > The new option name is "--keep-local-changes" because that's what > Junio used in the last email of the previous discussion, but my > opinion is that it is a bit long and so I'd like to rename it "--keep" > or another such short name. I vaguely recall that I mentioned something like "I still don't know what you are going to use this for, even though I think I am starting to understand it a bit better than before. In any case, it sounds like 'keep local changes' rather than 'safe'". Please don't take that as a serious suggestion of a better name. IOW, don't mind me---come up with a name that describes what you are doing better. But please don't blame me either ;-) -- 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