On Oct 25, 2011, at 3:46 PM, David Kastrup wrote: > "m...@apollinemike.com" <m...@apollinemike.com> writes: > >> On Oct 25, 2011, at 3:36 PM, David Kastrup wrote: >> >> "m...@apollinemike.com" <m...@apollinemike.com> writes: >> >> And now I have two extra branches (staging/HEAD and >> origin/dev/staging/HEAD) that I can't seem to get rid of. Any >> suggestions? >> >> >> Use an editor on .git/config to clean up, and find and delete >> those >> files from .git/refs that represent the bad branches. >> >> Sometimes the hardcore solutions are easiest. >> >> >> >> Works like a charm. >> >> My question still stands about how to establish the remote branch. >> >> git remote add -ft dev/staging -m dev/staging >> origin/dev/staging git://git.sv.gnu.org/lilypond.git/ >> does not seem to do the trick >> >> Any takers? > > Well, my .git/config has > [remote "origin"] > fetch = +refs/heads/*:refs/remotes/origin/* > url = ssh://git.sv.gnu.org/srv/git/lilypond.git > fetch = +refs/heads/dev/staging:refs/remotes/origin/dev/staging > > in it. I have no idea why the third line is needed on top of the first > line, but maybe you can't delete and repush otherwise since after the > deletion, git has forgotten how to get there. > > Anyway, try making .git/config similar, and the do git fetch origin, and > then git branch -r really should do that. > > There will be some magical git "user interface" command line for writing > the !@#$@!$ fetch line, but I forgot which one I used. >
This I did, and it fetched everything under the sun except dev/staging: mikesol@mikesol-laptop:~/lilypond-git$ git fetch >From ssh://git.sv.gnu.org/srv/git/lilypond * [new branch] cvs/master -> origin/cvs/master * [new branch] dev/jmandereau -> origin/dev/jmandereau * [new branch] dev/jneem -> origin/dev/jneem * [new branch] dev/jneeman -> origin/dev/jneeman * [new branch] dev/kainhofer -> origin/dev/kainhofer * [new branch] dev/patrick -> origin/dev/patrick * [new branch] dev/rlittle -> origin/dev/rlittle * [new branch] dev/rune -> origin/dev/rune * [new branch] dev/stringtuning -> origin/dev/stringtuning * [new branch] dev/syntax -> origin/dev/syntax * [new branch] dev/waf -> origin/dev/waf * [new branch] lilypond/translation -> origin/lilypond/translation * [new branch] macos-lilypad -> origin/macos-lilypad * [new branch] release/unstable -> origin/release/unstable * [new branch] stable/0.0 -> origin/stable/0.0 * [new branch] stable/1.0 -> origin/stable/1.0 * [new branch] stable/1.2 -> origin/stable/1.2 * [new branch] stable/1.4 -> origin/stable/1.4 * [new branch] stable/1.6 -> origin/stable/1.6 * [new branch] stable/1.8 -> origin/stable/1.8 * [new branch] stable/2.0 -> origin/stable/2.0 * [new branch] stable/2.10 -> origin/stable/2.10 * [new branch] stable/2.12 -> origin/stable/2.12 * [new branch] stable/2.14 -> origin/stable/2.14 * [new branch] stable/2.2 -> origin/stable/2.2 * [new branch] stable/2.4 -> origin/stable/2.4 * [new branch] stable/2.6 -> origin/stable/2.6 * [new branch] stable/2.8 -> origin/stable/2.8 * [new branch] tarball/master -> origin/tarball/master * [new branch] web -> origin/web * [new branch] web-gop -> origin/web-gop Who said git was supposed to be easy?!? Cheers, MS _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
