From: Linus Torvalds <torvalds@osdl.org>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: Andrew Morton <akpm@osdl.org>, Greg KH <gregkh@suse.de>,
linux-kernel@vger.kernel.org, git@vger.kernel.org,
linux-usb-devel@lists.sourceforge.net
Subject: Re: [GIT PATCH] USB patches for 2.6.17
Date: Thu, 22 Jun 2006 14:07:13 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0606221405080.6483@g5.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0606221354070.6483@g5.osdl.org>
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
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
prev parent reply other threads:[~2006-06-22 21:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060621220656.GA10652@kroah.com>
[not found] ` <Pine.LNX.4.64.0606211519550.5498@g5.osdl.org>
[not found] ` <20060621225134.GA13618@kroah.com>
[not found] ` <Pine.LNX.4.64.0606211814200.5498@g5.osdl.org>
[not found] ` <20060622181826.GB22867@kroah.com>
[not found] ` <20060622183021.GA5857@kroah.com>
[not found] ` <Pine.LNX.4.64.0606221239100.5498@g5.osdl.org>
2006-06-22 20:01 ` [GIT PATCH] USB patches for 2.6.17 Sam Ravnborg
2006-06-22 20:52 ` Petr Baudis
2006-06-22 21:01 ` Linus Torvalds
2006-06-22 21:07 ` Linus Torvalds [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0606221405080.6483@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=akpm@osdl.org \
--cc=git@vger.kernel.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb-devel@lists.sourceforge.net \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).