On Wednesday, October 29, 2008 at 17:25:37 (+0100) Santi Béjar writes: >On Wed, Oct 29, 2008 at 4:23 PM, Bill Lear <rael@xxxxxxxxxx> wrote: >> We have had a few "crossed stream" problems when developers are >> working on a local branch and they do an unguarded git push/pull, >> when they really intended to do git push/pull origin branchname. >> >> We use git in a way that makes it desirable for us to only push/pull >> to the same remote branch. So, if I'm in branch X, I want 'git push' >> to push to origin/X, and 'git pull' to fetch into origin/X and then >> merge into X from origin/X. >> >> In other words, we want git push/pull to behave in branches other than >> master the same way it does when in master. >> >> I have discovered the '--track' option when creating a local branch, >> and this appears to me to be the thing that gives us the desired >> behavior. > >branch.autosetupmerge controls if --track is used by default (it is >true by default since a long time) >(See "git help config" for details) Ah, problem solved then. I'll just have everyone upgrade to the latest git. Thanks very much, Santi. Bill -- 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
