2007-11-05 21:05:52

by Larry Finger

Subject: Re: Problem with wireless-2.6

John W. Linville wrote:
>
> Well, I'm not sure. What is the purpose of your 'git pull'?

To get the latest everything branch.

> What is the head commit on your everything branch? At present, it should be:
>
> commit 792296c80171081ab1eeb59a206aed651a27fcb0
> Merge: 0119130... 286c21f...
> Author: John W. Linville <[email protected]>
> Date: Fri Nov 2 17:14:55 2007 -0400
>
> Merge branch 'ath5k' into everything
>
> FWIW, 'git describe' on my everything branch also returns
> v2.6.24-rc1-155-g792296c. What makes you think this is wrong?

That was after I repulled the entire tree. Before it was at 2.6.23-rc9.

>From other comments, I think I needed a git rebase command.

Larry

2007-11-05 21:17:05

by Andreas Schwab

Subject: Re: Problem with wireless-2.6

Larry Finger <[email protected]> writes:

>>From other comments, I think I needed a git rebase command.

I don't think so. Do you have set branch.autosetupmerge to false?

Andreas.

--=20
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany
PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4=
ED5
"And now for something completely different."