On Thu, 2007-10-18 at 00:50 -0400, Shawn O. Pearce wrote: > The problem here is you aren't on a branch, you are on a detached > HEAD. So we must have setup the wrong thing in .git/FETCH_HEAD > and we didn't actually merge. Aha. (I didn't setup anything that I can recall, followed a howto I found) > What version of git is this, exactly (`git version`)? git version 1.5.3.4.203.gcc61a > I'd suggest making your life a little bit easier. Consider creating > a remote that points to Linus: > > $ git remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git > $ git checkout -b master ; # or any other branch > $ git config branch.master.remote linus > $ git config branch.master.merge refs/heads/master > > Now you can update from Linus with just: > > $ git pull > > Provided you are on branch "master", or whatever other branches > you setup those branch.*.remote and branch.*.merge configuration > options for. Thanks, I appreciate it, kernel.org likely does too. -Mike - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
