problems with git push and pull

[Janek Warchoł]

Hi all,

As a nice inauguration of me having git push ability, i broke my
repository :)  git pull seems not to work properly.

Here's what i did:
- in step 6 from here
http://lilypond.org/doc/v2.15/Documentation/contributor/commit-access
i mistakenly called
 config remote.origin.url \
  ssh://address@hidden/srv/git/lilypond.git
(i.e. i didn't replace 'user' with my username)
- when i tried to call it again properly, it refused to work
- so i opened .git/config and deleted some lines - apparently too many
(that was very smart of me!), after doing so i was able to perform
step 6 properly
- followed remaining steps
- called git pull -r on master
- checked out a new branch
- made changes to authors.itexi (i.e. added myself to develoopment
team) and committed them
- called 'git push' (while still being on that new branch)
- checked out master
- called 'git pull -r'.
I was pretty sure that in this moment my local master, my new branch
and origin/master were all the same.  However, when i called 'git diff
origin/master' it showed a lot of differences, including difference in
authors.itexi :(  When i call git log, here's what i see:

commit 91a4b0aad388a65fe64832b38dc19532b4eef17b
Author: Jean-Charles Malahieude <address@hidden>
Date:   Sun Aug 21 20:09:12 2011 +0200

    Revert "Doc: NR-3.2 titling"

    This reverts commit 6810d727b278d15825eecb2b497d1a966241d4eb.

commit 32c3ef2b7cdde3abc72738f0173b78f8d28d65c3
Author: Janek Warchol <address@hidden>
Date:   Sun Aug 21 17:53:21 2011 +0200

    add Janek Warchol to authors

commit 9c319db89ecc46cbf6c9c35e759eba973e412bb0
Merge: 49ef4f0 fb47959
Author: Mike Solomon <address@hidden>
Date:   Sun Aug 21 17:19:28 2011 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond

commit 49ef4f0ee42f1e1e8078aefa30bed9712fa482c6
Author: Mike Solomon <address@hidden>
Date:   Sun Aug 21 17:16:20 2011 +0200

    Provides a pure height conversion for Beam::rest_collision_callback.

    This prevents horizontal collisions between beamed rests and their
    beamed neighbors.

commit fb47959646377858b4133dd6c395af6b0ca6645b
Author: Bertrand Bordage <address@hidden>
Date:   Sun Aug 21 16:44:23 2011 +0200

    Revert "New alist to replace special characters."

    This reverts commit 28d8d9ac38857927790af5759c393adeff1ceb82.



And these are the contents of my .git/config:

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[branch "master"]
        remote = origin
        merge = refs/heads/master
[gui]
        wmstate = normal
        geometry = 1150x515+0+51 207 192
[rietveld]
        server = codereview.appspot.com
        cc = address@hidden
[branch "clef"]
        rietveldissue = 4664070
        rietveldpatchset = 21001
[branch "arp-arrow"]
        rietveldissue = 4793041
        rietveldpatchset = 1
[branch "narrow-acc"]
        rietveldissue = 4790043
        rietveldpatchset = 1
[branch "tremolo"]
        rietveldissue = 4636081
        rietveldpatchset = 38001
[branch "barlinesfix"]
        rietveldissue = 4809057
        rietveldpatchset = 1
[branch "guitar-capo"]
        rietveldissue = 4800051
        rietveldpatchset = 12002
[remote "origin"]
        url = ssh://address@hidden/srv/git/lilypond.git

please help!

Janek