Hi, On Tue, 17 Jun 2008, Sverre Rabbelier wrote: > How about 'git ls-files -t | grep "^M " | xargs git checkout B --', You probably meant 'sed -n "s/^M //p"' instead of 'grep "^M"', right? Of course, I think that a better way would be to ask "git diff --name-only --diff-filter=U". 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