Re: best git practices, was Re: Git User's Survey 2007 unfinished summary continued
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Oct 22, 2007, 15:00 UTC
- Message-ID
- <Pine.LNX.4.64.0710221558230.25221@racer.site>
- In-Reply-To
- <471CB443.9070606@op5.se>
Hi,
On Mon, 22 Oct 2007, Andreas Ericsson wrote:
Show 20 quoted lines
> Johannes Schindelin wrote: > > > On Mon, 22 Oct 2007, Andreas Ericsson wrote: > > > > > If I were to suggest any improvements, it'd be to change the > > > semantics of git-pull to always update the local branches set up to > > > be merged with the remote tracking branches when they, prior to > > > fetching, pointed to the same commit, such that when > > > > > > $ git show-ref master > > > d4027a816dd0b416dc8c7b37e2c260e6905f11b6 refs/heads/master > > > d4027a816dd0b416dc8c7b37e2c260e6905f11b6 refs/remotes/origin/master > > > > > > refs/heads/master gets set to refs/remotes/origin/master post-fetch. > > > > In general, this should fail. Because you are expected to have local > > changes in the local branches. > > > BS argument.
Aha. So you want to make sure that the local branches are no longer "purely" local. And you want to stop updating them when unpushed changes are in the local branches.
Seems I cannot help you.
Ciao, Dscho