Re: [GIT PATCH] USB patches for 2.6.17

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 22, 2006, 21:07 UTC
Message-ID: <Pine.LNX.4.64.0606221405080.6483@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0606221354070.6483@g5.osdl.org>

On Thu, 22 Jun 2006, Linus Torvalds wrote:

Show 5 quoted lines

> 
> 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

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ linux-usb-devel@lists.sourceforge.net To unsubscribe, use the last form field at: https://lists.sourceforge.net/lists/listinfo/linux-usb-devel