Harald Welte wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Dave!
On Tue, Aug 09, 2005 at 06:23:33PM -0700, David S. Miller wrote:
I want some net bug fixes in Linus's tree to propagate into the
net-2.6.14 tree so I plan to rebase it this evening, so please be
careful when sync'ing with my tree over the next day.
so what is the actual process of a 'rebase' on your side? Do you just
pull/update from Linus' current tree and merge it with yours? Or do you
extract all the patches and apply them to a clean linus-tree?
Personally, I -hope- it's a merge.
git does merges just fine, these days.
Jeff
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
