Andrew Price venit, vidit, dixit 04.09.2012 01:43:
On 03/09/12 23:31, Neal Becker wrote:
> Ken Dreyer wrote:
>
>> On Mon, Sep 3, 2012 at 4:01 PM, Neal Becker <ndbecker2(a)gmail.com> wrote:
>>> fedpkg pull
>>> Already up-to-date.
>>>
>>> git branch
>>> f12
>>> f13
>>> f14
>>> f15
>>> f16
>>> * f17
>>> master
>>
>> "git pull -a" will grab the f18 branch. Not sure why fedpkg doesn't
do it.
>>
>> - Ken
> $ git pull -a
> Already up-to-date.
> $ git branch
> f12
> f13
> f14
> f15
> * f16
> f17
> master
>
Try 'git branch -a' or 'fedpkg switch-branch':
They do different things:
'git branch -a' shows all branches: local and remote (tracking)
'fedpkg switch-branch f18' creates a local branch f18 which has the
remote tracking branch remotes/origin/f18 as its upstream (unless it
exists already), and switches to it ('git checkout').
Doing a 'git fetch --all' to get the new remote branch would have showed
you that it ended up as a remote tracking branch in your repo.
'fedpkg pull' actually does more, it's fetch + merge or rebase!
$ git branch -a
f15
f16
f17
* f18
master
remotes/origin/HEAD -> origin/master
remotes/origin/f13
remotes/origin/f14
remotes/origin/f15
remotes/origin/f16
remotes/origin/f17
remotes/origin/f18
remotes/origin/f7
remotes/origin/f8
remotes/origin/f9
remotes/origin/master
$ fedpkg switch-branch
Locals:
f15
f16
f17
* f18
master
Remotes:
origin/f13
origin/f14
origin/f15
origin/f16
origin/f17
origin/f18
origin/f7
origin/f8
origin/f9
origin/master
Andy