On Mon, Apr 21, 2014 at 9:34 PM, Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > I have these aliases as well, except br => b, and cp => pi. 'br' is probably > better, but not sure as 'cp' which can be confusing. If by confusing you refer to "cp" to copy files, that's actually what I like about it: cherry-pick is somewhat like copying commits, thus "cp" makes much sense to me. > FTR color.ui = true is not needed any more, also hopefully mergetool.prompt = > false wouldn't be either [1]. Thanks! -- Sebastian Schuberth -- 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