-
ruaok
alastairp: how do you switch between local branches in git?
2009-01-26 02650, 2009
-
alastairp
git stash
2009-01-26 02659, 2009
-
alastairp
git checkout -b branch
2009-01-26 02600, 2009
-
alastairp
I think
2009-01-26 02609, 2009
-
ruaok
thats to create a new branch.
2009-01-26 02617, 2009
-
ruaok
oops. no.
2009-01-26 02619, 2009
-
alastairp
git branch something?
2009-01-26 02625, 2009
-
ruaok tries it
2009-01-26 02641, 2009
-
aCiD2
ok, i'm a retard, i'm not late at all lol
2009-01-26 02646, 2009
-
aCiD2 scrolls up
2009-01-26 02649, 2009
-
alastairp
need to stash if you have local changes that you haven't commiteed
2009-01-26 02649, 2009
-
brianfreud
2009-01-26 02651, 2009
-
ruaok
git checkout branch
2009-01-26 02653, 2009
-
ruaok
no -b
2009-01-26 02656, 2009
-
alastairp
right
2009-01-26 02659, 2009
-
alastairp
ask aCiD2
2009-01-26 02604, 2009
-
aCiD2 blinks
2009-01-26 02614, 2009
-
ruaok
loi
2009-01-26 02600, 2009
-
MrEIso
brianfreud, one thing we're planning on doing is abstracting away the mp3/flac stuff some more, so then it would be easy to write a ogg version too.
2009-01-26 02610, 2009
-
brianfreud
nice :)
2009-01-26 02612, 2009
-
MrEIso
(even easier, since IIRC flac and ogg use the same tagging system)
2009-01-26 02615, 2009
-
ruaok
git-stash is cool
2009-01-26 02622, 2009
-
aCiD2
it is :)
2009-01-26 02629, 2009
-
brianfreud
should look at warp's collections script - he did a nice job separating type from function
2009-01-26 02630, 2009
-
aCiD2
did you get svn checkouts working?
2009-01-26 02652, 2009
-
ruaok
no. I'm at r11136
2009-01-26 02605, 2009
-
aCiD2
and what's happening?
2009-01-26 02607, 2009
-
ruaok
svn is r11141
2009-01-26 02644, 2009
-
ruaok
git-svn fetch says nothing
2009-01-26 02650, 2009
-
aCiD2
git svn rebase ?
2009-01-26 02605, 2009
-
aCiD2
fetch doesn't merge with svn head
2009-01-26 02615, 2009
-
aCiD2
it just fetchs it, ready for rebasing to
2009-01-26 02648, 2009
-
ruaok
ah.
2009-01-26 02650, 2009
-
ruaok
that worked.
2009-01-26 02603, 2009
-
aCiD2
cool :)
2009-01-26 02604, 2009
-
ruaok
funny, I'd done both commands before...
2009-01-26 02613, 2009
-
ruaok
thx
2009-01-26 02613, 2009
-
aCiD2
odd
2009-01-26 02629, 2009
-
aCiD2
also ruaok, if you're using git, you might want to add my branch on github as a remote
2009-01-26 02654, 2009
-
ruaok
got command?
2009-01-26 02604, 2009
-
aCiD2
yea, but you need to check something, cause my browser is pooped, heh
2009-01-26 02615, 2009
-
alastairp
git remote add acid <url on his github>
2009-01-26 02621, 2009
-
aCiD2
2009-01-26 02632, 2009
-
ruaok
lol
2009-01-26 02632, 2009
-
aCiD2
oh yea, give it a name, listen to alastairp :)
2009-01-26 02637, 2009
-
alastairp
yeah
2009-01-26 02639, 2009
-
alastairp
what he said
2009-01-26 02644, 2009
-
ruaok
brianfreud: got repo URL ?
2009-01-26 02650, 2009
-
aCiD2
my browsers refusing to actually do anything >.>
2009-01-26 02600, 2009
-
alastairp
ruaok: go to the repo on github
2009-01-26 02606, 2009
-
alastairp
it gives you the fork url
2009-01-26 02611, 2009
-
aCiD2
2009-01-26 02614, 2009
-
brianfreud
2009-01-26 02615, 2009
-
aCiD2
maybe without the .git
2009-01-26 02619, 2009
-
aCiD2
no, don't use brians :P
2009-01-26 02622, 2009
-
alastairp
2009-01-26 02625, 2009
-
aCiD2
ta
2009-01-26 02629, 2009
-
ruaok
lol
2009-01-26 02630, 2009
-
aCiD2
no.. that's brians >.<
2009-01-26 02632, 2009
-
brianfreud
:P
2009-01-26 02636, 2009
-
ruaok
when it rains, it pours!
2009-01-26 02638, 2009
-
aCiD2
when you do that you can do `git fetch acid` and all my work in git will be pulled to your machine, into a branch
2009-01-26 02659, 2009
-
aCiD2
might be nice to sketch ideas out, but not commit to svn, who knows
2009-01-26 02608, 2009
-
alastairp
aCiD2: can anyone commit back to svn?
2009-01-26 02616, 2009
-
aCiD2
if you svn privs
2009-01-26 02620, 2009
-
aCiD2
have..
2009-01-26 02622, 2009
-
alastairp
sure
2009-01-26 02635, 2009
-
brianfreud still doesn't want them :)
2009-01-26 02648, 2009
-
aCiD2
don't worry, you're not quite there yet :)
2009-01-26 02657, 2009
-
aCiD2 thinks he should have his taken away judging by some commits
2009-01-26 02600, 2009
-
ruaok
ok, done with git fetch
2009-01-26 02603, 2009
-
ruaok
do I need to rebase?
2009-01-26 02611, 2009
-
ruaok
if I want to go to your branch?
2009-01-26 02612, 2009
-
aCiD2
probably not
2009-01-26 02614, 2009
-
alastairp
don't think so
2009-01-26 02628, 2009
-
aCiD2
if you want to go by `git branch -r`
2009-01-26 02628, 2009
-
alastairp
git branch will show all branches
2009-01-26 02644, 2009
-
aCiD2
then `git chekout branch`
2009-01-26 02646, 2009
-
ruaok
only shows mine
2009-01-26 02652, 2009
-
brianfreud
aCiD2: did you see my message about waiting to merge?
2009-01-26 02653, 2009
-
alastairp
and you merge branches with.... git merge?
2009-01-26 02658, 2009
-
aCiD2
alastairp: or pull
2009-01-26 02600, 2009
-
alastairp
it has some paramaters
2009-01-26 02625, 2009
-
aCiD2
but it should show my branch in git branch... erm, how'd I do this at home..
2009-01-26 02624, 2009
-
MrEIso has quit
2009-01-26 02610, 2009
-
aCiD2
cool, the git protocol won't work over wireless uni connection, hum
2009-01-26 02652, 2009
-
ruaok
that sucks
2009-01-26 02634, 2009
-
ruaok
2009-01-26 02638, 2009
-
ruaok
git:// ?
2009-01-26 02644, 2009
-
ruaok
or http:// ?
2009-01-26 02639, 2009
-
ruaok
git://
2009-01-26 02610, 2009
-
ruaok
aCiD2: git branch -a
2009-01-26 02617, 2009
-
ruaok
shows both local and remote brances
2009-01-26 02623, 2009
-
ruaok
branches
2009-01-26 02647, 2009
-
ruaok
ok, git is hardc-core sexy.
2009-01-26 02659, 2009
-
ruaok
geekily speaking, of course
2009-01-26 02606, 2009
-
brianfreud
very nice :)
2009-01-26 02658, 2009
-
ruaok
ok, enough for today. nap time.
2009-01-26 02659, 2009
-
ruaok
nn!
2009-01-26 02605, 2009
-
ruaok has quit
2009-01-26 02621, 2009
-
luks
that's the first time I've seen git being called sexy :P
2009-01-26 02609, 2009
-
CatCat
pfft, the soundsmith commercial wasn't *that* bad
2009-01-26 02612, 2009
-
CatCat
i've seen worse
2009-01-26 02614, 2009
-
CatCat
it was lame
2009-01-26 02625, 2009
-
CatCat
but not the worst i've seen
2009-01-26 02611, 2009
-
Muz
Yeah, but you live in Norway where your standard TV is much worse.
2009-01-26 02615, 2009
-
FauxFaux
It can't be worse than here.
2009-01-26 02640, 2009
-
Muz
They all speak /foreign/ there. ¬_¬
2009-01-26 02640, 2009
-
jason_emmett
It's norse, not worse ;-)
2009-01-26 02606, 2009
-
russss joined the channel
2009-01-26 02615, 2009
-
Infinito- joined the channel
2009-01-26 02625, 2009
-
CStan joined the channel
2009-01-26 02642, 2009
-
CStan has left the channel
2009-01-26 02611, 2009
-
czaanja joined the channel
2009-01-26 02626, 2009
-
xlotlu has quit
2009-01-26 02612, 2009
-
tru has quit
2009-01-26 02621, 2009
-
aCiD2
brianfreud: I did yea
2009-01-26 02658, 2009
-
aCiD2
luks: i think git's sexy too :)
2009-01-26 02601, 2009
-
aCiD2
so there's the second time, heh
2009-01-26 02620, 2009
-
aCiD2
and CatCat i was cringing all the way through that soundsmith commercial it is baaaad :P
2009-01-26 02621, 2009
-
tru joined the channel
2009-01-26 02642, 2009
-
LotR has quit
2009-01-26 02652, 2009
-
LotR joined the channel
2009-01-26 02609, 2009
-
LotR has quit
2009-01-26 02617, 2009
-
LotR joined the channel
2009-01-26 02659, 2009
-
Sargun has quit
2009-01-26 02625, 2009
-
v6lur joined the channel
2009-01-26 02647, 2009
-
nikki yawns
2009-01-26 02614, 2009
-
navap is watching Airplane II
2009-01-26 02642, 2009
-
FauxFaux
Doing it right.
2009-01-26 02613, 2009
-
aCiD2
Hrm, any idea how to display the title of the active window in screen as my titlebar, when running through ssh?
2009-01-26 02624, 2009
-
aCiD2
Terminal just displays 'ssh' instead of the window title :(
2009-01-26 02640, 2009
-
Muz
Did I ever tell you about my drinking problem?
2009-01-26 02642, 2009
-
Muz
Splosh.
2009-01-26 02642, 2009
-
navap
aCiD2: #screen might have the answer.
2009-01-26 02645, 2009
-
FauxFaux
aCiD2: ^a:hardstatus lastline
2009-01-26 02648, 2009
-
aCiD2
google seems to have some stuff too
2009-01-26 02604, 2009
-
aCiD2
FauxFaux: eh, I don't really want the status bar
2009-01-26 02605, 2009
-
FauxFaux
Wait, no, that's for the... hardstatus as the title, which isn'tw hat you want.
2009-01-26 02608, 2009
-
aCiD2
lol
2009-01-26 02616, 2009
-
FauxFaux
Clearly ou need more tabs.
2009-01-26 02630, 2009
-
Sargun joined the channel
2009-01-26 02614, 2009
-
CStan joined the channel
2009-01-26 02655, 2009
-
zeno_ joined the channel
2009-01-26 02634, 2009
-
LotR has quit
2009-01-26 02645, 2009
-
CStan has left the channel
2009-01-26 02615, 2009
-
zeno has quit
2009-01-26 02614, 2009
-
brianfreud
Johnny Five is Alive! :D
2009-01-26 02627, 2009
-
pbryan joined the channel
2009-01-26 02638, 2009
-
brianfreud
