On Wed, 30 Apr 2008, Andrew Morton wrote:It should indeed be a clean fetch, but I wonder if Dmitri perhaps does a "git pull" - which will do the fetch, but then try to _merge_ that fetched state into whatever the last base Dmitri happened to have. Dmitry: you cannot just "git pull" on linux-next, because each version of linux-next is independent of the next one. What you should do is basically # Set this up just once.. git remote add linux-next git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git and then after that, you keep on just doing git fetch linux-next git checkout linux-next/master which will get you the actual objects and check out the state of that remote (and then you'll normally never be on a local branch on that tree, git will end up using a so-called "detached head" for this). IOW, you should never need to do any merges, because Stephen did all those in linux-next already. Linus --
| David Miller | [GIT]: Networking |
| Fred . | Please add ZFS support (from GPL sources) |
| Parag Warudkar | BUG: soft lockup - CPU#1 stuck for 15s! [swapper:0] |
| Greg Kroah-Hartman | [PATCH 005/196] Chinese: add translation of SubmittingDrivers |
git: | |
| Junio C Hamano | Re: bad git pull |
| Sam Song | Fwd: [OT] Re: Git via a proxy server? |
| Sam Watkins | git-push hook to update remote working copy safely |
| Martin Langhoff | Re: cvsimport weird |
| Chris Smith | pf - drop or return - is stealth mode overrated? |
| RedShift | running OpenBSD on switch hardware |
| Casey Ransom | OpenBGPD selecting wrong nexthop over openvpn tunnel |
| Han Boetes | Re: Free Linux Driver Development! |
| Jim Winstead Jr. | Re: Root Disk/Book Disk Compatibility |
| Trenton Tuggle | Re: Linux Logo Postscript |
| Doug Evans | Re: Stabilizing Linux |
| Peter MacDonald | Re: VMS |
