git-branch, older repos and more confusion

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thanks to Peff for helping me out earlier with my git-branch usage.
Alas, I seem to be in trouble again.

My git tracking repo is still using the .git/remotes/origin
infrastructure, and now it turns out I can't seem to do a git-pull and
then a git-format-patch of my local 'master' for patches to go on top
of junio's master. I am using 1.5.1.106.ga32037

I'll get a new checkout, but I'm a bit miffed that this is broken -- I
wanted to use git-format-patch to migrate unmerged patches to the new
checkout.

<rant>
This is all a bit confusing, and "the right way to do it" is changing
too fast. And with the changes, all the little things that make it
easy to manage it are lost, and all the wiki pages and documentation
bits are old and wrong. The simple master/origin scheme works well, is
dead easy to teach, and has worked well for my team of ~14 developers
working on maybe ~40 custom branches. It's pretty safe from errors too
;-)

Alas - I think support for it seems to be going the away... what I am
missing is a clear way to say git-clone <repo>#branch that has the
same properties that `cg-clone <repo>#branch` has. Namely, once you
are done, there are clear names for your "local tip" and "remote tip",
and push and pull do the right thing without extra params.

cheers,


martin
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]