Re: [Flightgear-devel] git question

2012-02-19 Thread Ron Jensen
On Sunday 19 February 2012 15:28:05 Scott wrote: > On Sun, 2012-02-19 at 14:40 -0700, dave perry wrote: > > On 02/19/2012 02:06 PM, Torsten Dreyer wrote: > > > Am 19.02.2012 21:54, schrieb dave perry: > > >> Hi All, > > >> > > >> I have been gone for almost a year. I want to start new source trees

Re: [Flightgear-devel] git question

2012-02-19 Thread Scott
On Sun, 2012-02-19 at 14:40 -0700, dave perry wrote: > On 02/19/2012 02:06 PM, Torsten Dreyer wrote: > > Am 19.02.2012 21:54, schrieb dave perry: > >> Hi All, > >> > >> I have been gone for almost a year. I want to start new source trees > >> for simgear and flightgear and track on going developme

Re: [Flightgear-devel] git question

2012-02-19 Thread dave perry
On 02/19/2012 02:06 PM, Torsten Dreyer wrote: > Am 19.02.2012 21:54, schrieb dave perry: >> Hi All, >> >> I have been gone for almost a year. I want to start new source trees >> for simgear and flightgear and track on going development. Which git >> branches should I "check out" in this new set o

Re: [Flightgear-devel] git question

2012-02-19 Thread Torsten Dreyer
Am 19.02.2012 21:54, schrieb dave perry: > Hi All, > > I have been gone for almost a year. I want to start new source trees > for simgear and flightgear and track on going development. Which git > branches should I "check out" in this new set of directories? And from > the e-mails I have read fr

Re: [Flightgear-devel] git question

2011-01-11 Thread dave perry
On 01/10/2011 02:19 PM, dave perry wrote: > I am ready to push some committed fgdata changes from my *master. But > I lost my notes. Don't want to mess up. What is the syntax? git > push master/origin? > > Thanks, > Dave Never mind. Answer found by git push --help. Sorry, should have done

Re: [Flightgear-devel] git question

2011-01-10 Thread Anders Gidenstam
On Mon, 10 Jan 2011, Curtis Olson wrote: > remote: Total 1 (delta 0), reused 0 (delta 0) > Unpacking objects: 100% (1/1), done. >> From gitorious.org:fg/simgear > * [new branch] releases/2.2.0 -> origin/releases/2.2.0 > * [new tag] 2.2.0-rc1 -> 2.2.0-rc1 > Already up-to-date. > > > O

Re: [Flightgear-devel] git question

2011-01-10 Thread Tim Moore
On Mon, Jan 10, 2011 at 5:31 PM, Curtis Olson wrote: > Here is my next git question (possibly another dumb one) :-) > > When I did a git pull in simgear/flightgear this morning I saw something > like the following: > > simgear$ git pull > remote: Counting objects: 1, done. > remote: Total 1 (delt

Re: [Flightgear-devel] git question

2010-08-01 Thread dave perry
Found the problem. Sorry for the noise. On my notebook, the git pull origin aborted and I did not notice this. preferences.xml had been changed in * master (my local branch). I did a git checkout preferences.xml git pull origin and got a lot of updates. Dave P. On 08/01/2010 01:25 PM, dave pe

Re: [Flightgear-devel] git question

2010-08-01 Thread dave perry
On 08/01/2010 01:07 PM, dave perry wrote: > Need some help, > > I did some clean up of the pa24-250 on my desktop which included > creating a pa24-250/Nasal folder and moving all the nasal files to that > folder. I also created pa24-250-base.xml that contained all the common > lines for the set fi

Re: [Flightgear-devel] GIT question: How to deal with local changes that should remain local

2010-06-20 Thread Ron Jensen
On Sunday 20 June 2010 12:07:02 Torsten Dreyer wrote: > > Hi All, > > > > I currently have a number of local changes in my fgdata tree that should > > either be kept local, or be stored elsewhere. More specifically, I have > > created a custom camera-settings file that drives three monitors, I have

Re: [Flightgear-devel] GIT question: How to deal with local changes that should remain local

2010-06-20 Thread Torsten Dreyer
> whereas the relevant code is inserted at the appropriate level when you use > > from within flightgear. Yeah - guess, who spent some time on that very same issue, too? Torsten -- ThinkGeek and WIRED's GeekDad team up

Re: [Flightgear-devel] GIT question: How to deal with local changes that should remain local

2010-06-20 Thread Durk Talsma
Hi Torsten, On Sunday 20 June 2010 08:07:02 pm Torsten Dreyer wrote: > to add a "private" configuration file, use --config=/some/file.xml to your > commandline. The file.xml is in the format > > > foo > > > > to set /some/property=foo > Thanks. That did the trick. All private configura

Re: [Flightgear-devel] GIT question: How to deal with local changes that should remain local

2010-06-20 Thread Torsten Dreyer
> Hi All, > > I currently have a number of local changes in my fgdata tree that should > either be kept local, or be stored elsewhere. More specifically, I have > created a custom camera-settings file that drives three monitors, I have > placed this file inside my fgdata directory, and refer to th

Re: [Flightgear-devel] git question: .gitignore ignored

2010-05-23 Thread Torsten Dreyer
> A quick style question here. A single .gitignore file at the top level can > be used to ignore files anywhere in the repository. Wouldn't it be better > to keep a single .gitignore at the top-level instead of sprinkling them > across the tree? > > For example, there are 43 files that match

Re: [Flightgear-devel] git question: .gitignore ignored

2010-05-23 Thread Ron Jensen
On Sunday 23 May 2010 03:04:04 Torsten Dreyer wrote: > Hi, > > I just pushed new .gitignore files to simgear: >simgear/magvar/.gitigore >simgear/route/.gitignore >simgear/screen/.gitignore >simgear/serial/.gitignore > and modified the existing .gitignore in simgear`s

Re: [Flightgear-devel] git question: .gitignore ignored

2010-05-23 Thread Frederic Bouvier
Hi, - "Torsten Dreyer" a écrit : > Hi, > > I just pushed new .gitignore files to simgear: >simgear/magvar/.gitigore You forgot a 'n' here, confirmed here : http://gitorious.org/fg/simgear/commit/6a2773c3ac3e38133b61fab574d61ace0ac6f1d4 >simgear/route/.gitignore >si