Re: Pushing to my repo.or.cz repository

[Reinhold Kainhofer]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am Mittwoch, 18. Juni 2008 schrieb Carl D. Sorensen:
> Well, thanks to Reinhold and Patrick I was able to get my
> lilypond/csorensen repository working.  I was also able to rebase my
> changes against lilypond/master, fix up the spacing problems I have, and
> get the git-diff down to where it should be.
>
> I have tested the revised fret-diagrams code against 2.11.48 (but with my
> local scm/ directory) and everything works.
>
> Now it's time to push it back to my fork at repo.or.cz and invite Han-Wen
> to cherry-pick it.
>
> So that I don't mess things up, could you give me a recommended git command
> to do this?

In orchestrallily, I have a file .git/config with the following contents:
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        url = git+ssh://address@hidden/srv/git/orchestrallily.git
        fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
        remote = origin
        merge = refs/heads/master

With that configuration, I can simply push my local commits to the server 
using
    git push
(or alternatively "git push origin master"). If you are using your own branch 
on the server (as opposed to committing to master), you might add something 
like
[branch "dev/texi2html"]
        remote = origin
        merge = refs/heads/dev/texi2html
(for a branch named dev/texi2html) to the config file. Then, in your branch, 
you can simply do "git push origin dev/texi2html".

Cheers,
Reinhold

- -- 
- ------------------------------------------------------------------
Reinhold Kainhofer, Vienna University of Technology, Austria
email: address@hidden, http://reinhold.kainhofer.com/
 * Financial and Actuarial Mathematics, TU Wien, http://www.fam.tuwien.ac.at/
 * K Desktop Environment, http://www.kde.org, KOrganizer maintainer
 * Chorvereinigung "Jung-Wien", http://www.jung-wien.at/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFIWGIYTqjEwhXvPN0RAifGAKDVX/CRmllHRgSr+oNTHDGyZAIvFQCgkrzk
XCqtlhrbNlIu9eNoKGOAvG0=
=rZhp
-----END PGP SIGNATURE-----