Re: 2 pushes to dev/staging

2011-11-25 Thread Graham Percival
On Thu, Nov 24, 2011 at 09:09:14AM +0100, m...@apollinemike.com wrote: > Could someone please verify that they are indeed in staging > (111f4707f90a4512f2c945ee5a47510c210b45f9 and > 006a7e62037188718465427626174af5b6f03a1d)? I see that this is resolved now, and hopefully in a few days I'll get in

Re: 2 pushes to dev/staging

2011-11-24 Thread David Kastrup
"m...@apollinemike.com" writes: >> git branch --set-upstream staging origin/staging >> >> will likely make git pull -r work again. >> > > OK - should be good to go now. I now get * commit c81b2dc6fc2c086386abed7a026508e3af9af5e1 (origin/staging) | Author: Mike Solomon | Date: Thu Nov 24 10

Re: 2 pushes to dev/staging

2011-11-24 Thread m...@apollinemike.com
> git branch --set-upstream staging origin/staging > > will likely make git pull -r work again. > OK - should be good to go now. Thanks! Cheers, MS ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypo

Re: 2 pushes to dev/staging

2011-11-24 Thread David Kastrup
"m...@apollinemike.com" writes: > All went well with the rename and I did a git pull -r on the branch to > boot (which didn't pull anything, as staging has had no new additions > within the past hour-ish). Judging from your config file posted previously, your staging branch is not tracking any u

Re: 2 pushes to dev/staging

2011-11-24 Thread m...@apollinemike.com
On Nov 24, 2011, at 10:07 AM, David Kastrup wrote: > "m...@apollinemike.com" writes: > >> On Nov 24, 2011, at 9:50 AM, David Kastrup wrote: >> >>> >>> So the question stays: what command did you execute on what branch? >>> >> >> I think I may have just fixed the problem - could you please c

Re: 2 pushes to dev/staging

2011-11-24 Thread David Kastrup
"m...@apollinemike.com" writes: > On Nov 24, 2011, at 9:50 AM, David Kastrup wrote: > >> >> So the question stays: what command did you execute on what branch? >> > > I think I may have just fixed the problem - could you please check? > My branch was called dev/staging, so I executed git push o

Re: 2 pushes to dev/staging

2011-11-24 Thread m...@apollinemike.com
On Nov 24, 2011, at 9:50 AM, David Kastrup wrote: > > So the question stays: what command did you execute on what branch? > I think I may have just fixed the problem - could you please check? My branch was called dev/staging, so I executed git push origin dev/staging. Cheers, MS _

Re: 2 pushes to dev/staging

2011-11-24 Thread David Kastrup
"m...@apollinemike.com" writes: > On Nov 24, 2011, at 9:29 AM, m...@apollinemike.com wrote: > >> On Nov 24, 2011, at 9:25 AM, David Kastrup wrote: >> >>> "m...@apollinemike.com" writes: >>> Hey all, I think I pushed two commits to staging today but I am not certain that my

Re: 2 pushes to dev/staging

2011-11-24 Thread m...@apollinemike.com
On Nov 24, 2011, at 9:29 AM, m...@apollinemike.com wrote: > On Nov 24, 2011, at 9:25 AM, David Kastrup wrote: > >> "m...@apollinemike.com" writes: >> >>> Hey all, >>> >>> I think I pushed two commits to staging today but I am not certain >>> that my changes actually got pushed (I got a differ

Re: 2 pushes to dev/staging

2011-11-24 Thread m...@apollinemike.com
On Nov 24, 2011, at 9:25 AM, David Kastrup wrote: > "m...@apollinemike.com" writes: > >> Hey all, >> >> I think I pushed two commits to staging today but I am not certain >> that my changes actually got pushed (I got a different message when >> pushing than usual - "Everything up-to-date"). Co

Re: 2 pushes to dev/staging

2011-11-24 Thread David Kastrup
"m...@apollinemike.com" writes: > Hey all, > > I think I pushed two commits to staging today but I am not certain > that my changes actually got pushed (I got a different message when > pushing than usual - "Everything up-to-date"). Could someone please > verify that they are indeed in staging >

2 pushes to dev/staging

2011-11-24 Thread m...@apollinemike.com
Hey all, I think I pushed two commits to staging today but I am not certain that my changes actually got pushed (I got a different message when pushing than usual - "Everything up-to-date"). Could someone please verify that they are indeed in staging (111f4707f90a4512f2c945ee5a47510c210b45f9 a