On Thu, 22 Jun 2006, Linus Torvalds wrote: > > After that, I'm not quite sure what you mean by "--dry-run". Do you mean > to know about file-level conflicts? You do need to do the merge in order > to know whether the conflicts can be resolved, but even without doing the > merge you can look for _file_level_ conflicts by other means. Btw, what you can always do is just git pull <other-end> .. look at the result .. git reset --hard ORIG_HEAD and you should be ok. It's obviously not a dry-run, it's more of a "do it and then undo it", but hey, it should _work_. (Look out for dirty state, though. "git pull" will happily pull into a dirty tree if the changes don't actually affect any dirty files. The "git reset --hard" thing will undo all dirty state, though). Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Fri Jun 23 07:07:31 2006
This archive was generated by hypermail 2.1.8 : 2006-06-23 07:08:00 EST