Hello, > I'm using: > > $ git config --global alias.update '!git stash && git pull && git stash apply' I wonder how this works, if the merge produces conflicts... Best regards Uwe -- Uwe Kleine-König http://www.google.com/search?q=1+year+in+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