Re: Git command for fetching the current master

[Richard Heck]

On 10/14/2016 10:01 AM, racoon wrote:
> On 14.10.2016 15:50, Scott Kostyshak wrote:
>> On Fri, Oct 14, 2016 at 02:10:18PM +0200, racoon wrote:
>>> Thanks. Unfortunately, the final step "git pull" gives me this:
>>>
>>> There is no tracking information for the current branch.
>>> Please specify which branch you want to merge with.
>>> See git-pull(1) for details.
>>>
>>> git pull  
>>>
>>> If you wish to set tracking information for this branch you can do
>>> so with:
>>>
>>> git branch --set-upstream-to=origin/ master
>>
>> Try the following command:
>>
>>  git branch --set-upstream-to=origin/master master
>>
>> The command says that your local master branch should be linked to the
>> remote's master branch. That way when you do a git pull it will update.
>
> Thanks. That worked.

I recommend pulling with
git pull --rebase
This will avoid stupid merge commits by rebasing your current work on
top of whatever is getting pulled in from upstream.

Richard

Re: Git command for fetching the current master

[racoon]

On 14.10.2016 15:50, Scott Kostyshak wrote:

On Fri, Oct 14, 2016 at 02:10:18PM +0200, racoon wrote:

Thanks. Unfortunately, the final step "git pull" gives me this:

There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

git pull  

If you wish to set tracking information for this branch you can do so with:

git branch --set-upstream-to=origin/ master


Try the following command:

 git branch --set-upstream-to=origin/master master

The command says that your local master branch should be linked to the
remote's master branch. That way when you do a git pull it will update.


Thanks. That worked.

Daniel

Re: Git command for fetching the current master

[Scott Kostyshak]

On Fri, Oct 14, 2016 at 02:10:18PM +0200, racoon wrote:
> Thanks. Unfortunately, the final step "git pull" gives me this:
> 
> There is no tracking information for the current branch.
> Please specify which branch you want to merge with.
> See git-pull(1) for details.
> 
> git pull  
> 
> If you wish to set tracking information for this branch you can do so with:
> 
> git branch --set-upstream-to=origin/ master

Try the following command:

 git branch --set-upstream-to=origin/master master

The command says that your local master branch should be linked to the
remote's master branch. That way when you do a git pull it will update.

Scott


signature.asc
Description: PGP signature

Re: Git command for fetching the current master

[racoon]

Thanks. Unfortunately, the final step "git pull" gives me this:

There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

git pull  

If you wish to set tracking information for this branch you can do so with:

git branch --set-upstream-to=origin/ master

Daniel

On 14.10.2016 14:05, Joel Kulesza wrote:

I'm not part of the development team; however, my thoughts:

Command-line wise from the LyX directory, check your settings to make
sure they are to the right place with with

git remote -v

Once satisfied (and with any of your changes stashed or committed), try

git checkout master
git fetch
git merge

-or-

git checkout master
git pull

- Joel

On Fri, Oct 14, 2016 at 3:47 AM, racoon > wrote:

Hi,

How do I update my local copy to the current master?

In git gui I tried

Fetch from > origin

But this seems not to work. I can now type any git command line
commands using

Repository > Git Bash

So I am even happy about command line commands on how to update to
the current master.

Daniel

Re: Git command for fetching the current master

[Joel Kulesza]

I'm not part of the development team; however, my thoughts:

Command-line wise from the LyX directory, check your settings to make sure
they are to the right place with with

git remote -v

Once satisfied (and with any of your changes stashed or committed), try

git checkout master
git fetch
git merge

-or-

git checkout master
git pull

- Joel

On Fri, Oct 14, 2016 at 3:47 AM, racoon  wrote:

> Hi,
>
> How do I update my local copy to the current master?
>
> In git gui I tried
>
> Fetch from > origin
>
> But this seems not to work. I can now type any git command line commands
> using
>
> Repository > Git Bash
>
> So I am even happy about command line commands on how to update to the
> current master.
>
> Daniel
>
>

Git command for fetching the current master

[racoon]

Hi,

How do I update my local copy to the current master?

In git gui I tried

Fetch from > origin

But this seems not to work. I can now type any git command line commands 
using


Repository > Git Bash

So I am even happy about command line commands on how to update to the 
current master.


Daniel