> Can master ever diverge from testing? I.e. does it have any changes
> testing doesn't?

No. All code should go through 'testing' or another branch and then
merged with master. Changes should never be made directly to the
master working copy.

> If so, you need to do the checkout since some files
> need to have their content merged, potentially; you could work this
> around so that this merge does not destroy your current working tree
> state using low-level plumbing commands, but it would be pretty
> hard-core so I wouldn't go that way unless you *really* care.
> But I suspect you just want to say "now, make master point to the same
> commit as testing", that is this merge is actually always a
> "fast-forward" merge?

Right, that's what I'm after.

> In that case, this is much easier; one way might
> be simply to
>         git branch -f master testing
> which will forcibly re-create master, pointing at the same commit as
> testing. Alternatively, if the only thing you ever do with master is
> pushing it out, you can do the push right away, pushing local branch
> testing to remote branch master; you can do and automate that using
> refspecs, described in git-push(1) in detail.

Ok, I think that's what I'm after. I'll try that.

Can I push local branch testing to both remote branch testing and
remote branch master with the same command?

Something like this?

git push origin testing:origin/master testing:origin/testing

Thanks for the help.

> --
>                                 Petr "Pasky" Baudis
> The average, healthy, well-adjusted adult gets up at seven-thirty
> in the morning feeling just terrible. -- Jean Kerr
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to