Re: [Flightgear-devel] another git question

2012-10-04 Thread Roland Haeder
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/04/2012 05:58 PM, Curtis Olson wrote: > Thanks again everyone for the great feedback. I was completely > unaware of the git bundle mechanism. That actually seems like it > is the simplest and most straight forward. It allows pretty > typical w

Re: [Flightgear-devel] another git question

2012-10-04 Thread Curtis Olson
Thanks again everyone for the great feedback. I was completely unaware of the git bundle mechanism. That actually seems like it is the simplest and most straight forward. It allows pretty typical work flow with just an alternative mechanism for handling the network parts. The only tricky thing

Re: [Flightgear-devel] another git question

2012-10-03 Thread James Turner
On 3 Oct 2012, at 09:41, Tim Moore wrote: > A better alternative in your case might be to use git bundles, which > pack into a file the data that would be on the wire in a git push. > http://git-scm.com/2010/03/10/bundles.html seems well suited to your scenario. Oooh, I didn't know about these -

Re: [Flightgear-devel] another git question

2012-10-03 Thread Stefan Seifert
On Tuesday 02 October 2012 21:07:58 Curtis Olson wrote: > I have a clone of the repository on my embedded system too, and it's remote > is setup to point to the clone on the thumb drive when that is plugged in. > So I can plug the thumb drive into my main linux computer and run > pull/push agains

Re: [Flightgear-devel] another git question

2012-10-03 Thread Tim Moore
The short answer is to not have a bare repo on the thumb drive, so it is more practical to push from it, especially to your master repo. If you do that, you need to realize that the branch you have checked out into the working tree could be made out of date in odd ways by pushing into the repo. I

Re: [Flightgear-devel] another git question

2012-10-03 Thread Edheldil
Hi, Curt, from my limited understanding of Git - you have painted yourself into a corner by having bare repo at one hand and creating situation where you need to merge on the other. Possible immediate solutions I see - either clone the thumb repo to a new non-bare repo, add your master repo as a

[Flightgear-devel] another git question

2012-10-02 Thread Curtis Olson
I know how everyone loves git questions here, so this is a bit off topic, but I have another crazy git question. The situation is probably weird enough that I might not be able to explain it well enough to get an answer, but let me try. The situation is that I have a master git repository on my l