Re: [Emc-users] git requests

[Przemek Klosowski]

You probably made changes to the files, so git pull realizes that it'd
overwrite your changes and refuses to run. If you don't care about your
changes, just abandon them
git reset --hard origin/master
git pull origin master
If you do care about your changes, you have to stash them away: perhaps
create a branch and merge it back when you update from remote master.


On Wed, Aug 23, 2017 at 10:24 PM, Gene Heskett  wrote:

> On Wednesday 23 August 2017 21:28:21 Chris Albertson wrote:
>
> > See "man git-pull"
> >
> > The man page has the dash but when you type the command , no dash.
> > "git pull" merge upstream changes with any you have made locally.
> >
> IPt refuses to do it, apparently in exploring git gui, I've contaminated
> the clone checkout so its not virgin anymore.
>
> > On Wed, Aug 23, 2017 at 5:39 PM, Gene Heskett 
> wrote:
> > > If I an cd'd to a linuxcnx-git directory already containing a clone
> > > of the 2.8.0-pre source tree, what is the proper command to update
> > > it to the current 2.8.0-pre?  I do not see an update command in a
> > > "man git".
> > >
> > > Thanks.
> > >
> > > Cheers, Gene Heskett
> > > --
> > > "There are four boxes to be used in defense of liberty:
> > >  soap, ballot, jury, and ammo. Please use in that order."
> > > -Ed Howdershelt (Author)
> > > Genes Web page 
> > >
> > > 
> > > --
> > > Check out the vibrant tech community on one of the world's most
> > > engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> > > ___
> > > Emc-users mailing list
> > > Emc-users@lists.sourceforge.net
> > > https://lists.sourceforge.net/lists/listinfo/emc-users
>
>
> Cheers, Gene Heskett
> --
> "There are four boxes to be used in defense of liberty:
>  soap, ballot, jury, and ammo. Please use in that order."
> -Ed Howdershelt (Author)
> Genes Web page 
>
> 
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Emc-users mailing list
> Emc-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-users
>
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users

Re: [Emc-users] git requests

[Gene Heskett]

On Wednesday 23 August 2017 21:28:21 Chris Albertson wrote:

> See "man git-pull"
>
> The man page has the dash but when you type the command , no dash.  
> "git pull" merge upstream changes with any you have made locally.
>
IPt refuses to do it, apparently in exploring git gui, I've contaminated 
the clone checkout so its not virgin anymore.

> On Wed, Aug 23, 2017 at 5:39 PM, Gene Heskett  
wrote:
> > If I an cd'd to a linuxcnx-git directory already containing a clone
> > of the 2.8.0-pre source tree, what is the proper command to update
> > it to the current 2.8.0-pre?  I do not see an update command in a
> > "man git".
> >
> > Thanks.
> >
> > Cheers, Gene Heskett
> > --
> > "There are four boxes to be used in defense of liberty:
> >  soap, ballot, jury, and ammo. Please use in that order."
> > -Ed Howdershelt (Author)
> > Genes Web page 
> >
> > 
> > --
> > Check out the vibrant tech community on one of the world's most
> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> > ___
> > Emc-users mailing list
> > Emc-users@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/emc-users


Cheers, Gene Heskett
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
Genes Web page 

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users

Re: [Emc-users] git requests

[Chris Albertson]

See "man git-pull"

The man page has the dash but when you type the command , no dash.   "git
pull" merge upstream changes with any you have made locally.

On Wed, Aug 23, 2017 at 5:39 PM, Gene Heskett  wrote:

> If I an cd'd to a linuxcnx-git directory already containing a clone of
> the 2.8.0-pre source tree, what is the proper command to update it to
> the current 2.8.0-pre?  I do not see an update command in a "man git".
>
> Thanks.
>
> Cheers, Gene Heskett
> --
> "There are four boxes to be used in defense of liberty:
>  soap, ballot, jury, and ammo. Please use in that order."
> -Ed Howdershelt (Author)
> Genes Web page 
>
> 
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Emc-users mailing list
> Emc-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-users
>



-- 

Chris Albertson
Redondo Beach, California
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users

Re: [Emc-users] git requests

[Kurt Jacobson]

Maybe try:
git pull origin master

Kurt Jacobson
505-303-1933
Sent from Mobile

On Aug 23, 2017 8:40 PM, "Gene Heskett"  wrote:

> If I an cd'd to a linuxcnx-git directory already containing a clone of
> the 2.8.0-pre source tree, what is the proper command to update it to
> the current 2.8.0-pre?  I do not see an update command in a "man git".
>
> Thanks.
>
> Cheers, Gene Heskett
> --
> "There are four boxes to be used in defense of liberty:
>  soap, ballot, jury, and ammo. Please use in that order."
> -Ed Howdershelt (Author)
> Genes Web page 
>
> 
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> Emc-users mailing list
> Emc-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-users
>
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users

[Emc-users] git requests

[Gene Heskett]

If I an cd'd to a linuxcnx-git directory already containing a clone of 
the 2.8.0-pre source tree, what is the proper command to update it to 
the current 2.8.0-pre?  I do not see an update command in a "man git".

Thanks.

Cheers, Gene Heskett
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
Genes Web page 

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users

Re: [Emc-users] Git server down?

[Jon Elson]

Les Newell wrote:
 Is the Git server down? I just tried downloading the latest source and 
 got no response. I also don't get a response if I ping git.linuxcnc.org.
   
I also get no response.

Jon

--
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself; 
WebMatrix provides all the features you need to develop and 
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users

[Emc-users] Git site very slow, or is it just my ISP?

[Erik Christiansen]

On Wed, Jan 06, 2010 at 04:21:33PM +1100, Erik Christiansen wrote:
 I'll figure out how to use git, and take a peek at his branch. 

My git clone looks like it'll take 2.8 hours, at 8 KiB/s. That doesn't
seem normal, with the wiki saying the 80 MB downloads in 3 minutes on a
3 megabit connection.

My ADSL modem reports half that downstream rate:

Ds Rate (Kbps)  1536

I'm not sure if this is a relevant limitation:
Peak Cell Rate  301 cells per sec

I wonder if there's a way to pinpoint the bottleneck?

Erik

-- 
Due to circumstances beyond our control, we regret to inform you that
circumstances are beyond our control.-Paul Benoit


--
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users

[Emc-users] git

[Stuart Stevenson]

I just tried to download a git install. I got the message

stus...@linuxcnc1:~$ git clone git://git.linuxcnc.org/git/emc2.git emc2-dev
Initialized empty Git repository in /home/stustev/emc2-dev/.git/
fatal: The remote end hung up unexpectedly
fetch-pack from 'git://git.linuxcnc.org/git/emc2.git' failed.

problems? or just wait a minute?
thanks
Stuart

-- 
you can lead a person to knowledge
but you cannot make him think

--
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users

[Emc-users] git

[Stuart Stevenson]

premature - wait a minute helped

-- 
you can lead a person to knowledge
but you cannot make him think

--
___
Emc-users mailing list
Emc-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-users