As requested -- on develop as always

Actually it seems that it did push my changes without reporting the
fact.  The current state is I have no new commits so it bleats on
about fast-forward/  Seems odd but maybe OK


cage:~/Sourceforge/csound/New/csound6> git config -l
user.name=John ffitch
user.email=jpff@codemist.co.uk
push.default=matching
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=ssh://jpff@git.code.sf.net/p/csound/csound6-git
branch.master.remote=origin
branch.master.merge=refs/heads/master
branch.develop.remote=origin
branch.develop.merge=refs/heads/develop

==John ffitch

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

On Tue, Jan 21, 2014 at 2:24 PM, John ffitch  wrote:
> As requested -- on develop as always
>
> Actually it seems that it did push my changes without reporting the
> fact.  The current state is I have no new commits so it bleats on
> about fast-forward/  Seems odd but maybe OK
>
>
> cage:~/Sourceforge/csound/New/csound6> git config -l
> user.name=John ffitch
> user.email=jpff@codemist.co.uk
> push.default=matching

This is the problem. The git-config(1) says that push.default has the
following values (and short description):

nothing - do not push anything (error out) unless a refspec is explicitly given.

current - push the current branch to update a branch with the same
name on the receiving end.

upstream - push the current branch back to the branch whose changes
are usually integrated into the current branch (which is called
@{upstream}).

simple - in centralized workflow, work like upstream with an added
safety to refuse to push if the upstream branch's name is different
from the local one.

matching - push all branches having the same name on both ends.


So the problem is that there is a divergence between your master and
the one in the sf repo, and is getting pushed because of the
push.default setting.

I think push.default should be set to 'simple' in most cases (`git
config push.default simple`).


This explains why your commits were pushed. It was only the master
branch that didn't get pushed.


-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net