Re: git-branch, older repos and more confusion
- From
Jeff King <peff@peff.net>
- Date
- Apr 12, 2007, 06:22 UTC
- Message-ID
- <20070412062200.GA31788@coredump.intra.peff.net>
- In-Reply-To
- <46a038f90704112316v4aaa6246s9e07a3af8262b119@mail.gmail.com>
On Thu, Apr 12, 2007 at 06:16:20PM +1200, Martin Langhoff wrote:
Show 6 quoted lines
> And I think I got it sussed out with: > > git-clone <repo> mydir > cd mydir > git-push origin origin/v1.9-maint:refs/heads/v1.9-clientname > git-checkout --track -b v1.9-clientname origin/v1.9-clientname
OK, I had misunderstood what you wanted. Yes, that should work, though I think you will need to do a 'git-fetch' between your push and checkout.
> And then git-pull / git-push will "do the right thing". And `git-pull > origin/v1.9-maint` will trigger a fetch & merge.
Actually, it should be "git-pull origin v1.9-maint". Of course, you've been fetching origin/v1.9-maint all along when you pull your other branch, so you can do it without touching the network at all: "git-merge origin/v1.9-maint".
-Peff