On Fri, May 16, 2014 at 06:26:00PM -0400, Scott Kostyshak wrote:

> On Fri, May 16, 2014 at 6:21 PM, Enrico Forestieri <for...@lyx.org> wrote:
> 
> > and I simply plan removing the [branch "2.0.x"] stanza.
> 
> Ah, now I see what you meant above. I am still not used to 2.0.x as
> being "old". I was reading it as I should read 2.1.x. I still put the
> date as 2013 also :)

I now tried my luck and issued the commands I found googling:
$ git branch -d -r origin/2.0.x
$ git config --unset branch.2.0.x.remote
$ git config --unset branch.2.0.x.merge

then I looked again at .git/config
$ cat .git/config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
        ignorecase = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = g...@git.lyx.org:lyx
[branch "2.0.x"]
[merge]
        defaultToUpstream = true
[gui]
        wmstate = normal
        geometry = 1031x427+46+46 282 192
[branch "2.1.x"]
        remote = origin
        merge = refs/heads/2.1.x

and it actually almost got rid of the [branch "2.0.x"] stanza, leaving
only the header. I would like to get rid of that too, but I don't know
what of the git options of the type --reset --hard --really --please
I have to use. Perhaps I will simply use an editor and be done with it.

-- 
Enrico

Reply via email to