Show 13 quoted lines
> On Tue, Mar 17, 2009 at 10:58 AM, John Dlugosz
> <JDlugosz@tradestation.com> wrote:
> >> $ git clone git://central/repo.git
> >> $ cd repo
> >> $ git checkout -b topic origin/master
> >> $ edit, commit, edit, commit, looks good
> >> $ git checkout master
> >> $ git pull
> >
> > You checkout master before updating it?
>
> You cannot merge/rebase a branch unless it is checked out.
>
Sure you can.
git rebase upstream topic
But I think I see the point: the implicit merge done by pull uses the current HEAD and config branch.<name>.merge.
My concern is that you establish your working state based on the local 'master', only to immediately change it again when the pull updates master. But that's the way it's supposed to work?
I think the documentation for git-pull might also be garbled from text being of different eras. "Normally the branch merged is the HEAD of the remote"? That will be basically random since the last thing the upstream repo user did will control what his HEAD is.
But, the intention here is
1) direct attention to the desired branch
2) do what is appropriate for the current branch
The key to avoiding massive confusion is making sure that (2) is set up properly. I never know what's going to happen with a pull, and I suppose that's because nothing was set up properly.
--John (still confused)
TradeStation Group, Inc. is a publicly-traded holding company (NASDAQ GS: TRAD) of three operating subsidiaries, TradeStation Securities, Inc. (Member NYSE, FINRA, SIPC and NFA), TradeStation Technologies, Inc., a trading software and subscription company, and TradeStation Europe Limited, a United Kingdom, FSA-authorized introducing brokerage firm. None of these companies provides trading or investment advice, recommendations or endorsements of any kind. The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from any computer.