git not pulling origin staging-next cleanly.

[Gary Rookard]

On Sat, 15 Mar 2014, Greg KH wrote:

> On Fri, Mar 14, 2014 at 09:51:30PM -0400, Gary Rookard wrote:
>>
>>
>> On Sat, 15 Mar 2014, Greg KH wrote:
>>
>>> On Wed, Mar 12, 2014 at 04:10:36PM -0400, Gary Rookard wrote:
>>>> Hi,
>>>> Could this problem be local machine (git-1.9.0-1) or dare I say it,
>>>> a tmp server-side melt-down of sorts?
>>>> I've tried everything nothing seams to work.
>>>
>>> What have you typed, exactly, and what has git responded with?
>>>
>> --
>> Ok, this is it from the very top, the commands are same as every other
>> time I've done it.
>>
>> [gary at arch-tuxx Kernel-Hacks]$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
>> Cloning into 'staging'...
>> remote: Counting objects: 3449057, done.
>> remote: Compressing objects: 100% (519453/519453), done.
>> remote: Total 3449057 (delta 2903733), reused 3445005 (delta 2900373)
>> Receiving objects: 100% (3449057/3449057), 722.83 MiB | 3.36 MiB/s, done.
>> Resolving deltas: 100% (2903733/2903733), done.
>> Checking connectivity... done.
>> Checking out files: 100% (45941/45941), done.
>> [gary at arch-tuxx Kernel-Hacks]$ cd staging
>> [gary at arch-tuxx staging]$ git status
>> On branch master
>> Your branch is up-to-date with 'origin/master'.
>>
>> nothing to commit, working directory clean
>> [gary at arch-tuxx staging]$ git pull origin staging-next
>
> Why would you want to do that?
>
> You really want to merge staging-next on top of master?  Why?
>
> That's not how to just check out a single branch.
>
> And yes, I know there's a conflict between that branch and Linus's tree
> at the moment, I'll fix it up next week, well before it goes to Linus...
>
> thanks,
>
> greg k-h
>
--
Well Ok, I'm going back to git fetch -> git checkout staging-next
Honestly I didn't think it would make much difference from my veiw.

Thanks,
-Gary Rookard