Re: [GIT PATCH] USB patches for 2.6.17

Linus Torvalds
2006-06-22T21:07:25Z

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