Re: git branches 5.3/ 5.4 / 5.5

On Thu, August 15, 2013 20:45, Johannes Schlüter wrote: > On Thu, 2013-08-15 at 20:19 +0200, Jordi Boggiano wrote: > >> >> And to ensure you never push garbage by accident, run this to tell git >> to always only push the branch you're on when you run git >> push: >> >> git config --global push.default current > > Good tip. I wasn't aware of that setting. Mind that we have multiple > active branches we typically push to in one go, so using the default and > being clear about ones tracking branches can be comfortable, too, and > avoid forgetting to properly push to all branches. > > So each approach has benefits and downsides ... and well as I'm the only > one who currently can do forced pushes (I think) neither approach will > cause actual trouble ;-) (if it becomes bad, which I don't expect, we can > add restrictions to the server, too) > > > Probably the best is to do a push --dry-run to check and getting used to > manually specify branches i.e. git push origin PHP-5.4 PHP-5.5 master > > johannes > > Exactly, I usually do just 'git push origin' while being on master, so if there's some stuff merged up from PHP-5.4 (or PHP-5.3 earlier), it automatically goes with. The experimental branches will not be pushed with this until one explicitly tells like 'git push origin my_experiment'. Using that current setting would disable the automatic. Anatol Anatol