David, Sorry for answering my own post ...
On Sun, Oct 30, 2011 at 2:40 PM, Peekay Ex <pkx1...@gmail.com> wrote: > Hello, > > On Sun, Oct 30, 2011 at 11:05 AM, David Kastrup <d...@gnu.org> wrote: >> lilyp...@googlecode.com writes: >> >>> Comment #19 on issue 1266 by pkx1...@gmail.com: Dots in chords can not >>> be moved >>> http://code.google.com/p/lilypond/issues/detail?id=1266 >>> >>> Hello, Yes I can do that - I need to get into the habit of the new workflow. >>> >>> Can I just check the command I need to use is: >>> >>> git push origin dev\staging >>> >>> and that is it - I don't want to break anything with my push access. >>> >>> Eg. I don't need to download a new repo just for dev/staging do I, I >>> can just push from my own lilypond-git repo to dev/staging? >> >> The command you need to use to push from HEAD is >> >> git push origin HEAD:refs/heads/dev/staging >> >> For some reason, sometimes the full ref on the right hand side is >> required (probably when your repository does not know about staging >> and/or you just deleted it). >> >> You can't break anything in that manner: git will refuse to do anything >> that is not an incremental addition to staging. So dev/staging should >> not be in a worse logical state than before, if your HEAD looks >> reasonable. >> >> Unfortunately, our repository is configured in a manner that you can't >> convince git when an incremental addition is not possible (like when >> there has been diverging stuff on master you want to rebase into >> staging). Instead you need to delete and rewrite dev/staging. Deleting >> it is done by doing the same push command, just without "HEAD" before >> the colon. >> >> But before you _rewrite_ dev/staging, better ask again. >> > > David thanks. > > It pushed without any complaints. > > jlowe@jlowe-lilybuntu2:~/lilypond-git/build$ git push origin > HEAD:refs/heads/dev/staging > Counting objects: 13, done. > Delta compression using up to 7 threads. > Compressing objects: 100% (7/7), done. > Writing objects: 100% (7/7), 651 bytes, done. > Total 7 (delta 6), reused 0 (delta 0) > To ssh://pkx1...@git.sv.gnu.org/srv/git/lilypond.git > 2f1556b..b5f1985 HEAD -> dev/staging > > ... > > However how can I view dev/staging? > http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=shortlog;h=refs/heads/dev/staging works for me. -- -- James _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
