Re: My kernel hangs again: Help with git please

2007-06-17 Thread Alex Riesen
Carlo Wood, Sat, Jun 16, 2007 16:03:40 +0200: > $ git merge origin > fatal: Needed a single revision > Usage: /usr/bin/git-merge [-n] [--no-commit] [--squash] [-s ]... > + > > For some reason I don't think I should be needing commands that need > ""; I don't want to change the (local) tree in a

Re: My kernel hangs again: Help with git please

2007-06-16 Thread Daniel Barkalow
On Sat, 16 Jun 2007, Carlo Wood wrote: > On Sat, Jun 16, 2007 at 01:28:13AM -0400, Daniel Barkalow wrote: > > That's not actually the right image. There's a graph of commits with a lot > > of splitting and joining lines. Each branch and each tag sits something in > > this web. The difference bet

Re: My kernel hangs again: Help with git please

2007-06-16 Thread Carlo Wood
On Sat, Jun 16, 2007 at 01:28:13AM -0400, Daniel Barkalow wrote: > That's not actually the right image. There's a graph of commits with a lot > of splitting and joining lines. Each branch and each tag sits something in > this web. The difference between branches and tags is that you're expected

Re: My kernel hangs again: Help with git please

2007-06-15 Thread Daniel Barkalow
On Sat, 16 Jun 2007, Carlo Wood wrote: > I don't understand - any branch that I am on has many tags. I can use > 'git reset --hard sometag' to change the source tree to that tag (which > works if I look at the version in the Makefile and pick tags that are > far apart enough). That's not actually

Re: My kernel hangs again: Help with git please

2007-06-15 Thread Carlo Wood
On Fri, Jun 15, 2007 at 08:33:38PM -0400, Daniel Barkalow wrote: > HEAD doesn't mean what you think it means. It's the latest revision on the > branch with the *. What you want is: > > $ git checkout master > > This will move the * to "master", which shouldn't have been affected by > any of thi

Re: My kernel hangs again: Help with git please

2007-06-15 Thread Daniel Barkalow
On Sat, 16 Jun 2007, Carlo Wood wrote: > Therefore I have the following questions: > > 1) What git command will ASSURE that I get the LATEST >kernel tree checked out? > > I tried this: > > hikaru:/usr/src/kernel/git/linux-2.6>git branch -l > * bisect > master > origin > hikaru:/usr/src/k