config merge issue

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = git@github.com:lacostej/jenkins.git
[branch "master"]
        remote = origin
        merge = refs/heads/master
[remote "upstream"]
        url = git@github.com:jenkinsci/jenkins.git
        fetch = +refs/heads/*:refs/remotes/upstream/*
[branch "upstream-master"]
        remote = upstream
        merge = refs/heads/master
[remote "hudson"]
        url = git://java.net/hudson~git
        fetch = +refs/heads/*:refs/remotes/hudson/*
[branch "lacostej-JENKINS-8707-changelog"]
        remote = upstream
        merge = refs/heads/master





$ git status
# On branch upstream-master
# Your branch is ahead of 'upstream/master' by 1 commit.
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)



jerome@lenovo-w510:~/Code/OSS/Jenkins/jenkins (upstream-master)$ git push upstream master
Everything up-to-date



git log


commit 7e3bc36b39da323bda7b6d0e18ed4a65f3c6ec7a
Author: Jerome Lacoste <jerome.lacoste@gmail.com>
Date:   Mon Feb 7 14:44:59 2011 +0100

    Revert "merge changelog.html fixes from kk"
    
    Note that the above description is incorrect as to what the merge was about.
    It is the message that I intended to make. It appears that I accidentaly merged multiple fixes waiting to be reviewed on my private fork.
    
    This reverts commit dce0d2aff0a440d7405b9ba10fafa2f3fe98a27a, reversing
    changes made to 63f67f30bdcfd062bccc85d245109b34785a195b.

commit dce0d2aff0a440d7405b9ba10fafa2f3fe98a27a
Merge: 1d65057 63f67f3
Author: Jerome Lacoste <jerome.lacoste@gmail.com>
Date:   Mon Feb 7 10:33:26 2011 +0100

    merge changelog.html fixes from kk



git show --format=fuller dce0d2aff0a440d7405b9ba10fafa2f3fe98a27a
commit dce0d2aff0a440d7405b9ba10fafa2f3fe98a27a
Merge: 1d65057 63f67f3
Author:     Jerome Lacoste <jerome.lacoste@gmail.com>
AuthorDate: Mon Feb 7 10:33:26 2011 +0100
Commit:     Jerome Lacoste <jerome.lacoste@gmail.com>
CommitDate: Mon Feb 7 10:33:26 2011 +0100

    merge changelog.html fixes from kk




jerome@lenovo-w510:~/Code/OSS/Jenkins/jenkins (upstream-master)$ git diff 63f67f3

empty (revert has worked)