Problem with git push

2011-09-22 Thread Phil Holmes
On my new machine, I get: phil@Ubuntu:~/lilypond-git$ git push --dry-run To ssh://philhol...@git.sv.gnu.org/srv/git/lilypond.git ! [rejected]master - master (non-fast-forward) error: failed to push some refs to 'ssh://philhol...@git.sv.gnu.org/srv/git/lilypond.git' To prevent you from

Re: Problem with git push

2011-09-22 Thread Phil Holmes
- Original Message - From: Phil Holmes em...@philholmes.net To: Devel lilypond-devel@gnu.org Sent: Thursday, September 22, 2011 12:44 PM Subject: Problem with git push On my new machine, I get: phil@Ubuntu:~/lilypond-git$ git push --dry-run To ssh://philhol...@git.sv.gnu.org/srv/git

Re: Problem with git push

2011-09-22 Thread Phil Holmes
I'm just trying to push a single commit on master. -- Phil Holmes - Original Message - From: Bertrand Bordage To: Phil Holmes Cc: lilypond-devel@gnu.org ; David Kastrup Sent: Thursday, September 22, 2011 1:13 PM Subject: Re: Problem with git push You can specify what

Re: Problem with git push

2011-09-22 Thread Bertrand Bordage
The commit you want to push must follow origin/master. If it does, just do: git push --dry-run origin [hash_of_the_commit]:master This will push this single commit. If not, you have to rebase so that the commit follows origin/master: git rebase -i origin An editor opens, where you can change the

Re: Problem with git push

2011-09-22 Thread Phil Holmes
is on the latest version of master. -- Phil Holmes - Original Message - From: Bertrand Bordage To: Phil Holmes Cc: lilypond-devel@gnu.org ; David Kastrup Sent: Thursday, September 22, 2011 1:40 PM Subject: Re: Problem with git push The commit you want to push must follow

Re: Problem with git push

2011-09-22 Thread Janek Warchoł
2011/9/22 Phil Holmes m...@philholmes.net: I've just used lily-git to do a hard reset of my git, reapplied the changes, recommitted and redone the push --dry-run and am still getting the same error.  I'm not quite sure what it means for commit you want to push must follow origin/master but

Re: Problem with git push

2011-09-22 Thread Phil Holmes
- Original Message - From: Janek Warchoł janek.lilyp...@gmail.com To: Phil Holmes m...@philholmes.net Cc: Bertrand Bordage bordage.bertr...@gmail.com; David Kastrup d...@gnu.org; lilypond-devel@gnu.org Sent: Thursday, September 22, 2011 2:05 PM Subject: Re: Problem with git push 2011

Re: Problem with git push

2011-09-22 Thread Reinhold Kainhofer
Am Donnerstag, 22. September 2011, 13:44:20 schrieb Phil Holmes: On my new machine, I get: phil@Ubuntu:~/lilypond-git$ git push --dry-run To ssh://philhol...@git.sv.gnu.org/srv/git/lilypond.git ! [rejected]master - master (non-fast-forward) error: failed to push some refs to

Re: Problem with git push

2011-09-22 Thread Phil Holmes
- Original Message - From: Reinhold Kainhofer reinh...@kainhofer.com Simply fetch from the server: git pull --rebase Well, I was sure I must have done that at one point, but I've done it now and success :-) Thanks Reinhold. -- Phil Holmes

Re: Problem with git push

2011-09-22 Thread Phil Holmes
- Original Message - From: Phil Holmes m...@philholmes.net To: Reinhold Kainhofer reinh...@kainhofer.com; lilypond-devel@gnu.org Sent: Thursday, September 22, 2011 3:28 PM Subject: Re: Problem with git push - Original Message - From: Reinhold Kainhofer reinh...@kainhofer.com

Re: Problem with git push

2011-09-22 Thread Janek Warchoł
2011/9/22 Phil Holmes m...@philholmes.net: - Original Message - From: Phil Holmes m...@philholmes.net To: Reinhold Kainhofer reinh...@kainhofer.com; lilypond-devel@gnu.org Sent: Thursday, September 22, 2011 3:28 PM Subject: Re: Problem with git push - Original Message - From

Re: Problem with git push

2011-09-22 Thread Phil Holmes
- Original Message - From: Janek Warchoł janek.lilyp...@gmail.com To: Phil Holmes m...@philholmes.net Cc: Reinhold Kainhofer reinh...@kainhofer.com; lilypond-devel@gnu.org Sent: Thursday, September 22, 2011 4:20 PM Subject: Re: Problem with git push 2011/9/22 Phil Holmes m