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 > > placed this file inside my fgdata directory, and refer to this file from > > my preferences.xml file. In addition to that, I have s few other minor > > modifications in preferences,xml that should be kept local. > > > > My question is how to keep these changes local without interfering with > > git. In essence, I would like to be able to continue to use git to > > update whatever changes are made to preferences.xml, while keeping my > > changes local. CVS seemed to be able to merge in any updates, as long as > > there wasn't a conflict, but GIT seems to be a bit pickier. I did find > > the git stash command, but I'm not sure yet that this is the most > > appropriate way to deal with local changes. Therefore I'd like to hear > > about other possibilities. > > > > Alternatively, if there is a way to to get my custom camera settings > > working from outside of the fgdata tree then I'd also love to hear about > > that (other than writing out all the settings as a series of --prop: > > command line options inside .fgfsrc. :-) > > Hi Durk, > > to ignore files in the tree, add a name (or pattern) to > $FGDATA/.git/info/exclude > > to add a "private" configuration file, use --config=/some/file.xml to your > commandline. The file.xml is in the format > <PropertyList> > <some> > <property>foo</property> > </some> > </PropertyList> > > to set /some/property=foo > > Torsten
The solution I use is branches. I have a "local" git branch and a "master" git branch. The master branch is a pure clone of the remote repository, and all my changes are tracked on "local". When I update I do something like this: $git checkout master $git pull $git checkout local $git merge master Ron ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
