Re: EXT: Re: "Your branch is ahead of 'origin' by X commits"

2016-12-02 Thread Alfonsogonzalez, Ernesto (GE Digital)
Hi Matthieu, It was my mistake, I had a local branch called “origin” which was the upstream for master. I sent more details in a later email, reproduced below. Sorry for the false alarm. Thanks, Ernesto >>

Re: "Your branch is ahead of 'origin' by X commits"

2016-12-02 Thread Matthieu Moy
"Alfonsogonzalez, Ernesto (GE Digital)" writes: > Hi, > > Git status tells me "Your branch is ahead of 'origin' by 108 commits.², > but my local and origin/master are pointing to the same commit. > > What am I doing wrong? > > $ git diff origin/master > $ git status > On branch master > Your bran

Re: EXT: Re: "Your branch is ahead of 'origin' by X commits"

2016-12-01 Thread Alfonsogonzalez, Ernesto (GE Digital)
Yes, it looks like I had a local branch “origin” which was behind by 108 commits. Setting upstream to the local branch correctly states "track local branch origin”. It was my mistake, there is no bug. Thanks, $ git rev-parse --symbolic-full-name origin refs/heads/origin # origin is a local br

Re: EXT: Re: "Your branch is ahead of 'origin' by X commits"

2016-12-01 Thread Jeff King
On Thu, Dec 01, 2016 at 10:03:33PM +, Alfonsogonzalez, Ernesto (GE Digital) wrote: > So I used branch ‹set-upstream and see the expected behavior. > > $ git branch --set-upstream-to=origin/master > Branch master set up to track remote branch master from origin. Ah, that makes sense. > I¹m

Re: EXT: Re: "Your branch is ahead of 'origin' by X commits"

2016-12-01 Thread Junio C Hamano
"Alfonsogonzalez, Ernesto (GE Digital)" writes: > I'm still not sure what it means for the branch upstream to be 'origin' > only. If only you checked who the upstream of your 'master' was before doing the set-upstream-to, it would have been trivial to answer that question, but that is water unde

Re: EXT: Re: "Your branch is ahead of 'origin' by X commits"

2016-12-01 Thread Alfonsogonzalez, Ernesto (GE Digital)
92d392c37e376db69d61dafdc427b379d860fb5a Merge: 6be322c 5544904 ... $ git rev-parse --symbolic-full-name master refs/heads/master $ Then I realized that the message should say, "Your branch is ahead of Œorigin/master' by X commits" And not "Your branch is ahead of 'origin' by X commits² So I

Re: "Your branch is ahead of 'origin' by X commits"

2016-12-01 Thread Jeff King
On Thu, Dec 01, 2016 at 07:49:40PM +, Alfonsogonzalez, Ernesto (GE Digital) wrote: > $ git diff origin/master > $ git status > On branch master > Your branch is ahead of 'origin' by 108 commits. > (use "git push" to publish your local commits) > Untracked files: > (use "git add ..." to in

"Your branch is ahead of 'origin' by X commits"

2016-12-01 Thread Alfonsogonzalez, Ernesto (GE Digital)
Hi, Git status tells me "Your branch is ahead of 'origin' by 108 commits.², but my local and origin/master are pointing to the same commit. What am I doing wrong? $ git diff origin/master $ git status On branch master Your branch is ahead of 'origin' by 108 commits. (use "git push" to publish