netdev - Re: net-2.6.25 being rebased...

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20071211213540.GA30706@electric-eye.fr.zoreil.com>
Date:	Tue, 11 Dec 2007 22:35:40 +0100
From:	Francois Romieu <romieu@...zoreil.com>
To:	Joe Perches <joe@...ches.com>
Cc:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: net-2.6.25 being rebased...

Joe Perches <joe@...ches.com> :
[...]
> 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.

Assuming taht you initially cloned from davem's repo, your .git/config
could contain something along the lines of:

 [remote "origin"]
         url = git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
         fetch = +refs/heads/*:refs/remotes/origin/*

(the "+" will update even non fast-forwarding branches)

Then:

$ git fetch origin
$ git fetch -u remotes/origin/master:master

You may then reset --hard to wipe out any leftover file.

If you cloned from somewhere else, replace "origin" with the label of
your choice to automate the process.

-- 
Ueimor
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html