On Tue, 2007-12-11 at 11:56 -0800, David Miller wrote:
> The rebase of net-2.6.25 is complete

I have an earlier unmodified git repository of net-2.6.25.
Does anyone know the appropriate git commands to resync
to the rebased content?

$ git branch
* master
$ git-pull
[...]
Automatic merge failed; fix conflicts and then commit the result.


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

Reply via email to