Re: [Emc-users] git requests

2017-08-23 Thread 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

Re: [Emc-users] git requests

2017-08-23 Thread 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

Re: [Emc-users] git requests

2017-08-23 Thread 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

Re: [Emc-users] git requests

2017-08-23 Thread 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 >

[Emc-users] git requests

2017-08-23 Thread 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

Re: [Emc-users] Git server down?

2011-04-02 Thread 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

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

2010-01-05 Thread 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.

[Emc-users] git

2009-06-29 Thread 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'

[Emc-users] git

2009-06-29 Thread 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