I have a git question.
I'm trying to git push a new joystick config someone sent me. When I run
git push I get the following message:
$ git push
To g...@gitorious.org:fg/fgdata.git
! [rejected]master - master (non-fast-forward)
error: failed to push some refs to
What I always do is keep the master (next in FG's case) completely in
sync with upstream's master branch. For local modifications I always
use another branch. That way, pulling and pushing always works as
you'd expect. Merging is easy and cheap with git, i love that!
PS, I'm not really a git
That's probably not a bad tip, but I'm in a situation now where I have local
mods that git diff does not report and I'm not sure how to deal with that.
How can I find the differences between my local repository and the master
... especially those changes that I haven't committed or pushed yet?
On 01/04/2011 10:20 AM, Curtis Olson wrote:
I'm in a situation now where I have local
mods that git diff does not report and I'm not sure how to deal with that.
How can I find the differences between my local repository and the master
... especially those changes that I haven't committed
On Tue, Jan 4, 2011 at 5:20 PM, Curtis Olson wrote:
That's probably not a bad tip, but I'm in a situation now where I have
local mods that git diff does not report and I'm not sure how to deal with
that. How can I find the differences between my local repository and the
master ... especially
On Tue, Jan 4, 2011 at 5:36 PM, Curtis Olson curtol...@gmail.com wrote:
I have a git question.
I'm trying to git push a new joystick config someone sent me. When I run
git push I get the following message:
$ git push
To g...@gitorious.org:fg/fgdata.git
! [rejected]master -
Ok, thanks for all the advice. git diff --cached did show me my actual
change that git diff had lost. I doubt I'll remember that next time I
need it. So I'll look at making changes to a branch in the future. At the
moment I'm just trying to unwind my current tree. Apologies if I screw
I haven't pulled from git for a while. I built last night and discovered the
name of the data paths has changed from FlightGear to flightgear. I assume
this is unintentional? Would someone give me a hint on how to change this
back?
Thanks
Ron
(old source Makefile)
pkgdatadir =
Hi All,
In anticipation of the next release, I have gone through last year's log of the
git repositories for simgear, flightgear, and fgdata, and went though all the
newsletters between March 2010 and December 2010 on the wiki. Based on that, I
came up with the following summary of major
On Tue, Jan 4, 2011 at 5:17 AM, John Denker wrote:
I just now pushed a couple more ATIS upgrades to
http://gitorious.org/~jsd/fg/sport-model/commits/atishttp://gitorious.org/%7Ejsd/fg/sport-model/commits/atis
One of them will, alas, require rebuilding the voice snippet data.
Thought this went to the list.
Begin forwarded message:
From: Peter Brown smoothwater...@adelphia.net
Date: January 4, 2011 11:58:58 AM EST
To: Curtis Olson curtol...@gmail.com
Subject: Re: [Flightgear-devel] Fwd: Generic Autopilot works by location?
On Jan 4, 2011, at 11:38 AM, Curtis
On 01/04/2011 05:51 PM, Dave L wrote:
I've reverted to the previous behaviour for that property, which means that
inches are used globally by default, and if the user sets that property then
millibars are used everywhere except US and Canada. I realise that that
means that the incorrect
12 matches
Mail list logo
