IRCloggy #git 2012-12-15

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2012-12-15

eletuchy_ joined00:00
jbeal left00:00
rideh left00:01
fuzzybunny69y1 joined00:01
Industrial joined00:02
cmn stop right now and go actually read what merges are00:02
it's not an adjective, it's a verb00:02
fuzzybunny69y left00:02
fuzzybunny69y1fuzzybunny69y00:02
eletuchy left00:03
rideh joined00:03
cbreak lenswipee: nothing has been modified during the rebase00:03
lenswipee cbreak: then why it says "both modified: file1"?00:04
cbreak lenswipee: do you know what a conflict is?00:04
lenswipee cbreak: yes00:04
cbreak what?00:05
lenswipee cbreak: when there is a disagreement in file content that does not allow for an easy merge.00:05
cbreak so, how can such a disagreement arise?00:05
Industrial Say I have a whole lot of projects that are sort of the same (NodeJS Webservers/apps mostly). Over time I developed a standard way of laying these out, using libraries and configuration etc. Would it be possible to encapsulate all this behavour in a separate git repo? I'm sure I could clone new projects from there and use it as a skeleton but then all my projects would essentially be different possibilities/universes of the same beginning right? What00:06
also, hi. :X00:06
RichiH cbreak: aliens00:06
lenswipee cbreak: when brances diverge.00:06
cbreak lenswipee: no.00:06
lenswipee: try again.00:06
diverging branches can often be automatically merged00:06
in which situations will you get a merge conflict?00:07
lenswipee cbreak: not always00:07
cbreak: when there is a disagreement in file content that does not allow for an easy merge.00:07
cbreak so, how can such a disagreement arise?00:07
think00:07
more than the last time you tried to answer :)00:07
lenswipee cbreak: rebasing.00:07
cbreak no00:08
try again.00:08
Industrial I'm not sure if the project skeleton git repo should be the origin of the clone of each project or just a remote or something. What if I want to factor it into projects that already exist in a git repo but don't use the skeleton code yet?00:08
cbreak Industrial: origin is just a remote00:08
lenswipee cbreak: oh really? then why in my situtation when i rebase i get a file conflict? :D00:08
cbreak you can add as many remotes as you want.00:08
lenswipee: you said you knew why you get conflicts00:09
do you really not know?00:09
etcetera left00:09
lenswipee cbreak: when there is a disagreement in file content that does not allow for an easy merge.00:09
AdrienBrault left00:09
cbreak I asked you repeatedly00:09
and you've so far failed to answer00:09
Industrial oki00:09
cbreak lenswipee: why is there a disagreement?00:09
marhaban left00:09
cbreak lenswipee: THINK00:09
RichiH lenswipee: before asking cbreak, or anyone, to just telling you the answer, i suggest you walk around for a few seconds, clear your head, and simply re-read what's been said00:10
lenswipee cbreak: I have answered that like 4 times now.00:10
cbreak no00:10
you've so far failed to answer00:10
RichiH it's obvious to me what cbreak's trying to do, but you are stuck00:10
cbreak lenswipee: the answer is as easy as it is obvious00:10
lenswipee RichiH: Yes I'm stuck.00:10
cbreak it is:00:10
cmn lenswipee: the answer is not when, but why00:10
RichiH a tiny bit of distance can go a long way )pun intended)00:10
etcetera joined00:10
cbreak both branches modified the file.00:11
got it?00:11
there are other causes for conflict of course00:11
opus joined00:11
avpx joined00:11
cbreak but both modified is the most common00:11
got it?00:12
RichiH one modfified, one deleted would be an example of a different situation00:12
cbreak there is disasgreement about the file conflict because both sides modified it.00:12
lenswipee no, there was no "both modified: file1" prior to rebase00:12
cbreak yeah, and?00:12
lenswipee only showed up during rebase00:12
cbreak use your brain please00:12
lenswipee so it happened during rebase00:13
Milossh joined00:13
cbreak conflicts manifest themselves when you try to merge00:13
Artpicre left00:13
RichiH lenswipee: a rebase is basically a merge00:13
Industrial cbreak: I did a git remote add grunt-template file:/home/tom/Documents/NodeJS/grunt-template; but the remote is not in the git branch -a list. do I need to fetch it (by name?) first?00:13
cbreak they are always there00:13
but you won't notice it until you try00:13
RichiH or rather, sequential cherry-picking on top of a branch00:13
cbreak Industrial: git remote update00:13
or fetch indiidually00:13
lenswipee ok ok moving on because I have another question....00:13
Artpicre joined00:13
cmn Industrial: you need to fetch before you get remote-tracking branches00:13
RichiH lenswipee: as much as i can understand the sentiment, you should make a note of this and try to revisit it. this is _very_ fundamental for working with git00:14
or any other reasonably modern VCS00:14
cbreak it's also very easy to understand...00:15
jbeal joined00:15
lenswipee Question 2: Can you minic a fast-forward merge that can happen following a rebase by doing a checkout to branch tip?00:15
RichiH cbreak: if he's stuck, he's stuck00:15
cbreak that's not the problem00:15
RichiH minic?00:15
PCChris joined00:15
cbreak I don't get how anyone can blame the messenger for bringing bad news00:15
lenswipee mimic00:15
cbreak it's just plain dumb00:15
avpx lenswipee: Well, merge updates your refs00:16
Cassiel joined00:16
alfplayer i solved the problem i had with grepdiff --output-matching=hunk if anyone is interested00:16
avpx Checkout doesn't (except HEAD)00:16
cmn lenswipee: you can either fast-forward or you can't00:16
cbreak lenswipee: no.00:16
checkout doesn't modify branches00:16
rebase does.00:16
use rebase, merge, reset, ...00:16
RichiH cbreak: i don't think he is. but i know, and you know, from experience, that sometimes there's simply a mental block. precisely _because_ it appears obvious, it's clear that he's stuck, atm00:16
cbreak or update-ref if you dare00:16
kukks1 joined00:16
kukks left00:17
lenswipee RichiH: Thanks for your compassion, but I'm no longer stuck one Question 1.00:17
alunduil joined00:17
RichiH i think you are, but ignoring it ;)00:17
ncd|leeN joined00:18
lenswipee Question 2: Can you mimic a fast-forward merge that can happen following a rebase by doing a checkout to branch tip?00:18
RichiH: no really, i got it.00:18
RichiH explain it in your own words, then00:18
not trying to be an ass00:18
really trying to help00:18
adamben left00:18
Industrial cbreak: guess I could make different versions of the skeleton as branches aimed at x because they'd fall under the same remote so I just pick a branch :x?00:18
cbreak lenswipee: are you slow?00:18
lenswipee: I already answered.00:18
nioncode left00:19
lenswipee a ff-merge just moves the branch to branch tip00:19
checkout does the same.00:19
cbreak Industrial: you can make as many branches as you want, yes.00:19
lenswipee: no.00:19
lenswipee: which part of "checkout does not modify branches" do you not get?00:20
Industrial cbreak: do you have any favorite 'central' managing of git repositores?00:20
+i00:20
cbreak I use gitolite.00:20
lenswipee RichiH: "both modified: file1" means there is a disagreement in file content on both commits.00:20
cbreak it's very powerful and fairly easy to use00:20
Industrial ok00:20
cbreak doesn't have a web interface or any other useless baggage though00:21
so if you want that, look somewhere else :)00:21
giallu left00:21
lenswipee right checkout just moves HEAD00:22
Industrial cbreak: gitg is fine.00:22
wtb Tower.app for *nix, though.00:22
lenswipee I had a third question but I forgotten it :(00:23
ejd left00:23
cmn lenswipee: there is nothing in that statement that supports your other claim00:23
lenswipee Question 3: What git tool can show branches diverging? gitk and git log does not.00:24
SirCmpwn left00:24
cmn yes, they do00:24
SirCmpwn joined00:25
Jippi joined00:25
cbreak lenswipee: try git log and gitk00:25
lenswipee I mean In a graph diagram00:25
cbreak or if you have a mac gitx or Source Tree00:25
lenswipee: both do that00:25
lenswipee: !lol00:26
gitinfo lenswipee: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all00:26
cbreak gitk also supports --all00:26
lenswipee cbreak: how you do that in gitk?00:26
DatumDrop joined00:26
cbreak as I wrote.00:26
lenswipee that does not say "how"00:27
it says it supports00:27
cbreak so, what did I say it supports?00:27
revyd left00:28
cakehero joined00:28
lenswipee time to quit while i'm ahead.00:28
enjoy your day guys!00:29
lenswipee left00:29
cbreak ahead? In what universe I wonder.00:30
cakehero left00:30
Artpicre left00:31
DatumDrop left00:31
cmn he probably meant "while I've no head"00:31
m0ltar left00:32
jcao219 joined00:33
boombatower left00:33
infynyxx left00:33
revyd joined00:34
marhaban joined00:40
bubbles10101 joined00:41
maqr joined00:43
dogarrhea left00:44
j416 joined00:47
Jippi left00:47
Ziioynx joined00:48
natechan left00:50
daniel_- left00:51
kokozin left00:52
longbeach left00:54
eletuchy_ left00:55
v1n left00:55
irqq left00:55
eletuchy joined00:55
Imaginativeone joined00:55
nitrix left00:55
mikepack joined00:56
Imaginativeone left00:57
mikepack left00:58
hghazal left00:59
Dan_ joined00:59
eletuchy left00:59
Dan_ left01:00
marhaban left01:00
Anders_J left01:00
luc_ joined01:01
dankest left01:03
Industrial left01:04
kenperkins left01:04
thiago joined01:05
kerrick left01:06
jeffery_ joined01:08
jeffery left01:08
jeffery_jeffery01:08
geonetix left01:09
jbeal left01:09
Milossh left01:09
tmcmahon joined01:10
quazimodo left01:10
geonetix joined01:11
eijk_ left01:12
Blaster Hey I have a bunch of various site templates that use the same base CSS framework and JS framework, and a some of the same markup. I want to track them. Is this something I should use branches for, or separate repos?01:14
thiago do you need to make identical changes to all of them?01:15
to me, it sounds like you don't want a version control system for that, just simple inheritance01:16
jerware when I do an interactive rebase to squash, I'm lead to my text editor showing the commit(s), what do I type in that? A new commit message and comment the current ones?01:16
NiteRain joined01:17
quazimodo joined01:17
thiago jerware: read the bottom of the editor01:17
Blaster thiago: I want to use a VCS for all of them it just seems redundant to store the same JS and CSS framework in each01:18
heinrich5991 left01:18
thiago Blaster: sure, one repository containing them all01:18
Blaster: same branch, though01:18
Blaster: just inherit from the base theme and that's all01:18
Blaster so each theme should be a different commit ?01:19
then if I want to access whichever theme, I check out that commit ?01:19
thiago no, I mean: make it work without VCS01:21
then commit everything01:21
don't use VCS for what you're trying to do01:21
it's the wrong tool for the job01:21
Blaster oh ok01:21
so like a different directory for each theme, inherit the CSS/JS from their directory, and then just track the whole thing overall01:21
thiago there should be a way of sharing code between them without resorting to branches01:22
Blaster that makes more sense01:22
mikepack joined01:22
marinade joined01:24
jerware thiago: I'm refering to what git is expecting me to do, not the editor.01:24
krum joined01:24
Yuuhi` joined01:24
thiago jerware: did you read the instructions at the bottom?01:24
gitinfo set mode: +v01:25
rideh left01:25
zsoc joined01:25
marinade asd01:25
hey guys im a windows user trying to use git repostitory for the first time01:26
I was wondering whats a good place to start01:26
Yuuhi left01:26
zsoc i have an executable script in /hooks/post-update which is not running after i push from remote to the server with the repo. When i ssh into the server and manually from the ./post-update script it does what is expected.01:26
maletor left01:27
Desproges left01:27
zsoc should unset GIT_DIR be enough to go into another git dir and pull? or are there other envars that need touching?01:28
marinade I want to be able to host my git repository somewhere for free and then be able to autpmatically deploy with some cool free fancy easy to use gui program, any suggestions?01:29
I guess the equivalent of git tower and beanstalk for windows for free...01:29
robotmay left01:30
marinade Is my question too hard?01:30
:)01:30
rideh joined01:31
cannonball left01:32
heinrich5991 joined01:32
Dr4g left01:33
pansdr joined01:33
Milossh joined01:34
Vert joined01:35
todd_dsm left01:38
kpreid left01:38
flaguy48 left01:38
SicoWork left01:38
jargon left01:38
nlogn left01:38
Twey left01:38
hide_ left01:38
wagle left01:38
chee left01:38
babilen left01:38
whomp left01:38
bwidmer left01:38
sobel left01:38
yibe_ left01:38
pansdr left01:38
drodger left01:38
spyro left01:38
atula left01:38
s4muel_ left01:38
matthewp- left01:38
Modernmyth left01:38
bentham left01:38
usefulthink left01:38
dpac|away left01:38
leprechau left01:38
offbyone left01:38
gurps_ left01:38
troyt left01:38
RandalSchwartz left01:38
up_the_irons left01:38
tansell left01:38
guide left01:38
SegFaultAX left01:38
kini left01:38
kennethreitz left01:38
justinfung left01:38
tom39291 left01:38
jlewis left01:38
heinrich5991 left01:38
jeffery left01:38
opus left01:38
etcetera left01:38
kent\n left01:38
GuruShah left01:38
cian1500ww left01:38
unreal left01:38
paddy left01:38
marcobax left01:38
robbyoconnor left01:38
saurik left01:38
grn_ left01:38
ivan` left01:38
jds__ left01:38
BeerSerc_ left01:38
vmiklos left01:38
MissionCritical left01:38
no_maam left01:38
meLon left01:38
Learath2 left01:38
jds_ left01:38
daniel_b left01:38
jerware left01:38
DrNick left01:38
axisys left01:38
alnr left01:38
Tabmow left01:38
psilo_ left01:38
shabble_ left01:38
cxreg left01:38
Ishango left01:38
jackyyll left01:38
sirdancealot7 left01:38
Fandekasp left01:38
p4tux left01:38
iXeno left01:38
BlindOracle left01:38
Vinnie_win left01:38
jpieper left01:38
Sazpaimon left01:38
Kulrak left01:38
zsoc left01:38
quazimodo left01:38
avpx left01:38
bgerber left01:38
hyperair left01:38
m0viefreak left01:38
TeamColtra left01:38
yshh left01:38
robustus left01:38
zivester left01:38
zackiv31 left01:38
KaiSforza left01:38
pdelvo left01:38
iamtakingiteasy left01:38
TheFuzzball left01:38
aucecil left01:38
decasm left01:38
xrq left01:38
robinsmidsrod left01:38
Silex left01:38
genehack left01:38
heytrav left01:38
kcm1700 left01:38
Eridius left01:38
sunny256 left01:38
Zwei left01:38
myme left01:38
c98_ left01:38
efjboss left01:38
johnkpaul left01:38
kanzure left01:38
canton7 left01:38
isomorphic left01:38
Esa_ left01:38
sorin left01:38
Glados_ left01:38
dropdrive left01:38
Goplat left01:38
jjasinski left01:38
sh4rm4 left01:38
ejnahc left01:38
lonewulf` left01:38
jayne left01:38
jwmann left01:38
cyphase left01:38
jaimef left01:38
PerlJam left01:38
wolog left01:38
dinesh___ left01:38
prettyrobots left01:38
Tommy[D] left01:38
xxtjaxx_ left01:38
asakura left01:38
FabTG left01:38
_W_ left01:38
lu_zero left01:38
skorgon left01:38
oogatta left01:38
jpalmer left01:38
john3 left01:38
bluj left01:38
peper left01:38
camurgo left01:38
SJS left01:38
errr left01:38
teukka left01:38
mutex left01:38
newz2000 left01:38
ToBeFree left01:38
webben left01:38
jason237 left01:38
hakril left01:38
SecretAgent left01:38
BBonifield left01:38
joeytwiddle left01:38
Yuuhi` left01:38
Ziioynx left01:38
bubbles10101 left01:38
revyd left01:38
fuzzybunny69y left01:38
kermit left01:38
fisted left01:38
maestrojed left01:38
Targen left01:38
CausaMortis left01:38
gumnos left01:38
parcs left01:38
tplaner left01:38
diegoviola left01:38
Liir left01:38
esto left01:38
Synthead left01:38
ag4ve left01:38
ESphynx left01:38
hesco left01:38
marinade left01:38
hari__ left01:38
tangler01 left01:38
warthog9 left01:38
CEnnis91_ left01:38
beawesomeinstead left01:38
arnihr left01:38
ducch left01:38
bacilla left01:38
ben_alman left01:38
VadtecWk left01:38
zarubin left01:38
phschwartz left01:38
s0ber left01:38
rondale_sc left01:38
nutron left01:38
jimmyeatworld left01:38
cmcculloh left01:38
flavius left01:38
G0re left01:38
sanderj_ left01:38
Vampire0_ left01:38
cenuij left01:38
PacketCollision left01:38
Guest65145 left01:38
Blaster left01:38
krum left01:38
NiteRain left01:38
MacWinner left01:38
JonasF left01:38
Bass10 left01:38
r126t left01:38
Bucciarati left01:38
coopsh left01:38
atrigent left01:38
BooK_ left01:38
kiffer84_ left01:38
e-ndy left01:38
dzan_ left01:38
vu_ left01:38
gitinfo left01:38
Nickeeh left01:38
pilif left01:38
Guest left01:38
Bombe left01:38
WakiMiko left01:38
jaeckel_ left01:38
petteyg left01:38
ohcibi left01:38
realmatt left01:38
Putr left01:38
electrogeek left01:38
Maxdamantus left01:38
Aprogas left01:38
Natureshadow left01:38
garann left01:38
NimeshNeema left01:38
BinGOs left01:38
Felden left01:38
sweet_kid left01:38
dr_lepper left01:38
Fuxx left01:38
myndzi left01:38
Fissure left01:38
jonmasters left01:38
JrCs left01:38
ndim left01:38
blathijs left01:38
frew left01:38
orisinal_ left01:38
diget left01:38
majuscule left01:38
gniourf_gniourf left01:38
txwikinger left01:38
AlexC_ left01:38
deavid left01:38
pureluck left01:38
EdwardIII left01:38
LotR left01:38
Fiouz left01:38
Orphis left01:38
bjornars left01:38
ipi left01:38
thiago left01:38
kukks1 left01:38
allquixotic left01:38
WinstonSmith left01:38
jday_ left01:38
scorphus left01:38
esc left01:38
skywalkerhere left01:38
Xethron left01:38
o] left01:38
boichev_ left01:38
Mogget left01:38
toothr left01:38
heroux left01:38
FrozenFire left01:38
tm512 left01:38
cwillu_at_work left01:38
Sir_Ragnarok left01:38
captbaritone left01:38
blami left01:38
brabo left01:38
metcalfc left01:38
nigelb left01:38
palyboy left01:38
milleja46 left01:38
ruskie left01:38
cbreak left01:38
bremner left01:38
xerxas left01:38
garrys_game__ left01:38
jab416171|Cloud left01:38
MetaCosm left01:38
tapout left01:38
[mbm] left01:38
sjefen6 left01:38
yesi left01:38
doki_pen left01:38
rvsjoen left01:38
cehteh left01:38
marienz left01:38
pom left01:38
chris2 left01:38
lavaman left01:38
siprbaum left01:38
ldlework left01:38
Remram left01:38
Zyrkon left01:38
haarg left01:38
girishnair left01:38
deryni left01:38
mattp_ left01:38
Chilley left01:38
hays left01:38
SuperKing left01:38
Khisanth left01:38
tr4656 left01:38
wo0kie left01:38
surfdue left01:38
chuckf left01:38
twem2 left01:38
Rhonda left01:38
mlb- left01:38
pigeon left01:38
qwertz_ left01:38
MiKom left01:38
eto left01:38
tallest_red left01:38
Paparaciz left01:38
iAsterisk left01:38
wwalker left01:38
juha_ left01:38
zaiste left01:38
qknight left01:38
mariusso left01:38
Derega left01:38
cinderblock left01:38
Droggl left01:38
neurodamage left01:38
zenazn left01:38
ryanneufeld left01:38
xrogaan left01:38
aguynamedben left01:38
shibayu36 left01:38
PaulePanter left01:38
leptonix left01:38
roger_raymond left01:38
lqi left01:38
maqr left01:38
alunduil left01:38
WillMarshall left01:38
Davey left01:38
Samual left01:38
alexim left01:38
PaulCapestany left01:38
newbie999 left01:38
myx left01:38
pdtpatrick left01:38
john_anderson left01:38
wanders_ left01:38
jcarouth left01:38
nick_h left01:38
Dreamer3 left01:38
jweinberg left01:38
totte left01:38
Darkclown left01:38
Milossh left01:38
tmcmahon left01:38
SJr left01:38
resmo left01:38
apok left01:38
mneorr left01:38
relipse left01:38
bartman left01:38
miphe left01:38
stfn left01:38
flippo left01:38
edoceo_ left01:38
spottedkangaroo left01:38
Pieter_ left01:38
RichardBronosky_ left01:38
pavelz_ left01:38
michel_v_ left01:38
letharion_ left01:38
tonyj left01:38
LittleFool left01:38
rawtaz left01:38
WhereIsMySpoon left01:38
Anubisss left01:38
kanru left01:38
ianmcorvidae left01:38
Olipro left01:38
albel727 left01:38
dcelix left01:38
gcmalloc left01:38
rue left01:38
xxthink left01:38
aruiz left01:38
prsn left01:38
krosenvold left01:38
kimico left01:38
drue left01:38
scot_ left01:38
selckin left01:38
dpwright left01:38
whitman left01:38
odin_ left01:38
Jasper left01:38
mtk left01:38
dougsland left01:38
acrocity left01:38
Steve left01:38
damjan left01:38
niluje left01:38
JPT left01:38
_ikke_ left01:38
tmz left01:38
thomas_b left01:38
mjessome left01:38
neersighted left01:38
jgoss left01:38
jdav_gone left01:38
HeN left01:38
tfnico_ left01:38
DancingBear left01:38
beasty_ left01:38
weltall left01:38
aep left01:38
dsantiago left01:38
russ__ left01:38
agile left01:38
TheMoonMaster left01:38
Arokh left01:38
Argafal left01:38
artgoeshere left01:38
hvgotcodes left01:38
Soliton left01:38
thiderman left01:38
candybar left01:38
_|Nix|_ left01:38
tsally left01:38
milki left01:38
krishna left01:38
benth left01:39
cybersphinx left01:39
trungqtran left01:39
Error404NotFound left01:39
ziro` left01:39
Adys left01:39
drizzd_ left01:39
crash\ left01:39
Gitzilla left01:39
Internet13 left01:39
hakunin_ left01:39
kevinfagan left01:39
charon left01:39
timj left01:39
boichev__ left01:39
marc_kdab_ left01:39
an0maly_ left01:39
batrick left01:39
majoh left01:39
blueyed left01:39
nelk_ left01:39
kloeri left01:39
tchan left01:39
knittl left01:39
phryk left01:39
jefferai left01:39
EgS left01:39
Syniq left01:39
rideh left01:39
luc_ left01:39
ncd|leeN left01:39
Cassiel left01:39
alfplayer left01:39
khmarbaise left01:39
Orbitrix left01:39
Plouj left01:39
RobertLaptop left01:39
asaf left01:39
andygrossman left01:39
scruple left01:39
The-Compiler left01:39
SamB_ left01:39
thorie left01:39
ivan\ left01:39
Tobarja left01:39
SeySayux left01:39
cespare left01:39
poohtarou left01:39
Caelum left01:39
grummund left01:39
cods left01:39
aliljet left01:39
Vert left01:39
geonetix left01:39
j416 left01:39
jcao219 left01:39
macabre left01:39
tureba left01:39
OOPMan left01:39
cmn left01:39
gusnan left01:39
madewokherd left01:39
Haikarainen left01:39
kallisti5 left01:39
glennpratt left01:39
codertux left01:39
redrocket left01:39
intripoon_ left01:39
m1sc_ left01:39
Fall left01:39
ammar_ left01:39
tystr left01:39
nowhereman_ left01:39
dzonder left01:39
sharpobject left01:39
shennyg left01:39
skul left01:39
CoffaBun33h left01:39
circle left01:39
j0ran left01:39
mikaelj_ left01:39
w0m left01:39
arosen left01:39
legnaleurc left01:39
adhawkins-away left01:39
Araxia left01:39
nevyn left01:39
oso96_2000 left01:39
tizzo-afk left01:39
rje left01:39
rrxtns left01:39
digitalfiz left01:39
jmcantrell left01:39
aboudreault left01:39
yewton left01:39
tomek left01:39
Pagan|Work left01:39
kart0ffelsack left01:39
axrfnu left01:39
fpaut left01:39
ryao left01:39
rocsteady left01:39
RichiH left01:39
setmeaway2 left01:39
paradigm left01:39
x82_nicole left01:39
willob left01:39
brandonw left01:39
orospakr left01:39
Aaeriele left01:39
jbub left01:39
ciaranm left01:39
antix_ left01:39
catsup left01:39
sqz left01:39
talexb left01:39
bassliner left01:39
comps left01:39
mage_ left01:39
Praise left01:39
imMute left01:39
unnamedwill left01:39
eightyeight left01:39
pasky left01:39
new299 left01:39
tango_ left01:39
infogulch left01:39
DrPoole_ left01:39
estan left01:39
Akufen left01:39
Rix left01:39
jstemmer left01:39
dijonyummy left01:39
yann|work left01:39
nanun left01:39
steevel left01:39
martinjlowm left01:39
codon left01:39
c45y_ left01:39
plasticboy left01:39
Dereckson left01:39
csgeek left01:39
reactormonk left01:39
serj left01:39
Guest30417 left01:39
huoxito left01:39
ScottE left01:39
andres left01:39
srcerer left01:39
cthuluh left01:39
TomWij left01:39
bronsen left01:39
vsayer left01:39
speakman left01:39
d1b left01:39
babl_wrk left01:39
wereHamster left01:39
jMCg left01:39
Snicers-Work left01:39
elliottcable left01:39
coasterz left01:39
prismatictrail left01:39
variousnefarious left01:39
rgr left01:39
roto left01:39
torjus- left01:39
Slush- left01:39
duncanm left01:39
Leeol left01:39
Weiss left01:39
faen left01:39
Villadelfia left01:39
Kicer86 left01:39
SeoZ-work[AWAY] left01:39
bapa left01:39
oojacoboo left01:39
MrNibbles left01:39
imarcusthis left01:39
felher left01:39
jave left01:39
xnox left01:39
sallesao left01:39
p3rror left01:39
dwmw2_gone left01:39
philips_ left01:39
carbohydrate left01:39
Ziber left01:39
GameGamer43 left01:39
jaequery_ left01:39
tubbo left01:39
jspiros left01:39
milli left01:39
lamont left01:39
adamm left01:39
woky left01:39
Gentlecat joined01:42
cmn joined02:02
robbyoconnor joined02:02
paddy joined02:02
tmcmahon joined02:02
wcarss joined02:02
tabakhase joined02:02
RichiH joined02:02
Zeelot joined02:02
SirFunk joined02:02
murr4y joined02:02
Juri_Agarin joined02:02
sdboyer joined02:02
jnl joined02:02
mancha joined02:02
metze joined02:02
Caius joined02:02
tgummerer joined02:02
VeggieMeat joined02:02
malesca joined02:02
zibri joined02:02
ajpiano joined02:02
Nevik joined02:02
spacepluk joined02:02
takus joined02:02
styx_ joined02:02
eregon joined02:02
matthewpucc_ joined02:02
tokkee joined02:02
abackstrom joined02:02
jrockway joined02:02
fionnan joined02:02
ryland joined02:02
KBme joined02:02
hexa2k9 joined02:02
lyddonb joined02:02
milian joined02:02
Mez joined02:02
__name__ joined02:02
Bigcheese joined02:02
un1matr1x joined02:02
Cerise joined02:02
IcePic joined02:02
avalarion joined02:02
lb joined02:02
squentin joined02:02
maxb joined02:02
Chipzz joined02:02
hubbard.freenode.net set mode: +v02:02
js_ joined02:02
eam joined02:02
AlexanderS joined02:02
nuba joined02:02
felipe joined02:02
lucs joined02:02
ice799 joined02:02
mzarella joined02:02
vyvup joined02:02
Bilge joined02:02
Martz joined02:02
kwork joined02:02
hhuuggoo joined02:02
akheron joined02:02
Will| joined02:02
rphillips joined02:02
Uriziel joined02:02
SaCu joined02:02
alegen joined02:02
else- joined02:02
chadi joined02:02
zmo joined02:02
Meliorate joined02:02
cschneid joined02:02
worch joined02:02
spb joined02:02
hexmanshu joined02:02
sente` joined02:02
tomaw joined02:02
tg joined02:02
rabbit7_ joined02:02
kortti_ joined02:02
batmania_ joined02:02
GyrosGeier joined02:02
christophler joined02:02
kryl99 joined02:02
danmackay joined02:02
Ratler joined02:02
joschi joined02:02
sobral joined02:02
Sargun joined02:02
maxorator joined02:02
SebastianFlyte joined02:02
xonix joined02:02
mattp joined02:02
EvanDotPro joined02:02
minerale joined02:02
hubbard.freenode.net set mode: +v02:02
strictlyb joined02:02
__main__ joined02:02
Ferris joined02:02
Rydekull joined02:02
xcat joined02:02
Launch_Director joined02:02
__class__ joined02:02
mechanyancat joined02:02
niax joined02:02
raek joined02:02
djh joined02:02
EToS joined02:02
CareBear\ joined02:02
Drakevr joined02:02
variousnefarious joined02:02
nevyn joined02:02
xnox joined02:02
dpwright joined02:02
Araxia joined02:02
colona joined02:02
dsop joined02:02
sneakret joined02:02
Ingmar joined02:02
rpetre joined02:02
mmattice joined02:02
tolland joined02:02
rrs joined02:02
shihan joined02:02
ketas joined02:02
jakob joined02:02
iKriz joined02:02
carc joined02:02
Spaceghostc2c joined02:02
schlumpi joined02:02
Hamled joined02:02
qlkzy joined02:02
so joined02:02
MacGyver joined02:02
Droolio joined02:02
CoJaBo joined02:02
offby1 joined02:02
dharrigan joined02:02
ijuma joined02:02
TML joined02:02
chrisward joined02:02
jonn joined02:02
Nikoli joined02:02
hubbard.freenode.net set mode: +v02:02
GodEater joined02:02
skoop joined02:02
JPohlmann joined02:02
cmyers joined02:02
shadewind joined02:02
Derander joined02:02
segher joined02:02
avar joined02:02
koki joined02:02
selckin joined02:02
krishna joined02:02
rocsteady joined02:02
adhawkins-away joined02:02
EgS joined02:02
axrfnu joined02:02
milki joined02:02
Khisanth joined02:02
wwalker joined02:02
tr4656 joined02:02
wo0kie joined02:02
surfdue joined02:02
chuckf joined02:02
twem2 joined02:02
Rhonda joined02:02
ryanneufeld joined02:02
mlb- joined02:02
pigeon joined02:02
qwertz_ joined02:02
MiKom joined02:02
eto joined02:02
tallest_red joined02:02
Paparaciz joined02:02
iAsterisk joined02:02
juha_ joined02:02
zaiste joined02:02
mariusso joined02:02
Derega joined02:02
cinderblock joined02:02
Droggl joined02:02
neurodamage joined02:02
zenazn joined02:02
xrogaan joined02:02
aguynamedben joined02:02
shibayu36 joined02:02
PaulePanter joined02:02
leptonix joined02:02
roger_raymond joined02:02
lqi joined02:02
Akufen joined02:02
scot_ joined02:02
SuperKing joined02:02
kart0ffelsack joined02:02
hays joined02:02
estan joined02:02
DrPoole_ joined02:02
tsally joined02:02
ryao joined02:02
legnaleurc joined02:02
jave joined02:02
felher joined02:02
imarcusthis joined02:02
arosen joined02:02
mattp_ joined02:02
infogulch joined02:02
candybar joined02:02
thiderman joined02:02
Soliton joined02:02
kimico joined02:02
krosenvold joined02:02
w0m joined02:02
MrNibbles joined02:02
woky joined02:02
oojacoboo joined02:02
artgoeshere joined02:02
tango_ joined02:02
adamm joined02:02
girishnair joined02:02
Argafal joined02:02
qknight joined02:02
Arokh joined02:02
new299 joined02:02
mikaelj_ joined02:02
pasky joined02:02
Caelum joined02:02
aruiz joined02:02
haarg joined02:02
tomek joined02:02
Pagan|Work joined02:02
eightyeight joined02:02
lamont joined02:02
unnamedwill joined02:02
yewton joined02:02
TheMoonMaster joined02:02
imMute joined02:02
agile joined02:02
poohtarou joined02:02
cespare joined02:02
j0ran joined02:02
russ__ joined02:02
cehteh joined02:02
xxthink joined02:02
dsantiago joined02:02
Zyrkon joined02:02
_|Nix|_ joined02:02
rvsjoen joined02:02
Remram joined02:02
cods joined02:02
milli joined02:02
ldlework joined02:02
rue joined02:02
doki_pen joined02:02
siprbaum joined02:02
aboudreault joined02:02
Praise joined02:02
bapa joined02:02
jspiros joined02:02
benth joined02:02
gcmalloc joined02:02
dcelix joined02:02
sjefen6 joined02:02
jefferai joined02:02
lavaman joined02:02
weltall joined02:02
comps joined02:02
albel727 joined02:02
SeoZ-work[AWAY] joined02:02
Kicer86 joined02:02
[mbm] joined02:02
Villadelfia joined02:02
SeySayux joined02:02
bassliner joined02:02
yesi joined02:02
circle joined02:02
Chilley joined02:02
deryni joined02:02
chris2 joined02:02
mage_ joined02:02
pom joined02:02
beasty_ joined02:02
DancingBear joined02:02
talexb joined02:02
tapout joined02:02
BinGOs joined02:02
dr_lepper joined02:02
Fuxx joined02:02
AlexC_ joined02:02
EdwardIII joined02:02
majuscule joined02:02
Fissure joined02:02
jonmasters joined02:02
JrCs joined02:02
ndim joined02:02
blathijs joined02:02
frew joined02:02
orisinal_ joined02:02
diget joined02:02
gniourf_gniourf joined02:02
txwikinger joined02:02
deavid joined02:02
pureluck joined02:02
LotR joined02:02
Fiouz joined02:02
Orphis joined02:02
bjornars joined02:02
ipi joined02:02
Tobarja joined02:02
Olipro joined02:02
marienz joined02:02
jmcantrell joined02:02
MetaCosm joined02:02
digitalfiz joined02:02
tfnico_ joined02:02
jab416171|Cloud joined02:02
garann joined02:02
rrxtns joined02:02
garrys_game__ joined02:02
xerxas joined02:02
NimeshNeema joined02:02
tubbo joined02:02
GameGamer43 joined02:02
jaequery_ joined02:02
faen joined02:02
bremner joined02:02
cbreak joined02:02
Weiss joined02:02
jdav_gone joined02:02
ivan\ joined02:02
jgoss joined02:02
Leeol joined02:02
myndzi joined02:02
Ziber joined02:02
neersighted joined02:02
mjessome joined02:02
sqz joined02:02
Natureshadow joined02:02
thorie joined02:02
thomas_b joined02:02
Aprogas joined02:02
rje joined02:02
ianmcorvidae joined02:02
duncanm joined02:02
tmz joined02:02
_ikke_ joined02:02
skul joined02:02
CoffaBun33h joined02:02
kanru joined02:02
Maxdamantus joined02:02
Slush- joined02:02
JPT joined02:02
torjus- joined02:02
niluje joined02:02
roto joined02:02
ruskie joined02:02
aep joined02:02
Steve joined02:02
milleja46 joined02:02
Anubisss joined02:02
palyboy joined02:02
tizzo-afk joined02:02
acrocity joined02:02
electrogeek joined02:02
WhereIsMySpoon joined02:02
dougsland joined02:02
mtk joined02:02
nigelb joined02:02
drue joined02:02
prismatictrail joined02:02
sweet_kid joined02:02
realmatt joined02:02
Putr joined02:02
catsup joined02:02
coasterz joined02:02
elliottcable joined02:02
metcalfc joined02:02
wereHamster joined02:02
hubbard.freenode.net set mode: +vv02:02
babl_wrk joined02:02
Snicers-Work joined02:02
aliljet joined02:02
petteyg joined02:02
jaeckel_ joined02:02
brabo joined02:02
antix_ joined02:02
blami joined02:02
d1b joined02:02
speakman joined02:02
rawtaz joined02:02
Darkclown joined02:02
oso96_2000 joined02:02
WakiMiko joined02:02
shennyg joined02:02
Bombe joined02:02
Guest joined02:02
carbohydrate joined02:02
Jasper joined02:02
ciaranm joined02:02
odin_ joined02:02
captbaritone joined02:02
Sir_Ragnarok joined02:02
vsayer joined02:02
SamB_ joined02:02
bronsen joined02:02
sharpobject joined02:02
pilif joined02:02
fpaut joined02:02
HeN joined02:02
TomWij joined02:02
ohcibi joined02:02
grummund joined02:02
totte joined02:02
jweinberg joined02:02
phryk joined02:02
philips_ joined02:02
cwillu_at_work joined02:02
LittleFool joined02:02
dzonder joined02:02
Dreamer3 joined02:02
Nickeeh joined02:02
tm512 joined02:02
nick_h joined02:02
nowhereman_ joined02:02
tonyj joined02:02
gitinfo joined02:02
hubbard.freenode.net set mode: +o02:02
jbub joined02:02
vu_ joined02:02
hvgotcodes joined02:02
letharion_ joined02:02
cthuluh joined02:02
srcerer joined02:02
andres joined02:02
michel_v_ joined02:02
pavelz_ joined02:02
knittl joined02:02
ScottE joined02:02
RichardBronosky_ joined02:02
huoxito joined02:02
serj joined02:02
ammar_ joined02:02
tchan joined02:02
csgeek joined02:02
kloeri joined02:02
dzan_ joined02:02
nelk_ joined02:02
blueyed joined02:02
majoh joined02:02
Pieter_ joined02:02
e-ndy joined02:02
reactormonk joined02:02
spottedkangaroo joined02:02
kiffer84_ joined02:02
plasticboy joined02:02
c45y_ joined02:02
edoceo_ joined02:02
codon joined02:02
m1sc_ joined02:02
Aaeriele joined02:02
wanders_ joined02:02
BooK_ joined02:02
atrigent joined02:02
martinjlowm joined02:02
steevel joined02:02
coopsh joined02:02
Guest30417 joined02:02
nanun joined02:02
flippo joined02:02
yann|work joined02:02
PacketCollision joined02:02
Guest65145 joined02:02
dijonyummy joined02:02
Bucciarati joined02:02
jstemmer joined02:02
orospakr joined02:02
batrick joined02:02
an0maly_ joined02:02
Fall joined02:02
cenuij joined02:02
brandonw joined02:02
john_anderson joined02:02
heroux joined02:02
dwmw2_gone joined02:02
Vampire0_ joined02:02
intripoon_ joined02:02
toothr joined02:02
Mogget joined02:02
Blaster joined02:02
marc_kdab_ joined02:02
redrocket joined02:02
codertux joined02:02
glennpratt joined02:02
pdtpatrick joined02:02
boichev_ joined02:02
boichev__ joined02:02
The-Compiler joined02:02
whitman joined02:02
Dereckson joined02:02
scruple joined02:02
timj joined02:02
charon joined02:02
sanderj_ joined02:02
myx joined02:02
kevinfagan joined02:02
Rix joined02:02
Syniq joined02:02
hakunin_ joined02:02
kallisti5 joined02:02
Internet13 joined02:02
newbie999 joined02:02
stfn joined02:02
Gitzilla joined02:02
crash\ joined02:02
miphe joined02:02
drizzd_ joined02:02
Adys joined02:02
G0re joined02:02
ziro` joined02:02
damjan joined02:02
Felden joined02:02
hubbard.freenode.net set mode: +v02:02
willob joined02:02
Error404NotFound joined02:02
trungqtran joined02:02
cybersphinx joined02:02
flavius joined02:02
madewokherd joined02:02
o] joined02:02
cmcculloh joined02:02
bartman joined02:02
jMCg joined02:02
prsn joined02:02
x82_nicole joined02:02
jcarouth joined02:02
PaulCapestany joined02:02
rgr joined02:02
andygrossman joined02:02
r126t joined02:02
p3rror joined02:02
relipse joined02:02
asaf joined02:02
RobertLaptop joined02:02
Plouj joined02:02
gusnan joined02:02
alexim joined02:02
tystr joined02:02
Orbitrix joined02:02
Xethron joined02:02
skywalkerhere joined02:02
jimmyeatworld joined02:02
Samual joined02:02
mneorr joined02:02
Bass10 joined02:02
khmarbaise joined02:02
apok joined02:02
esc joined02:02
FrozenFire joined02:02
paradigm joined02:02
JonasF joined02:02
nutron joined02:02
OOPMan joined02:02
scorphus joined02:02
resmo joined02:02
Davey joined02:02
tureba joined02:02
jday_ joined02:02
SJr joined02:02
MacWinner joined02:02
sallesao joined02:02
rondale_sc joined02:02
alfplayer joined02:02
WinstonSmith joined02:02
setmeaway2 joined02:02
s0ber joined02:02
phschwartz joined02:02
macabre joined02:02
allquixotic joined02:02
Cassiel joined02:02
alunduil joined02:02
ncd|leeN joined02:02
jcao219 joined02:02
maqr joined02:02
j416 joined02:02
luc_ joined02:02
thiago joined02:02
geonetix joined02:02
NiteRain joined02:02
krum joined02:02
rideh joined02:02
Milossh joined02:02
Vert joined02:02
peper joined02:02
Yuuhi` joined02:02
Ziioynx joined02:02
bubbles10101 joined02:02
revyd joined02:02
fuzzybunny69y joined02:02
kermit joined02:02
maestrojed joined02:02
Targen joined02:02
CausaMortis joined02:02
gumnos joined02:02
parcs joined02:02
tplaner joined02:02
diegoviola joined02:02
Liir joined02:02
esto joined02:02
Synthead joined02:02
ag4ve joined02:02
ESphynx joined02:02
hesco joined02:02
zorzar joined02:02
Nugget joined02:02
quadz joined02:02
jokajak joined02:02
hubbard.freenode.net set mode: +v02:02
Merwin joined02:02
ivan joined02:02
Emmycakes joined02:02
marinade joined02:02
hari__ joined02:02
hubbard.freenode.net set mode: +v02:02
braddcadd joined02:02
revyd left02:02
isomorphic joined02:02
Esa_ joined02:02
dinesh___ joined02:02
Glados_ joined02:02
dropdrive joined02:02
Goplat joined02:02
jjasinski joined02:02
sh4rm4 joined02:02
ejnahc joined02:02
lonewulf` joined02:02
jayne joined02:02
newz2000 joined02:02
jwmann joined02:02
cyphase joined02:02
jaimef joined02:02
PerlJam joined02:02
wolog joined02:02
prettyrobots joined02:02
Tommy[D] joined02:02
xxtjaxx_ joined02:02
asakura joined02:02
FabTG joined02:02
hakril joined02:02
_W_ joined02:02
lu_zero joined02:02
skorgon joined02:02
oogatta joined02:02
jpalmer joined02:02
john3 joined02:02
mutex joined02:02
bluj joined02:02
camurgo joined02:02
SJS joined02:02
errr joined02:02
teukka joined02:02
ToBeFree joined02:02
webben joined02:02
jason237 joined02:02
SecretAgent joined02:02
BBonifield joined02:02
joeytwiddle joined02:02
moondoggy joined02:02
oconnore joined02:02
Tritania joined02:02
sluggr joined02:02
fuho joined02:02
tazle__ joined02:02
hubbard.freenode.net set mode: +v02:02
Kronuz joined02:02
Mpenzi joined02:02
sitaram joined02:02
legumbre joined02:02
bigmeow joined02:02
lahwran joined02:02
abec0 joined02:02
avium joined02:02
FrozenFire left02:02
j416 left02:02
ivan left02:02
marinade left02:02
Liir left02:02
phschwartz left02:02
s0ber left02:02
rondale_sc left02:02
nutron left02:02
jimmyeatworld left02:02
cmcculloh left02:02
flavius left02:02
G0re left02:02
sanderj_ left02:02
Vampire0_ left02:02
cenuij left02:02
PacketCollision left02:02
Guest65145 left02:02
Blaster left02:02
krum left02:02
NiteRain left02:02
MacWinner left02:02
JonasF left02:02
Bass10 left02:02
r126t left02:02
Bucciarati left02:02
coopsh left02:02
atrigent left02:02
BooK_ left02:02
kiffer84_ left02:02
e-ndy left02:02
dzan_ left02:02
vu_ left02:02
gitinfo left02:02
Nickeeh left02:02
pilif left02:02
Guest left02:02
Bombe left02:02
WakiMiko left02:02
jaeckel_ left02:02
petteyg left02:02
ohcibi left02:02
realmatt left02:02
Putr left02:02
electrogeek left02:02
Maxdamantus left02:02
Aprogas left02:02
Natureshadow left02:02
garann left02:02
NimeshNeema left02:02
BinGOs left02:02
Felden left02:02
sweet_kid left02:02
dr_lepper left02:02
Fuxx left02:03
myndzi left02:03
Fissure left02:03
jonmasters left02:03
JrCs left02:03
ndim left02:03
blathijs left02:03
frew left02:03
orisinal_ left02:03
diget left02:03
majuscule left02:03
gniourf_gniourf left02:03
txwikinger left02:03
AlexC_ left02:03
deavid left02:03
pureluck left02:03
EdwardIII left02:03
LotR left02:03
Fiouz left02:03
Orphis left02:03
bjornars left02:03
ipi left02:03
braddcadd left02:03
thiago left02:03
allquixotic left02:03
WinstonSmith left02:03
jday_ left02:03
scorphus left02:03
esc left02:03
skywalkerhere left02:03
Xethron left02:03
o] left02:03
boichev_ left02:03
Mogget left02:03
toothr left02:03
heroux left02:03
tm512 left02:03
cwillu_at_work left02:03
Sir_Ragnarok left02:03
captbaritone left02:03
blami left02:03
brabo left02:03
metcalfc left02:03
nigelb left02:03
palyboy left02:03
milleja46 left02:03
ruskie left02:03
cbreak left02:03
bremner left02:03
xerxas left02:03
garrys_game__ left02:03
jab416171|Cloud left02:03
MetaCosm left02:03
tapout left02:03
[mbm] left02:03
sjefen6 left02:03
yesi left02:03
doki_pen left02:03
rvsjoen left02:03
cehteh left02:03
marienz left02:03
pom left02:03
chris2 left02:03
lavaman left02:03
siprbaum left02:03
ldlework left02:03
Remram left02:03
Zyrkon left02:03
haarg left02:03
girishnair left02:03
deryni left02:03
mattp_ left02:03
Chilley left02:03
hays left02:03
SuperKing left02:03
Khisanth left02:03
tr4656 left02:03
wo0kie left02:03
surfdue left02:03
chuckf left02:03
twem2 left02:03
Rhonda left02:03
mlb- left02:03
pigeon left02:03
qwertz_ left02:03
MiKom left02:03
eto left02:03
tallest_red left02:03
Paparaciz left02:03
iAsterisk left02:03
wwalker left02:03
juha_ left02:03
zaiste left02:03
qknight left02:03
mariusso left02:03
Derega left02:03
cinderblock left02:03
Droggl left02:03
neurodamage left02:03
zenazn left02:03
ryanneufeld left02:03
xrogaan left02:03
aguynamedben left02:03
shibayu36 left02:03
PaulePanter left02:03
leptonix left02:03
roger_raymond left02:03
lqi left02:03
robbyoconnor left02:03
peper left02:03
maqr left02:03
alunduil left02:03
Davey left02:03
Samual left02:03
alexim left02:03
PaulCapestany left02:03
newbie999 left02:03
myx left02:03
pdtpatrick left02:03
john_anderson left02:03
wanders_ left02:03
jcarouth left02:03
nick_h left02:03
Dreamer3 left02:03
jweinberg left02:03
totte left02:03
Darkclown left02:03
so left02:03
iKriz left02:03
tmcmahon left02:03
paddy left02:03
Milossh left02:03
SJr left02:03
resmo left02:03
apok left02:03
mneorr left02:03
relipse left02:03
bartman left02:03
miphe left02:03
stfn left02:03
flippo left02:03
edoceo_ left02:03
spottedkangaroo left02:03
Pieter_ left02:03
RichardBronosky_ left02:03
pavelz_ left02:03
michel_v_ left02:03
letharion_ left02:03
tonyj left02:03
LittleFool left02:03
rawtaz left02:03
WhereIsMySpoon left02:03
Anubisss left02:03
kanru left02:03
ianmcorvidae left02:03
Olipro left02:03
albel727 left02:03
dcelix left02:03
gcmalloc left02:03
rue left02:03
xxthink left02:03
aruiz left02:03
prsn left02:03
krosenvold left02:03
kimico left02:03
drue left02:03
scot_ left02:03
selckin left02:03
koki left02:03
avar left02:03
TML left02:03
jakob left02:03
rrs left02:03
tolland left02:03
rpetre left02:03
sneakret left02:03
dpwright left02:03
Drakevr left02:03
mechanyancat left02:03
Ferris left02:03
Sargun left02:03
kryl99 left02:03
tg left02:03
whitman left02:03
odin_ left02:03
Jasper left02:03
mtk left02:03
dougsland left02:03
acrocity left02:03
Steve left02:03
damjan left02:03
niluje left02:03
JPT left02:03
_ikke_ left02:03
tmz left02:03
thomas_b left02:03
mjessome left02:03
neersighted left02:03
jgoss left02:03
jdav_gone left02:03
HeN left02:03
tfnico_ left02:03
DancingBear left02:03
beasty_ left02:03
weltall left02:03
aep left02:03
dsantiago left02:03
russ__ left02:03
agile left02:03
TheMoonMaster left02:03
Arokh left02:03
Argafal left02:03
artgoeshere left02:03
hvgotcodes left02:03
Soliton left02:03
thiderman left02:03
candybar left02:03
_|Nix|_ left02:03
tsally left02:03
milki left02:03
krishna left02:03
shadewind left02:03
benth left02:03
ijuma left02:03
offby1 left02:03
Spaceghostc2c left02:03
ketas left02:03
xonix left02:03
batmania_ left02:03
mattp left02:03
hexmanshu left02:03
worch left02:03
mzarella left02:03
squentin left02:03
maxb left02:03
Chipzz left02:03
js_ left02:03
eam left02:03
cybersphinx left02:03
trungqtran left02:03
Error404NotFound left02:03
ziro` left02:03
Adys left02:03
drizzd_ left02:03
crash\ left02:03
Gitzilla left02:03
Internet13 left02:03
hakunin_ left02:03
kevinfagan left02:03
charon left02:03
timj left02:03
boichev__ left02:03
marc_kdab_ left02:03
an0maly_ left02:03
batrick left02:03
majoh left02:03
blueyed left02:03
nelk_ left02:03
kloeri left02:03
tchan left02:03
knittl left02:03
phryk left02:03
jefferai left02:03
EgS left02:03
schlumpi left02:03
xcat left02:03
Syniq left02:03
kortti_ left02:03
tomaw left02:03
Meliorate left02:03
SaCu left02:03
Bilge left02:03
vyvup left02:03
felipe left02:03
AlexanderS left02:03
un1matr1x left02:03
milian left02:03
eregon left02:03
Nevik left02:03
cmn left02:03
rideh left02:03
luc_ left02:03
ncd|leeN left02:03
Cassiel left02:03
alfplayer left02:03
khmarbaise left02:03
Orbitrix left02:03
Plouj left02:03
RobertLaptop left02:03
asaf left02:03
andygrossman left02:03
scruple left02:03
The-Compiler left02:03
SamB_ left02:03
thorie left02:03
ivan\ left02:03
Tobarja left02:03
SeySayux left02:03
cespare left02:03
poohtarou left02:03
Caelum left02:03
grummund left02:03
JPohlmann left02:03
cods left02:03
__class__ left02:03
sobral left02:03
aliljet left02:03
rphillips left02:03
matthewpucc_ left02:03
Vert left02:03
geonetix left02:03
jcao219 left02:03
macabre left02:03
tureba left02:03
OOPMan left02:03
gusnan left02:03
madewokherd left02:03
kallisti5 left02:03
glennpratt left02:03
codertux left02:03
redrocket left02:03
intripoon_ left02:03
m1sc_ left02:03
Fall left02:03
ammar_ left02:03
tystr left02:03
nowhereman_ left02:03
dzonder left02:03
sharpobject left02:03
shennyg left02:03
skul left02:03
CoffaBun33h left02:03
circle left02:03
j0ran left02:03
mikaelj_ left02:03
w0m left02:03
arosen left02:03
legnaleurc left02:03
adhawkins-away left02:03
skoop left02:03
jonn left02:03
CoJaBo left02:03
Araxia left02:03
djh left02:03
niax left02:03
Rydekull left02:03
__main__ left02:03
nevyn left02:03
minerale left02:03
SebastianFlyte left02:03
maxorator left02:03
oso96_2000 left02:03
tizzo-afk left02:03
rje left02:03
rrxtns left02:03
digitalfiz left02:03
jmcantrell left02:03
aboudreault left02:03
yewton left02:03
tomek left02:03
Pagan|Work left02:03
kart0ffelsack left02:03
axrfnu left02:03
GodEater left02:03
chrisward left02:03
MacGyver left02:03
qlkzy left02:03
carc left02:03
shihan left02:03
dsop left02:03
CareBear\ left02:03
strictlyb left02:03
fpaut left02:03
Ratler left02:03
danmackay left02:03
ryao left02:03
cschneid left02:03
chadi left02:03
alegen left02:03
akheron left02:03
hhuuggoo left02:03
IcePic left02:03
rocsteady left02:03
abackstrom left02:03
spacepluk left02:03
malesca left02:03
takus left02:03
SirFunk left02:03
RichiH left02:03
tabakhase left02:03
setmeaway2 left02:03
paradigm left02:03
x82_nicole left02:03
willob left02:03
brandonw left02:03
orospakr left02:03
Aaeriele left02:03
jbub left02:03
ciaranm left02:03
antix_ left02:03
catsup left02:03
sqz left02:03
talexb left02:03
bassliner left02:03
comps left02:03
mage_ left02:03
Praise left02:03
imMute left02:03
unnamedwill left02:03
eightyeight left02:03
pasky left02:03
new299 left02:03
tango_ left02:03
infogulch left02:03
DrPoole_ left02:03
estan left02:03
Akufen left02:03
Derander left02:03
Nikoli left02:03
dharrigan left02:03
EvanDotPro left02:03
rabbit7_ left02:03
else- left02:03
tokkee left02:03
Rix left02:03
jstemmer left02:03
dijonyummy left02:03
yann|work left02:03
nanun left02:03
steevel left02:03
martinjlowm left02:03
codon left02:03
c45y_ left02:03
plasticboy left02:03
Dereckson left02:03
csgeek left02:03
reactormonk left02:03
serj left02:03
Guest30417 left02:03
huoxito left02:03
ScottE left02:03
andres left02:03
srcerer left02:03
cthuluh left02:03
TomWij left02:03
bronsen left02:03
vsayer left02:03
speakman left02:03
d1b left02:03
babl_wrk left02:03
wereHamster left02:03
jMCg left02:03
Snicers-Work left02:03
elliottcable left02:03
coasterz left02:03
prismatictrail left02:03
Droolio left02:03
Hamled left02:03
mmattice left02:03
colona left02:03
variousnefarious left02:03
raek left02:03
Launch_Director left02:03
zmo left02:03
Uriziel left02:03
avalarion left02:03
ajpiano left02:03
fionnan left02:03
ryland left02:03
sdboyer left02:03
murr4y left02:03
spb left02:03
Zeelot left02:03
ice799 left02:03
rgr left02:03
roto left02:03
torjus- left02:03
Slush- left02:03
duncanm left02:03
Leeol left02:03
Weiss left02:03
faen left02:03
Villadelfia left02:03
Kicer86 left02:03
SeoZ-work[AWAY] left02:03
bapa left02:03
oojacoboo left02:03
MrNibbles left02:03
imarcusthis left02:03
felher left02:03
jave left02:03
segher left02:03
cmyers left02:03
EToS left02:03
christophler left02:03
sente` left02:03
xnox left02:03
kwork left02:03
Martz left02:03
lb left02:03
__name__ left02:03
styx_ left02:03
lucs left02:03
tgummerer left02:03
Caius left02:03
mancha left02:03
sallesao left02:03
p3rror left02:03
dwmw2_gone left02:03
philips_ left02:03
carbohydrate left02:03
Ziber left02:03
GameGamer43 left02:03
jaequery_ left02:03
tubbo left02:03
jspiros left02:03
milli left02:03
lamont left02:03
adamm left02:03
woky left02:03
Ingmar left02:03
joschi left02:03
Will| left02:03
GyrosGeier left02:03
Cerise left02:03
Bigcheese left02:03
Mez left02:03
lyddonb left02:03
hexa2k9 left02:03
KBme left02:03
jrockway left02:03
zibri left02:03
VeggieMeat left02:03
metze left02:03
Juri_Agarin left02:03
nuba left02:03
wcarss left02:03
jnl left02:03
dpac|away joined02:03
leprechau joined02:03
offbyone joined02:03
gurps_ joined02:03
RandalSchwartz joined02:03
tom39291 joined02:03
troyt joined02:03
up_the_irons joined02:03
justinfung joined02:03
kennethreitz joined02:03
tansell joined02:03
guide joined02:03
SegFaultAX joined02:03
kini joined02:03
alta joined02:03
ska-fan joined02:03
heoa joined02:03
tm1000 joined02:03
roflin joined02:03
jhford joined02:03
RichardJ joined02:03
asedeno_work joined02:03
jlewis joined02:03
sajbar joined02:03
aaronky joined02:03
hubbard.freenode.net set mode: +v02:03
todd_dsm joined02:03
kpreid joined02:03
flaguy48 joined02:03
SicoWork joined02:03
jargon joined02:03
whomp joined02:03
Twey joined02:03
nlogn joined02:03
hide_ joined02:03
wagle joined02:03
MAAC06G joined02:03
babilen joined02:03
bwidmer joined02:03
sobel joined02:03
yibe_ joined02:03
heinrich5991 joined02:03
jeffery joined02:03
opus joined02:03
etcetera joined02:03
kent\n joined02:03
GuruShah joined02:03
cian1500ww joined02:03
unreal joined02:03
marcobax joined02:03
axisys joined02:03
saurik joined02:03
grn_ joined02:03
ivan` joined02:03
jds__ joined02:03
BeerSerc_ joined02:03
iXeno joined02:03
vmiklos joined02:03
no_maam joined02:03
meLon joined02:03
jerware joined02:03
Learath2 joined02:03
jds_ joined02:03
daniel_b joined02:03
DrNick joined02:03
alnr joined02:03
Tabmow joined02:03
shabble_ joined02:03
psilo_ joined02:03
cxreg joined02:03
Ishango joined02:03
jackyyll joined02:03
sirdancealot7 joined02:03
Fandekasp joined02:03
aisbaa joined02:03
jast joined02:03
rudi_s joined02:03
hyperboreean joined02:03
project2501b joined02:03
Gizmokid2005 joined02:03
bedouin joined02:03
reikalus1kka joined02:03
ping-pong joined02:03
p4tux joined02:03
Kuukunen joined02:03
idoru joined02:03
hubbard.freenode.net set mode: +vv02:03
kini left02:03
Ziioynx left02:03
apok joined02:03
ewong joined02:04
opus left02:04
tangler01 joined02:04
warthog9 joined02:04
CEnnis91_ joined02:04
beawesomeinstead joined02:04
arnihr joined02:04
ducch joined02:04
bacilla joined02:04
eddd joined02:04
sontek joined02:04
kenyon joined02:04
m4rcu5 joined02:04
OMGOMG joined02:04
Y_Ichiro joined02:04
hpa joined02:04
sjk joined02:04
davidh joined02:04
ben_alman joined02:04
VadtecWk joined02:04
tpope joined02:04
thoraxe joined02:04
kmussel_ joined02:04
jtm joined02:04
muep joined02:04
madduck joined02:04
Grum joined02:04
Stravy joined02:04
sakkemo joined02:04
DjMadness joined02:04
Odd_Bloke joined02:04
ahf joined02:04
brycec joined02:04
Cap_J_L_Picard joined02:04
hubbard.freenode.net set mode: +v02:04
jjasinski left02:04
tangler01 left02:04
warthog9 left02:04
CEnnis91_ left02:04
beawesomeinstead left02:04
arnihr left02:04
ducch left02:04
kenyon left02:04
Y_Ichiro left02:04
OMGOMG left02:04
bacilla left02:04
hpa left02:04
sjk left02:04
davidh left02:04
ben_alman left02:04
sontek left02:04
tpope left02:04
thoraxe left02:04
kmussel_ left02:04
jtm left02:04
muep left02:04
madduck left02:04
Stravy left02:04
Grum left02:04
sakkemo left02:04
DjMadness left02:04
m4rcu5 left02:04
Odd_Bloke left02:04
VadtecWk left02:04
ahf left02:04
brycec left02:04
Cap_J_L_Picard left02:04
eddd left02:04
ewong left02:04
heinrich5991 left02:04
jeffery left02:04
etcetera left02:04
kent\n left02:04
GuruShah left02:04
cian1500ww left02:04
unreal left02:04
marcobax left02:04
saurik left02:04
grn_ left02:04
ivan` left02:04
jds__ left02:04
BeerSerc_ left02:04
vmiklos left02:04
no_maam left02:04
meLon left02:04
Learath2 left02:04
jds_ left02:04
daniel_b left02:04
jerware left02:04
DrNick left02:04
axisys left02:04
alnr left02:04
Tabmow left02:04
psilo_ left02:04
shabble_ left02:04
cxreg left02:04
Ishango left02:04
jackyyll left02:04
sirdancealot7 left02:04
Fandekasp left02:04
aisbaa left02:04
jast left02:04
rudi_s left02:04
hyperboreean left02:04
project2501b left02:04
Gizmokid2005 left02:04
bedouin left02:04
reikalus1kka left02:04
ping-pong left02:04
p4tux left02:04
Kuukunen left02:04
iXeno left02:04
idoru left02:04
jjasinski joined02:04
dpac|away left02:04
leprechau left02:04
offbyone left02:04
gurps_ left02:04
troyt left02:04
RandalSchwartz left02:04
up_the_irons left02:04
tansell left02:04
guide left02:04
SegFaultAX left02:04
heoa left02:04
ska-fan left02:04
alta left02:04
kennethreitz left02:04
tm1000 left02:04
justinfung left02:04
roflin left02:04
jhford left02:04
tom39291 left02:04
RichardJ left02:04
asedeno_work left02:04
jlewis left02:04
sajbar left02:04
aaronky left02:04
isomorphic left02:04
Esa_ left02:04
Glados_ left02:04
dropdrive left02:04
Goplat left02:04
sh4rm4 left02:04
ejnahc left02:04
lonewulf` left02:04
jayne left02:04
jwmann left02:04
cyphase left02:04
jaimef left02:04
PerlJam left02:04
wolog left02:04
dinesh___ left02:04
prettyrobots left02:04
Tommy[D] left02:04
xxtjaxx_ left02:04
asakura left02:04
FabTG left02:04
_W_ left02:04
lu_zero left02:04
skorgon left02:04
oogatta left02:04
jpalmer left02:04
john3 left02:04
bluj left02:04
camurgo left02:04
SJS left02:04
errr left02:04
teukka left02:04
mutex left02:04
newz2000 left02:04
ToBeFree left02:04
webben left02:04
jason237 left02:04
hakril left02:04
SecretAgent left02:04
BBonifield left02:04
joeytwiddle left02:04
moondoggy left02:04
oconnore left02:04
Tritania left02:04
sluggr left02:04
fuho left02:04
tazle__ left02:04
Kronuz left02:04
Mpenzi left02:04
sitaram left02:04
legumbre left02:04
bigmeow left02:04
lahwran left02:04
abec0 left02:04
avium left02:04
hari__ left02:04
jjasinski left02:04
apok left02:04
Yuuhi` left02:04
bubbles10101 left02:04
fuzzybunny69y left02:04
kermit left02:04
maestrojed left02:04
Targen left02:04
CausaMortis left02:04
gumnos left02:04
parcs left02:04
tplaner left02:04
diegoviola left02:04
esto left02:04
Synthead left02:04
ag4ve left02:04
ESphynx left02:04
zorzar left02:04
hesco left02:04
quadz left02:04
jokajak left02:04
Nugget left02:04
Merwin left02:04
Emmycakes left02:04
todd_dsm left02:04
kpreid left02:04
flaguy48 left02:04
SicoWork left02:04
jargon left02:04
nlogn left02:04
Twey left02:04
hide_ left02:04
wagle left02:04
babilen left02:04
whomp left02:04
bwidmer left02:04
sobel left02:04
yibe_ left02:04
linduxed left02:04
Emmycakes joined02:05
Merwin joined02:05
jokajak joined02:05
quadz joined02:05
Nugget joined02:05
zorzar joined02:05
hesco joined02:05
ESphynx joined02:05
ag4ve joined02:05
Synthead joined02:05
esto joined02:05
diegoviola joined02:05
tplaner joined02:05
parcs joined02:05
gumnos joined02:05
CausaMortis joined02:05
Targen joined02:05
maestrojed joined02:05
kermit joined02:05
fuzzybunny69y joined02:05
bubbles10101 joined02:05
Yuuhi` joined02:05
apok joined02:05
jjasinski joined02:05
kini joined02:05
yibe_ joined02:05
sobel joined02:05
bwidmer joined02:05
babilen joined02:05
MAAC06G joined02:05
wagle joined02:05
hide_ joined02:05
nlogn joined02:05
Twey joined02:05
whomp joined02:05
jargon joined02:05
SicoWork joined02:05
flaguy48 joined02:05
kpreid joined02:05
todd_dsm joined02:05
avium joined02:05
abec0 joined02:05
lahwran joined02:05
bigmeow joined02:05
legumbre joined02:05
sitaram joined02:05
Mpenzi joined02:05
hubbard.freenode.net set mode: +v02:05
Kronuz joined02:05
tazle__ joined02:05
fuho joined02:05
sluggr joined02:05
Tritania joined02:05
oconnore joined02:05
moondoggy joined02:05
joeytwiddle joined02:05
BBonifield joined02:05
SecretAgent joined02:05
jason237 joined02:05
webben joined02:05
ToBeFree joined02:05
teukka joined02:05
errr joined02:05
SJS joined02:05
camurgo joined02:05
bluj joined02:05
mutex joined02:05
john3 joined02:05
jpalmer joined02:05
oogatta joined02:05
skorgon joined02:05
lu_zero joined02:05
_W_ joined02:05
hakril joined02:05
FabTG joined02:05
asakura joined02:05
xxtjaxx_ joined02:05
Tommy[D] joined02:05
prettyrobots joined02:05
wolog joined02:05
PerlJam joined02:05
jaimef joined02:05
cyphase joined02:05
jwmann joined02:05
newz2000 joined02:05
jayne joined02:05
lonewulf` joined02:05
ejnahc joined02:05
sh4rm4 joined02:05
Goplat joined02:05
dropdrive joined02:05
Glados_ joined02:05
dinesh___ joined02:05
Esa_ joined02:05
isomorphic joined02:05
hubbard.freenode.net set mode: +v02:05
aaronky joined02:05
sajbar joined02:05
jlewis joined02:05
asedeno_work joined02:05
RichardJ joined02:05
jhford joined02:05
roflin joined02:05
tm1000 joined02:05
heoa joined02:05
ska-fan joined02:05
alta joined02:05
SegFaultAX joined02:05
guide joined02:05
tansell joined02:05
kennethreitz joined02:05
justinfung joined02:05
up_the_irons joined02:05
troyt joined02:05
tom39291 joined02:05
RandalSchwartz joined02:05
gurps_ joined02:05
offbyone joined02:05
leprechau joined02:05
dpac|away joined02:05
Cap_J_L_Picard joined02:05
brycec joined02:05
ahf joined02:05
Odd_Bloke joined02:05
DjMadness joined02:05
sakkemo joined02:05
Stravy joined02:05
Grum joined02:05
madduck joined02:05
muep joined02:05
jtm joined02:05
kmussel_ joined02:05
thoraxe joined02:05
tpope joined02:05
VadtecWk joined02:05
ben_alman joined02:05
davidh joined02:05
sjk joined02:05
hpa joined02:05
Y_Ichiro joined02:05
OMGOMG joined02:05
m4rcu5 joined02:05
kenyon joined02:05
hubbard.freenode.net set mode: +vv02:05
sontek joined02:05
eddd joined02:05
bacilla joined02:05
ducch joined02:05
arnihr joined02:05
beawesomeinstead joined02:05
CEnnis91_ joined02:05
warthog9 joined02:05
tangler01 joined02:05
idoru joined02:05
Kuukunen joined02:05
p4tux joined02:05
ping-pong joined02:05
reikalus1kka joined02:05
bedouin joined02:05
Gizmokid2005 joined02:05
project2501b joined02:05
hyperboreean joined02:05
rudi_s joined02:05
jast joined02:05
aisbaa joined02:05
Fandekasp joined02:05
sirdancealot7 joined02:05
jackyyll joined02:05
Ishango joined02:05
cxreg joined02:05
psilo_ joined02:05
shabble_ joined02:05
Tabmow joined02:05
alnr joined02:05
DrNick joined02:05
daniel_b joined02:05
jds_ joined02:05
Learath2 joined02:05
jerware joined02:05
meLon joined02:05
no_maam joined02:05
vmiklos joined02:05
iXeno joined02:05
BeerSerc_ joined02:05
jds__ joined02:05
ivan` joined02:05
grn_ joined02:05
saurik joined02:05
axisys joined02:05
marcobax joined02:05
unreal joined02:05
hubbard.freenode.net set mode: +vv02:05
cian1500ww joined02:05
GuruShah joined02:05
kent\n joined02:05
etcetera joined02:05
jeffery joined02:05
heinrich5991 joined02:05
ewong joined02:05
ivan joined02:05
eletuchy joined02:05
revyd joined02:05
MissionCritical joined02:05
kenperkins joined02:05
kirin` joined02:05
usefulthink joined02:05
bentham joined02:05
matthewp- joined02:05
s4muel_ joined02:05
atula joined02:05
spyro joined02:05
Modernmyth joined02:05
drodger joined02:05
pansdr joined02:05
kanzure_ joined02:05
karupanerura joined02:05
Kulrak joined02:05
Sazpaimon joined02:05
jpieper joined02:05
Vinnie_win joined02:05
BlindOracle joined02:05
zarubin joined02:05
durnik joined02:05
netj joined02:05
Tuna-Fish2 joined02:05
harv joined02:05
Treggats joined02:05
EugeneKay joined02:05
Cork joined02:05
canton7 joined02:05
_br_ joined02:05
txomon|nqas joined02:05
AndreSomers joined02:05
rjt joined02:05
libertyprime joined02:05
jpjacobs joined02:05
rking joined02:05
monokrome joined02:05
przemoc joined02:05
hubbard.freenode.net set mode: +vv02:05
lokai_ joined02:05
Poapfel joined02:05
JStoker joined02:05
rupert joined02:05
maxmanders joined02:05
efjboss joined02:05
c98_ joined02:05
myme joined02:05
sunny256 joined02:05
Zwei joined02:05
Eridius joined02:05
kcm1700 joined02:05
heytrav joined02:05
genehack joined02:05
Silex joined02:05
xrq joined02:05
robinsmidsrod joined02:05
decasm joined02:05
TheFuzzball joined02:05
iamtakingiteasy joined02:05
pdelvo joined02:05
KaiSforza joined02:05
aucecil joined02:05
zackiv31 joined02:05
johnkpaul joined02:05
zivester joined02:05
robustus joined02:05
yshh joined02:05
TeamColtra joined02:05
m0viefreak joined02:05
hyperair joined02:05
bgerber joined02:05
avpx joined02:05
quazimodo joined02:05
zsoc joined02:05
wcarss joined02:05
tabakhase joined02:05
RichiH joined02:05
Zeelot joined02:05
SirFunk joined02:05
murr4y joined02:05
Juri_Agarin joined02:05
sdboyer joined02:05
jnl joined02:05
mancha joined02:05
metze joined02:05
Caius joined02:05
tgummerer joined02:05
VeggieMeat joined02:05
malesca joined02:05
zibri joined02:05
ajpiano joined02:05
Nevik joined02:05
spacepluk joined02:05
takus joined02:05
styx_ joined02:05
eregon joined02:05
matthewpucc_ joined02:05
tokkee joined02:05
abackstrom joined02:05
jrockway joined02:05
fionnan joined02:05
ryland joined02:05
KBme joined02:05
hexa2k9 joined02:05
lyddonb joined02:05
milian joined02:05
Mez joined02:05
__name__ joined02:05
Bigcheese joined02:05
un1matr1x joined02:05
Cerise joined02:05
IcePic joined02:05
avalarion joined02:05
lb joined02:05
squentin joined02:05
maxb joined02:05
Chipzz joined02:05
js_ joined02:05
eam joined02:05
AlexanderS joined02:05
nuba joined02:05
felipe joined02:05
lucs joined02:05
ice799 joined02:05
mzarella joined02:05
vyvup joined02:05
Bilge joined02:05
Martz joined02:05
kwork joined02:05
hhuuggoo joined02:05
akheron joined02:05
Will| joined02:05
rphillips joined02:05
hubbard.freenode.net set mode: +v02:05
Uriziel joined02:05
SaCu joined02:05
alegen joined02:05
else- joined02:05
chadi joined02:05
zmo joined02:05
Meliorate joined02:05
cschneid joined02:05
worch joined02:05
spb joined02:05
hexmanshu joined02:05
sente` joined02:05
EXAAG5WE joined02:05
tg joined02:05
rabbit7_ joined02:05
kortti_ joined02:05
batmania_ joined02:05
GyrosGeier joined02:05
christophler joined02:05
kryl99 joined02:05
danmackay joined02:05
Ratler joined02:05
joschi joined02:05
sobral joined02:05
Sargun joined02:05
maxorator joined02:05
SebastianFlyte joined02:05
xonix joined02:05
mattp joined02:05
EvanDotPro joined02:05
minerale joined02:05
strictlyb joined02:05
__main__ joined02:05
Ferris joined02:05
Rydekull joined02:05
xcat joined02:05
Launch_Director joined02:05
__class__ joined02:05
mechanyancat joined02:05
niax joined02:05
raek joined02:05
djh joined02:05
EToS joined02:05
CareBear\ joined02:05
Drakevr joined02:05
variousnefarious joined02:05
nevyn joined02:05
hubbard.freenode.net set mode: +vv02:05
xnox joined02:05
dpwright joined02:05
Araxia joined02:05
colona joined02:05
dsop joined02:05
sneakret joined02:05
Ingmar joined02:05
rpetre joined02:05
mmattice joined02:05
tolland joined02:05
rrs joined02:05
shihan joined02:05
ketas joined02:05
jakob joined02:05
iKriz joined02:05
carc joined02:05
Spaceghostc2c joined02:05
schlumpi joined02:05
Hamled joined02:05
qlkzy joined02:05
so joined02:05
MacGyver joined02:05
Droolio joined02:05
CoJaBo joined02:05
offby1 joined02:05
dharrigan joined02:05
ijuma joined02:05
TML joined02:05
chrisward joined02:05
jonn joined02:05
Nikoli joined02:05
GodEater joined02:05
skoop joined02:05
JPohlmann joined02:05
cmyers joined02:05
shadewind joined02:05
Derander joined02:05
segher joined02:05
avar joined02:05
koki joined02:05
selckin joined02:05
krishna joined02:05
rocsteady joined02:05
adhawkins-away joined02:05
EgS joined02:05
axrfnu joined02:05
milki joined02:05
Khisanth joined02:05
wwalker joined02:05
tr4656 joined02:05
wo0kie joined02:05
surfdue joined02:05
chuckf joined02:05
twem2 joined02:05
Rhonda joined02:05
ryanneufeld joined02:05
mlb- joined02:05
pigeon joined02:05
qwertz_ joined02:05
MiKom joined02:05
eto joined02:05
tallest_red joined02:05
Paparaciz joined02:05
iAsterisk joined02:05
juha_ joined02:05
zaiste joined02:05
mariusso joined02:05
Derega joined02:05
cinderblock joined02:05
Droggl joined02:05
neurodamage joined02:05
zenazn joined02:05
xrogaan joined02:05
aguynamedben joined02:05
shibayu36 joined02:05
PaulePanter joined02:05
leptonix joined02:05
roger_raymond joined02:05
lqi joined02:05
Akufen joined02:05
scot_ joined02:05
SuperKing joined02:05
kart0ffelsack joined02:05
hays joined02:05
estan joined02:05
DrPoole_ joined02:05
tsally joined02:05
ryao joined02:05
legnaleurc joined02:05
jave joined02:05
felher joined02:05
imarcusthis joined02:05
arosen joined02:05
mattp_ joined02:05
infogulch joined02:05
candybar joined02:05
thiderman joined02:05
Soliton joined02:05
kimico joined02:05
krosenvold joined02:05
w0m joined02:05
MrNibbles joined02:05
woky joined02:05
oojacoboo joined02:05
artgoeshere joined02:05
tango_ joined02:05
adamm joined02:05
girishnair joined02:05
Argafal joined02:05
qknight joined02:05
Arokh joined02:05
new299 joined02:05
mikaelj_ joined02:05
pasky joined02:05
Caelum joined02:05
aruiz joined02:05
haarg joined02:05
tomek joined02:05
Pagan|Work joined02:05
eightyeight joined02:05
lamont joined02:05
unnamedwill joined02:05
yewton joined02:05
TheMoonMaster joined02:05
imMute joined02:05
agile joined02:05
poohtarou joined02:05
cespare joined02:05
j0ran joined02:05
russ__ joined02:05
cehteh joined02:05
xxthink joined02:05
dsantiago joined02:05
Zyrkon joined02:05
_|Nix|_ joined02:05
rvsjoen joined02:05
Remram joined02:05
cods joined02:05
milli joined02:05
ldlework joined02:05
rue joined02:05
doki_pen joined02:05
siprbaum joined02:05
aboudreault joined02:05
Praise joined02:05
bapa joined02:05
jspiros joined02:05
benth joined02:05
gcmalloc joined02:05
dcelix joined02:05
sjefen6 joined02:05
jefferai joined02:05
lavaman joined02:05
weltall joined02:05
comps joined02:05
albel727 joined02:05
SeoZ-work[AWAY] joined02:05
Kicer86 joined02:05
[mbm] joined02:05
Villadelfia joined02:05
SeySayux joined02:05
bassliner joined02:05
yesi joined02:05
circle joined02:05
Chilley joined02:05
deryni joined02:05
chris2 joined02:05
mage_ joined02:05
pom joined02:05
beasty_ joined02:05
DancingBear joined02:05
talexb joined02:05
tapout joined02:05
BinGOs joined02:05
dr_lepper joined02:05
Fuxx joined02:05
AlexC_ joined02:05
EdwardIII joined02:05
majuscule joined02:05
Fissure joined02:05
jonmasters joined02:05
JrCs joined02:05
ndim joined02:05
blathijs joined02:05
frew joined02:05
orisinal_ joined02:05
diget joined02:05
gniourf_gniourf joined02:05
txwikinger joined02:05
deavid joined02:05
pureluck joined02:05
LotR joined02:05
Fiouz joined02:05
Orphis joined02:05
bjornars joined02:05
ipi joined02:05
Tobarja joined02:05
Olipro joined02:05
marienz joined02:05
jmcantrell joined02:05
MetaCosm joined02:05
digitalfiz joined02:05
tfnico_ joined02:05
jab416171|Cloud joined02:05
garann joined02:05
rrxtns joined02:05
garrys_game__ joined02:05
xerxas joined02:05
NimeshNeema joined02:05
tubbo joined02:05
GameGamer43 joined02:05
jaequery_ joined02:05
faen joined02:05
bremner joined02:05
cbreak joined02:05
Weiss joined02:05
jdav_gone joined02:05
ivan\ joined02:05
jgoss joined02:05
Leeol joined02:05
myndzi joined02:05
Ziber joined02:05
neersighted joined02:05
mjessome joined02:05
sqz joined02:05
Natureshadow joined02:05
thorie joined02:05
thomas_b joined02:05
Aprogas joined02:05
rje joined02:05
ianmcorvidae joined02:05
duncanm joined02:05
tmz joined02:05
_ikke_ joined02:05
skul joined02:05
hubbard.freenode.net set mode: +v02:05
CoffaBun33h joined02:05
kanru joined02:05
Maxdamantus joined02:05
Slush- joined02:05
JPT joined02:05
torjus- joined02:05
niluje joined02:05
roto joined02:05
ruskie joined02:05
aep joined02:05
Steve joined02:05
milleja46 joined02:05
Anubisss joined02:05
palyboy joined02:05
tizzo-afk joined02:05
acrocity joined02:05
electrogeek joined02:05
WhereIsMySpoon joined02:05
dougsland joined02:05
mtk joined02:05
nigelb joined02:05
drue joined02:05
prismatictrail joined02:05
sweet_kid joined02:05
realmatt joined02:05
Putr joined02:05
catsup joined02:05
coasterz joined02:05
elliottcable joined02:05
metcalfc joined02:05
wereHamster joined02:05
babl_wrk joined02:05
Snicers-Work joined02:05
aliljet joined02:05
petteyg joined02:05
jaeckel_ joined02:05
brabo joined02:05
antix_ joined02:05
blami joined02:05
d1b joined02:05
speakman joined02:05
rawtaz joined02:05
Darkclown joined02:05
oso96_2000 joined02:05
WakiMiko joined02:05
shennyg joined02:05
Bombe joined02:05
hubbard.freenode.net set mode: +v02:05
Guest joined02:05
carbohydrate joined02:05
Jasper joined02:05
ciaranm joined02:05
odin_ joined02:05
captbaritone joined02:05
Sir_Ragnarok joined02:05
vsayer joined02:05
SamB_ joined02:05
bronsen joined02:05
sharpobject joined02:05
pilif joined02:05
fpaut joined02:05
HeN joined02:05
TomWij joined02:05
ohcibi joined02:05
grummund joined02:05
totte joined02:05
jweinberg joined02:05
phryk joined02:05
philips_ joined02:05
cwillu_at_work joined02:05
LittleFool joined02:05
dzonder joined02:05
Dreamer3 joined02:05
Nickeeh joined02:05
tm512 joined02:05
nick_h joined02:05
nowhereman_ joined02:05
tonyj joined02:05
gitinfo joined02:05
jbub joined02:05
vu_ joined02:05
hvgotcodes joined02:05
letharion_ joined02:05
cthuluh joined02:05
srcerer joined02:05
andres joined02:05
michel_v_ joined02:05
pavelz_ joined02:05
knittl joined02:05
ScottE joined02:05
RichardBronosky_ joined02:05
huoxito joined02:05
serj joined02:05
ammar_ joined02:05
tchan joined02:05
hubbard.freenode.net set mode: +o02:05
csgeek joined02:05
kloeri joined02:05
dzan_ joined02:05
nelk_ joined02:05
blueyed joined02:05
majoh joined02:05
Pieter_ joined02:05
e-ndy joined02:05
reactormonk joined02:05
spottedkangaroo joined02:05
kiffer84_ joined02:05
plasticboy joined02:05
c45y_ joined02:05
edoceo_ joined02:05
codon joined02:05
m1sc_ joined02:05
Aaeriele joined02:05
wanders_ joined02:05
BooK_ joined02:05
atrigent joined02:05
martinjlowm joined02:05
steevel joined02:05
coopsh joined02:05
Guest30417 joined02:05
nanun joined02:05
flippo joined02:05
yann|work joined02:05
PacketCollision joined02:05
Guest65145 joined02:05
dijonyummy joined02:05
Bucciarati joined02:05
jstemmer joined02:05
orospakr joined02:05
batrick joined02:05
an0maly_ joined02:05
Fall joined02:05
cenuij joined02:05
brandonw joined02:05
john_anderson joined02:05
heroux joined02:05
dwmw2_gone joined02:05
Vampire0_ joined02:05
intripoon_ joined02:05
toothr joined02:05
Mogget joined02:05
Blaster joined02:05
marc_kdab_ joined02:05
redrocket joined02:05
codertux joined02:05
glennpratt joined02:05
pdtpatrick joined02:05
boichev_ joined02:05
boichev__ joined02:05
The-Compiler joined02:05
whitman joined02:05
Dereckson joined02:05
scruple joined02:05
timj joined02:05
charon joined02:05
sanderj_ joined02:05
myx joined02:05
kevinfagan joined02:05
Rix joined02:05
Syniq joined02:05
hakunin_ joined02:05
kallisti5 joined02:05
Internet13 joined02:05
newbie999 joined02:05
stfn joined02:05
Gitzilla joined02:05
crash\ joined02:05
miphe joined02:05
drizzd_ joined02:05
Adys joined02:05
G0re joined02:05
ziro` joined02:05
damjan joined02:05
Felden joined02:05
willob joined02:05
Error404NotFound joined02:05
trungqtran joined02:05
cybersphinx joined02:05
flavius joined02:05
madewokherd joined02:05
o] joined02:05
cmcculloh joined02:05
bartman joined02:05
jMCg joined02:05
prsn joined02:05
x82_nicole joined02:05
jcarouth joined02:05
PaulCapestany joined02:05
rgr joined02:05
andygrossman joined02:05
hubbard.freenode.net set mode: +v02:05
r126t joined02:05
p3rror joined02:05
relipse joined02:05
asaf joined02:05
RobertLaptop joined02:05
Plouj joined02:05
gusnan joined02:05
tystr joined02:05
Orbitrix joined02:05
Xethron joined02:05
skywalkerhere joined02:05
jimmyeatworld joined02:05
Samual joined02:05
mneorr joined02:05
Bass10 joined02:05
khmarbaise joined02:05
esc joined02:05
paradigm joined02:05
JonasF joined02:05
nutron joined02:05
OOPMan joined02:05
scorphus joined02:05
resmo joined02:05
Davey joined02:05
tureba joined02:05
SJr joined02:05
MacWinner joined02:05
sallesao joined02:05
rondale_sc joined02:05
alfplayer joined02:05
WinstonSmith joined02:05
setmeaway2 joined02:05
s0ber joined02:05
phschwartz joined02:05
macabre joined02:05
allquixotic joined02:05
Cassiel joined02:05
alunduil joined02:05
ncd|leeN joined02:05
jcao219 joined02:05
maqr joined02:05
luc_ joined02:05
thiago joined02:05
geonetix joined02:05
NiteRain joined02:05
krum joined02:05
rideh joined02:05
Vert joined02:05
peper joined02:05
paddy joined02:05
robbyoconnor joined02:05
cmn joined02:05
braddcadd joined02:05
linduxed joined02:06
Milossh joined02:06
tmcmahon joined02:06
jjasinski left02:06
cmn look at what you're asking git to do02:06
where are you pushing?02:06
jjasinski joined02:06
ewong I'm pushing to my fork in github02:06
well a branch02:06
quazimodo cmn: ill read more then come back02:06
hari__ joined02:06
cmn yes, but look at what you're asking for02:06
kukks joined02:07
kukks left02:07
kukks joined02:07
ewong I'm reading github's docs.. |git clone https://github.com/username/proj.git|02:09
cmn right, what's that url?02:09
fuzzybunny69y left02:09
ewong https://github.com/username/proj.git02:09
cmn yes, what kind is it02:09
ewong https02:09
oh.. I should change that to a git://github.com/username/proj.git ?02:10
aruiz left02:10
ewong or was it ssh?02:10
quazimodo what does the + do on the refspec02:10
oh right02:11
cmn each is for a different thing, use whichever one fits your purpose02:11
antix_ left02:11
ewong so if I want to push to my branch on github.com, should it be git:// or ssh://?02:12
and how do I specify the ssh:// part..02:12
cmn youcan;t push over the raw git protocol02:12
p3rror left02:12
quazimodo oh cool so i can use fetch = "bla" to control where i'll be pulling branches from02:12
maestrojed left02:12
quazimodo sort of02:13
antix joined02:13
cmn use either https or ssh to push02:13
phipes joined02:13
atula left02:13
cmn quazimodo: 'fetch' can go in different places02:14
irqq joined02:14
d2dchat joined02:14
ewong cmn so the command is |git remote add upstream ssh://github.com/username/proj.git|?02:14
then |git push master upstream|?02:14
avpx git push upstream master02:14
phipes left02:14
cmn if you want to use ssh, that's the url02:14
haarg [email@hidden.address]02:15
ewong ooh..02:15
cmn that's another way of specifying the same thing02:16
quazimodo the git config file has all these variables02:17
but i cant find any place that clearly explains what they do02:17
and where they work02:17
jn_ joined02:17
cmn though you'd probably want to add a git@ even with ssh://02:17
ewong whoa.. git is sooo complicated02:17
krum left02:18
Vampire0 joined02:18
cmn what are you talking about?02:18
you're specifying an url02:18
ewong oh yeah.. ok now it works..02:18
luc_ left02:18
cmn up to now you haven't done anything with git02:18
quazimodo: yes, there are a lot of things stored there02:19
ChanServ set mode: -v02:19
cmn don't look at them all at once, use commands to specify what you want02:19
jn_ left02:19
ewong yeah.. I come from hg, so git is a little steep in the learning curve :)02:19
cmn that's just bollokcs02:19
jn_ joined02:20
antix left02:20
Vampire0_ left02:20
DatumDrop joined02:20
tmcmahon left02:21
quazimodo i just did git config branch.master.remote master and it deleted my master repository from config :/02:21
ncd|leeN left02:21
cmn don't do that then02:22
but I much doubt that's what happened02:22
diego joined02:22
diegoviola left02:22
ewong cmn thanks for the help!02:22
robbyoconnor left02:23
diegodiegoviola02:23
quazimodo cmn: ok lets forget anything I said about pull/fetch02:23
robbyoconnor joined02:23
quazimodo i'll ask one more hing then get out of your hair - when I git push I'd like all the branches in the repo to push to specific repository - so i need to add somethnig to each [branch "02:24
what is that variable?02:24
pansdr left02:24
antix joined02:24
cmn no, you don't02:25
you set the upstream branch information02:25
and then you set the push.default variable to 'upstream'02:25
git branch --set-upstream-to=upstream-branch02:26
Samual left02:26
cmn if your git is too old for that, git branch --set-upstream branch upstream-branch02:26
Samual joined02:26
Samual left02:26
Samual joined02:26
Samual left02:26
Samual joined02:26
Samual left02:26
Samual joined02:26
Samual left02:26
Samual joined02:26
Samual left02:26
Samual joined02:27
rideh left02:27
etcetera left02:28
pansdr joined02:29
cespare left02:30
tjadc joined02:30
pansdr left02:32
BiggFREE joined02:33
nigelb left02:33
quazimodo cmn: one question, should I ever be touching the config file manually/02:33
antix left02:33
nigelb joined02:34
milki the format is easy so its fine02:36
cmn no, you shouldn't modify it02:36
linduxed left02:36
milki well, for quazimodo it isnt02:36
cmn right02:36
milki lol02:37
linduxed joined02:37
thomas_b left02:37
milki if you cant answer that question, you shouldnt touch it02:37
!02:37
cmn once you're familiar with what does what, you could modify it by hand if it's quicker, like renaming a remote or slightly changing a url02:37
friskd left02:37
cmn but even then, the config file is for the tool to modify02:38
thomas_b joined02:38
saltcod_ joined02:38
quazimodo the format is trivial, i just dont know what happens when I change stuff and dont change the directories etc02:38
antix joined02:38
etcetera joined02:39
d2dchat left02:39
revyd left02:40
PCChris left02:40
cmn then the answer should be obvious02:40
mikepack left02:44
hiroyuki joined02:47
antix left02:47
quazimodo git branch --set-upstream master remotes/production/master02:49
Branch master set up to track remote branch master from production.02:49
no changes in .git/config though :/02:50
o] left02:50
rouge joined02:51
o] joined02:51
antix joined02:51
intripoon joined02:52
hvgotcodes left02:52
texel joined02:53
intripoon_ left02:55
kanzure_ left02:56
texel left02:57
ewong left02:57
braddcadd left02:57
jn_ left02:57
cmn then it was already tracing it02:58
ewong joined02:58
cmn git branch -vv will show it02:58
Error404NotFound left03:00
hyperair left03:00
kokozin joined03:00
antix left03:01
kanzure joined03:03
cyphase left03:03
antix joined03:05
rouge left03:10
quazimodo thanks cmn03:13
cakehero joined03:13
hari__ left03:14
antix left03:15
etcetera left03:16
kyledr joined03:16
setmeaway2 left03:17
antix joined03:20
Milossh left03:22
GuruShah left03:23
captbaritone left03:27
GuruShah joined03:28
cakehero left03:28
irqq left03:28
Gentlecat left03:28
avpx left03:28
cybersphinx left03:29
antix left03:30
m0ltar joined03:30
infynyxx joined03:31
BiggFREE left03:32
antix joined03:36
kokozin left03:36
sente` left03:37
sente` joined03:42
antix left03:47
eletuchy left03:49
eletuchy joined03:49
g_bleezy joined03:50
eletuchy_ joined03:51
antix joined03:52
eletuchy left03:53
jimmyeatworld left03:54
g_bleezy left03:54
drue left03:55
drue joined03:59
antix left04:02
drue left04:03
antix joined04:07
Error404NotFound joined04:08
VadtecWk left04:08
VadtecWk joined04:13
mneorr left04:14
hyperair joined04:14
ewong left04:17
GuruShah left04:17
kokozin joined04:18
antix left04:18
ewong joined04:18
GuruShah joined04:22
m0ltar left04:25
antix joined04:25
cespare joined04:26
redrocket left04:30
Vert left04:30
revyd joined04:30
jcao219 left04:32
redrocket joined04:32
setmeaway joined04:33
antix left04:35
mneorr joined04:37
redrocket left04:37
redrocket joined04:38
GuruShah left04:38
redrocket left04:40
DatumDrop left04:41
madewokherd left04:41
marc_kdab_ left04:42
redrocket joined04:42
marc_kdab_ joined04:42
rondale_sc left04:42
timj left04:43
antix joined04:44
redrocket left04:44
antix left04:44
arosen left04:44
kukks left04:45
fliqqer joined04:46
tjbiddle joined04:50
mneorr left04:51
OOPMan left04:51
revyd left04:51
angelsl joined04:52
Sigma joined04:53
glennpratt left04:54
ehsan joined04:55
jargon left04:56
guns joined04:57
Gentlecat joined04:57
redrocket joined05:02
subhojit777 joined05:03
jargon joined05:04
h0bbit joined05:05
relipse2 joined05:07
relipse left05:08
usmanity_ joined05:08
ubolonton joined05:10
lresende joined05:10
gusnan left05:10
mneorr joined05:11
eletuchy_ left05:11
eletuchy joined05:11
mneorr left05:14
DatumDrop joined05:14
JaredMiller joined05:15
eletuchy left05:16
GuruShah joined05:22
DatumDrop left05:23
lresende_ joined05:23
lresende left05:24
lresende_lresende05:24
infynyxx left05:26
infynyxx joined05:27
private joined05:29
jlg13 joined05:30
JaredMiller left05:31
mneorr joined05:35
cehteh left05:36
cehteh joined05:37
ewong left05:37
ewong joined05:38
zsoc left05:38
PaulCapestany left05:38
PaulCapestany joined05:40
eletuchy joined05:42
x82_nicole left05:47
x82_nicole joined05:50
Bass10 left05:53
geonetix left05:54
Sigma left05:56
geonetix joined05:56
infynyxx left06:04
a-l-e joined06:05
private left06:09
cyphase joined06:10
Ziber I have two branches, master and devel. I create a file on master, and switch to devel. Why doesn't it show up?06:10
bgerber left06:11
trungqtran left06:11
BiggFREE joined06:12
trungqtran joined06:12
EugeneKay Because git tracks trees06:13
'git merge master' and it'll appear06:13
phipes joined06:13
Ziber [ziber@bravo] (~/git/testing) $ git merge master06:14
Already up-to-date.06:14
:(06:14
EugeneKay Are you on devel?06:14
thiago Ziber: when you said "create a file on master", did you include the add + commit part?06:14
Ziber Yes and yes.06:14
EugeneKay You're doing something wrong06:14
!reproe06:14
!repro06:14
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session. This will help immensely with troubleshooting.06:14
bgerber joined06:15
maleknet joined06:15
angelsl left06:15
tjbiddle_ joined06:16
huoxito left06:16
Ziber Of course when I re-did all of it, it works nwo.06:17
*now06:17
tjbiddle__ joined06:17
Ziber shrugs06:18
Ziber Not sure what I did before.06:18
tjbiddle left06:19
tjbiddle__tjbiddle06:19
angelsl joined06:19
thiago which means that you did something different the first time around06:19
something that you don't remember, which makes the results different06:19
EugeneKay ;-)06:19
tjbiddle_ left06:20
thiago one thing I've learned in offering help on IRC: the problem is often not where people ask for help on06:20
if the problem were there, people would have found it06:20
Ziber Do forgive me, it's after 1am. :P06:21
maleknet left06:21
h0bbit left06:22
relipse2 left06:23
relipse joined06:23
jmspeex joined06:23
relipse can someone beta test my new website for contract-programmers? https://cworklog.com06:24
relipse left06:24
rue left06:26
rue joined06:26
thiago thanks idoru06:27
quazimodo left06:28
heroux left06:28
relipse joined06:29
heroux joined06:30
macabre left06:31
Imaginativeone joined06:31
huoxito joined06:34
infynyxx joined06:34
maleknet joined06:34
Targen left06:36
usmanity_ left06:38
EugeneKay Ziber - Forgiveness can be obtained by consuming additional liquor06:38
jlg13 left06:39
wrouesnel joined06:40
Ziber I haven't had any alcohol tonight, unfortunately. I could use some to take the nerves off about my final exam in the morning though.06:41
infynyxx left06:43
jackh joined06:43
Imaginativeone left06:44
mark06 joined06:45
mark06 anyone here?06:45
Ziber no mind-readers.06:45
mark06 well, I'm starting with git06:45
it's odd but whatever, I'm pushing to origin, which is a github https url06:46
Ziber why not use ssh?06:46
thiago hint: push to ssh06:46
Ziber ^06:46
mark06 it's not asking me for any authentication06:46
Ziber: they recommend https instead, no idea why06:46
Ziber use ssh, it's safer, easier, etc.06:46
mark06 Ziber: no, they don't recommend it, and I don't care about it at the moment06:47
the problem now is that I've added 20MB of files (source code tarball and installer) and06:47
Ziber ...and?06:47
mark06 and it's not asking me for any passwords, I wonder if it's going to ask me in the end, will it?06:48
Ziber i've no idea. i dont use http. i use SSH06:48
thiago are you now pushing via ssh?06:48
mark06 otherwise, I don't understand why am I able to push to github06:48
thiago you're probably not able06:48
tjbiddle left06:48
thiago you're just sending a bunch of data that will be discarded06:48
mark06 thiago: great, cool, nice, neat06:49
Ziber so, like we said, use ssh.06:49
thiago use ssh. No reason to use anything else.06:49
mark06 thiago: is that git thing or github thing? cause it's really neat06:49
thiago no idea06:49
I don't know one who uses http for pushing by choice06:49
mark06 git -u, where u stands for remembering, is neat too, but whatever06:50
Ziber there's no 'u' in remembering. bah.06:50
mark06 u stands for what?06:50
thiago mark06: man git-push06:50
gitinfo mark06: the git-push manpage is available at http://jk.gs/git-push.html06:50
thiago -u, --set-upstream06:50
mark06 thiago: http is not covered?06:50
thiago covered by what?06:51
mark06 thanks thiago, I'll certainly forget that, but it'll be an endless discussion if I just start complaining about things I don't like in git, so back to the problem, if you have no idea, how do you know I'm probably sending data which will the discarded later?06:52
opus joined06:52
coasterz left06:52
mark06 thiago: covered by the man page, the git docs etc. is git over https some sort of dirty hack?06:53
quazimodo joined06:53
mark06 by forget I mean about -u06:53
thiago I'm guessing06:53
mark06 ah.06:53
thiago there are two reasons why it's not asking for a password:06:53
1) a password is not required, which can be because github has a bug and is insecure, or because it will simply reject the transmission06:54
mikef joined06:54
thiago or 2) the password is stored somewhere and you don't remember that such a feature was set up06:54
mark06 either way, it doesn't show any kind of upload progress, nice cause I have no idea when it's going to finish. That's not a github thing06:54
Ziber does it show up online?06:54
thiago I doubt that such a failure in security exists in github06:54
captbaritone joined06:55
thiago I also don't think that you'd forget you wrote a config file to store the password06:55
so the most likely explanation is that the transmission will fail06:55
mark06 thiago: 2 is not possible, I didn't set up any password06:55
I mean locally in the command line06:55
thiago upload via ssh shows the progress06:55
Anubisss left06:55
mark06 Ziber: it what, the new files? no, it's not finished yet (as I said, I have no idea when git will finish it since it doesn't tell me the progress)06:56
thiago: nice06:56
thiago mark06: how do you know it's transmitting anything at all?06:56
Gentlecat left06:56
mark06 thiago: the command did not return, and there's growing upload traffic from my pc, no other upload stuff is running06:57
ewong left06:57
Ziber id've started smaller than that.06:57
quazimodo left06:57
thiago and you haven't finished uploading 20 MB yet?06:57
we've been talking for 13 minutes06:58
rchavik joined06:58
rchavik left06:58
rchavik joined06:58
mark06 what can you think of from here? I don't get the links at the top, some say write-access, I have no idea what that means: https://github.com/renatosilva/pidgin06:58
thiago that's less than 256 kbit/s, assuming no compression06:58
m0viefreak left06:58
thiago it says read-only access for me for all three options06:59
mark06 no idea because how can one get write access by copying a url which doesn't even contain any specific auth key in it?06:59
revyd joined06:59
thiago so we conclude that they can't06:59
ragsagar joined06:59
mark06 hmm06:59
there's the http, ssh and git-read-only links07:00
first two say read-write to me07:00
thiago but, like I said, no one uses http by choice07:00
choose ssh07:01
x82_nicole left07:01
mark06 yeah it's so slow...07:01
I thionk it's better to cancel it and try pushing something small...07:01
thiago via ssh07:01
mark06 thiago: if you tell me how to configure it to use plink :)07:02
thiago what's plink?07:02
jlg13 joined07:02
Gentlecat joined07:03
mark06 from putty07:04
Ziber eh?07:04
thiago why do you need to make it work with putty?07:04
Ziber ssh-keygen -t rsa ; cat ~/.ssh/id_rsa.pub ; <copy ssh key to github account, not to the repository itself>07:05
trungqtran left07:05
mark06 I have a key already07:05
I use putty as ssh agent07:06
thiago do you have the private key in ssh format?07:06
mark06 gui prompt for password, nice07:06
thiago ssh will need it. I don't think it can read putty's file format.07:06
mark06 yes, it works nicely with launchpad07:06
rgr left07:06
mark06 yes I have it in ssh format07:06
eletuchy left07:06
huoxito left07:07
eletuchy joined07:07
mark06 btw some frozen git-related processes here, I think it don't like ctrl+c? meh07:07
thiago you've just confessed to using windows07:07
I've seen windows processes not react to Ctrl+C very well07:08
when Windows is involved, it gets the blame by default, until proven otherwise07:08
Ziber couldn't imagine using git on windows... *shudders*07:08
Synthead left07:08
hoschi joined07:09
mark06 can I say something in turn? I don't think so07:10
whatever, something crazy is happening, it's hanging on for a simple text file too: http://pastie.org/pastes/5534300/text07:10
it wasn't uploading anything at all, I think07:10
Ziber touch file ; git add file ; git commit -m "test file" file ; git push07:11
what happens when you run that?07:11
jmspeex left07:11
mark06 oh, my, God!07:11
MinTTY! MinTTY!07:12
dabd joined07:12
mark06 it was asking me for github username, and I didn't even know07:12
drue joined07:12
quazimodo joined07:12
Ziber git config --global user.name "<githubusername>"07:13
mark06 is there any explicit interactive mode parameter for git?07:13
Ziber git config --global user.email "<email address>"07:13
mark06 I've put "Renato Silva" as my user.name, as suggested by git07:13
Ziber ... Okay.07:14
try pushing again07:14
git push07:14
no -u nonsense.07:14
robustus left07:14
mark06 email was already set, the problem is that the prompt didn't show in mintty, but some programs allow to explicitly pass some interactive mode parameter in07:14
ewong joined07:14
mark06 ok, will try pushing07:15
Ziber why not just linux? :/07:15
there was supposed to be a verb there.07:15
robustus joined07:16
tjbiddle joined07:17
phipes left07:17
quazimodo left07:17
h0bbit joined07:18
mark06 ok it seems to be working now, sending files07:18
it won't save the password in the disk, only cache in memory, right?07:19
todd_dsm left07:19
mark06 thiago: it does show progress even via http, nice07:19
todd_dsm joined07:20
OOPMan joined07:20
Ziber How can I easily revert some local changes I made to a file?07:21
SicoWork left07:22
kyledr left07:22
mark06 in bzr, we just need to set BZR_SSH=plink, how about git?07:22
quazimodo joined07:23
mark06 plink is like the ssh utility, it seems07:24
fliqqer left07:24
thiago mark06: man git07:25
gitinfo mark06: the git manpage is available at http://jk.gs/git.html07:25
tjbiddle left07:26
andrewhl joined07:27
Treggats left07:27
mark06 thiago: it's easier to just use http for now07:27
nevyn you can use GIT_SSH=plink (this is what I do at work)07:27
mark06 nevyn: nice! thanks!!07:27
NiteRain left07:28
wagle_ joined07:28
nevyn also I worked out howto run gource on windows recently07:28
mark06 this is really nice, so we don't need to tell git about our private key, actually that sounds silly, thiago07:28
nevyn you have to run it from inside the git shell07:28
whomp_ joined07:29
mark06 folks, files uploaded successfully: https://github.com/renatosilva/pidgin, thanks Ziber, thiago07:29
babilen_ joined07:29
sobel_ joined07:29
kpreid left07:29
flaguy48 left07:29
nlogn left07:29
Twey left07:29
hide_ left07:29
wagle left07:29
babilen left07:29
whomp left07:29
bwidmer left07:29
sobel left07:29
yibe_ left07:29
nlogn joined07:29
mark06 however only know I see that what I just did is not straightforward: https://github.com/blog/1302-goodbye-uploads07:29
all I wanted was a download count :-/07:30
nevyn: run what?07:30
trungqtran joined07:30
nevyn gource07:34
mark06 ah ok, I don't know what's it07:36
nevyn http://www.thealphablenders.com/2009/12/gource-software-version-control-visualization/07:36
it makes pretty videos from history07:36
quazimodo left07:37
karupanerura left07:38
revyd left07:39
karupanerura joined07:40
flaguy48 joined07:42
CareBear\ google also codeswarm07:42
quazimodo joined07:43
Twey joined07:43
hide joined07:43
mark06 anyway, thanks all! good night07:45
mark06 left07:45
xxc_michael joined07:46
chee joined07:47
chee left07:47
chee joined07:47
rchavik left07:48
shreya joined07:48
kpreid joined07:49
bwidmer joined07:49
yibe_ joined07:49
x82_nicole joined07:51
Ac-town joined07:51
LeMike joined07:51
longbeach joined07:52
mneorr left07:53
trungqtran left07:57
h0bbit left07:58
Sigma joined07:58
jlg13 left08:01
Sigma left08:06
Sigma joined08:06
xkb joined08:07
fisted joined08:07
h0bbit joined08:08
Villadelfia_ joined08:12
xkb left08:12
Villadelfia left08:13
SeySayux left08:13
chronos left08:13
giallu joined08:14
angelsl left08:14
myx left08:15
irqq joined08:15
SeySayux joined08:16
ewong left08:18
caseymcg joined08:18
ewong joined08:18
Goplat left08:19
xkb joined08:19
x82_nicole left08:20
chronos joined08:23
Sigma left08:24
h0bbit left08:24
m0ltar joined08:25
dabd left08:26
h0bbit joined08:26
m0ltar left08:27
kyledr joined08:28
kerrick joined08:29
esto left08:30
sobel_ left08:30
xkb left08:31
kyledr left08:33
kyledr joined08:34
hyperair left08:34
xxc_michael left08:35
pantsman joined08:37
thyseus joined08:38
Sigma joined08:38
opus left08:39
tiglog joined08:41
h0bbit left08:48
quazimodo left08:49
quazimodo joined08:49
guns left08:50
tvw joined08:51
kyledr left08:52
jimmyeatworld joined08:58
quazimodo left08:59
eijk joined09:00
GuruShah left09:01
GuruShah joined09:03
eletuchy left09:07
eletuchy joined09:08
andrewhl left09:08
kyledr joined09:09
eletuchy left09:12
jackh left09:12
BiggFREE left09:13
xkb joined09:13
dvide joined09:14
leeN joined09:15
cenuij left09:16
GuruShah left09:18
arietis joined09:18
kyledr left09:19
Sigma left09:21
wrouesnel left09:22
wrouesnel joined09:22
irqq left09:24
irqq joined09:25
tango_ left09:26
bauruine joined09:26
caseymcg left09:27
daniel_- joined09:30
mastro joined09:30
tango_ joined09:30
tango_ left09:30
shreya left09:30
tango_ joined09:31
mastro left09:31
mastro joined09:32
Sky[x] joined09:34
j416 joined09:36
ewong left09:38
ewong joined09:38
thiago left09:39
relipse left09:41
relipse joined09:41
eletuchy joined09:41
iXeno left09:42
marhaban joined09:44
martinjl` joined09:46
GuruShah joined09:48
marhaban left09:49
relipse2 joined09:50
mishok13 joined09:51
eletuchy_ joined09:51
sdeyerle joined09:51
relipse left09:52
Davey left09:53
eletuchy left09:54
maleknet left09:54
Desproges joined09:55
zarubin left09:55
GuruShah left09:57
daniel_- left09:58
ebouchut joined09:59
amigojapan joined10:00
[pabu] joined10:02
arvind_khadri joined10:03
jimmyeatworld left10:05
Sigma joined10:05
Desproges left10:05
quazimodo joined10:08
relipse2 left10:10
nioncode joined10:11
ncd|leeN joined10:11
i42n joined10:15
xkb left10:15
leeN left10:15
bgerber left10:16
paddy left10:19
wrouesnel left10:22
bgerber joined10:23
JoeAngel_ joined10:24
kyledr joined10:25
maleknet joined10:25
Sky[x] left10:27
tiglog left10:28
Sigma left10:28
Sigma joined10:28
mcdebugger joined10:29
kyledr left10:30
ebouchut left10:30
maleknet left10:31
Sky[x] joined10:32
kokozin left10:32
PaulCapestany left10:34
the_cybersphinx joined10:36
rob_w joined10:36
jbub left10:38
Xizor joined10:38
irqq left10:38
maleknet joined10:43
mneorr joined10:48
AdrienBrault joined10:50
jlg13 joined10:50
jbub joined10:57
ewong left10:57
grn_grn10:57
resmo_ joined10:58
maleknet left10:58
ewong joined10:58
fisted left11:00
martinjl` left11:00
fisted joined11:01
Jippi joined11:02
CausaMortis left11:04
CausaMortis joined11:05
CausaMortis left11:05
CausaMortis joined11:05
Carlsson joined11:05
irqq joined11:07
DoniRS joined11:08
robotmay joined11:12
angelsl joined11:14
fanweixiao joined11:14
jbub left11:17
Milossh joined11:17
maleknet joined11:19
arvind_khadri left11:19
Shusshu joined11:19
bgerber left11:19
jbub joined11:20
jbub left11:22
bgerber joined11:23
maleknet left11:24
scruple left11:25
irqq left11:28
mikef left11:28
g3orge joined11:34
unreal left11:34
pantsman left11:35
g3orge hey guys. Is there a way to change the internal protocol that a git repo uses. I started by cloning by the http url from github but it's requesting username and password everytime and I want to change to ssh w/o rm and cloning again.11:35
unreal joined11:36
fanweixiao you can use git help remote11:36
adhawkins-away left11:37
ebouchut joined11:38
rednaks joined11:43
Shusshu left11:45
ehsan left11:46
bassliner g3orge: you can git remote remove origin, git remote add origin <ssh-url>11:46
Adget joined11:47
marhaban joined11:47
tinti joined11:47
bremner better to user set-url11:47
err, use git remote set-url11:48
h0bbit joined11:48
berserkr joined11:49
Shusshu joined11:51
Shusshu left11:53
adhawkins-away joined11:53
adhawkins-awayGuest720411:53
Sigma left11:56
tinti left11:57
tinti joined11:57
samholmes joined12:00
samholmes I know this is going to sound stupid, but how do you update a forked project on github to the latest commits from the origin?12:01
cbreak pull and push12:01
kevinfagan left12:01
marhaban left12:02
samholmes cbreak: I pull from origin on the github fork?12:05
cbreak you add the original and the forked repo as remote12:05
you fetch from the original one and push to the forked12:05
maybe you'll have to merge locally12:05
samholmes I have origin in `git remote`12:06
angelsl left12:06
samholmes but I don't know which remote that is12:06
angelsl joined12:06
samholmes Okay, so it's to my fork repo.12:07
hinst joined12:07
marhaban joined12:08
giallu left12:08
samholmes What naming convention should I go with; should the fork (my github repo) be "origin", or "fork", and what should the original (forked repo) be named?12:08
cbreak your pick12:09
it's local to your repository only12:09
samholmes what would you go with?12:09
stayarrr joined12:09
mneorr left12:09
sq-one joined12:09
cbreak probably "original" and "github"12:10
in additional to my own origin pointing to my gitolite server :)12:10
original being the original repository12:10
or maybe upstream instead of original12:11
BD-- joined12:11
ehsan joined12:11
Adget left12:12
ewong left12:18
ewong joined12:18
kevinfagan joined12:21
kevinfagan left12:21
rednaks left12:21
CausaMortis left12:21
CausaMortis joined12:22
eijk_ joined12:22
Industrial joined12:24
Industrial https://gist.github.com/71bad127103b75223e95 cant seem to delete remotes/origin/master .. ?12:24
cbreak that's normal12:24
it's a remote tracking branch, it gets updated to the state of the remote, no matter what you did with it locally12:24
Industrial well, the location is not and will never be available anymore. I should just leave it there?12:25
what if i want to appoint a new remote (and push to it)12:25
remotes/origin*12:25
cbreak delete origin12:25
Industrial: man git-remote12:25
gitinfo Industrial: the git-remote manpage is available at http://jk.gs/git-remote.html12:25
eijk left12:25
Industrial I see12:26
cheers12:26
Industrial left12:26
jn_ joined12:29
eletuchy_ left12:30
jlg13 left12:30
eletuchy joined12:31
chris64 joined12:31
samholmes left12:32
xkb joined12:34
drizzd joined12:37
eletuchy_ joined12:39
spyro left12:39
drizzd_ left12:40
chimay joined12:40
Nevik !rtfm12:41
dahw12:41
i guess that would be a bit impolite anyway12:41
eletuchy left12:42
cbreak Nevik: man git12:42
gitinfo Nevik: the git manpage is available at http://jk.gs/git.html12:42
Nevik cbreak: i would alias !rtfm to @man git, but i learned the other day the bot dont like that :P12:43
gitinfo cbreak: the git manpage is available at http://jk.gs/git.html12:43
Nevik OKAY FINE12:43
dont let me escape that then :P12:44
letharion_ left12:45
ebouchut left12:47
Goles joined12:48
berserkr left12:48
tvw left12:51
marhaban left12:51
GuruShah joined12:54
sobhan joined12:57
ragsagar left12:57
drizzd_ joined12:59
Glados__ joined13:01
Glados_ left13:01
hyperair joined13:02
drizzd left13:02
wrouesnel joined13:02
Goles left13:03
spyro joined13:04
Goles joined13:05
_iron joined13:05
hyperair left13:07
Imaginativeone joined13:10
irqq joined13:14
i42n left13:14
subhojit777 left13:17
Artpicre joined13:17
xkb left13:17
chris64 left13:19
marhaban joined13:20
NetJunky joined13:20
NetJunky Good day everyone!13:21
I would like to confirm, that git takes newly created directory under it's revision only if there is at least one file inside of it.13:22
Am I right?13:22
bremner more or less13:23
g3orge also I think that the file has to have something13:23
bremner that is, git does not track empty directories13:24
letharion_ joined13:24
bremner no13:24
the file has to be tracked (added and committed), but can be empty13:25
NetJunky Seems a bit odd if you ask me. If I look at it historically, then was created at first for revisioning linux kernel. Linux sees every directory as a file with list of references to files, that are inside that directory. Seems logical, that git would see it same way, but no. And that is odd.13:27
bremner the thing about content addressable file systems is you need content to address.13:28
GuruShah left13:28
m0viefreak joined13:29
m0viefreak left13:29
chris64 joined13:29
bremner anyway, it is how it is, I would be surprised to see that change.13:29
rideh joined13:29
GuruShah joined13:29
m0viefreak joined13:29
subhojit777 joined13:30
ebouchut joined13:31
adamben joined13:31
NetJunky Me too, but I would look forward to it. :)13:32
subhojit777 left13:33
marhaban left13:34
bremner offhand I don't see how to do it without changing the git data model. And none of the use cases I know about (mainly people without proper build/deployment processes) are compelling to me.13:36
sq-one left13:36
bremner OTOH, I'm hardly a git internals wizard, so maybe it is more technically feasible than I know.13:36
wermel joined13:37
rednaks joined13:37
ewong left13:37
qdb joined13:39
jbub joined13:39
Artpicre left13:43
tureba left13:44
canton7 I believe the thing holding back empty directory tracking is the merge algorithms being traditionally unable to handle them, and the inability to teach them without breaking backwards repo compaibility13:45
plus not many git contributers actually have a need for empty dir tracking (although I believe it is quite high on the git user survey wishlist)13:46
LeMike left13:47
shreya joined13:49
NiteRain joined13:49
marhaban joined13:50
h0bbit left13:52
milStaja joined13:53
ewong joined13:54
Xethron left13:56
shreya left13:57
cbreak I've never seen the point of empty directories13:57
what are they good for?13:57
rednaks left13:58
bitkiller joined13:59
marhaban left14:00
qdb left14:05
eletuchy_ left14:06
eletuchy joined14:07
h0bbit joined14:08
drizzd joined14:08
sbodo joined14:09
Xethron joined14:10
m1sc_ left14:10
m1sc joined14:11
drizzd_ left14:11
eletuchy left14:11
gitinfo set mode: +v14:12
Bass10 joined14:12
Esa_1 joined14:14
rgr joined14:15
charon bremner: the index doesn't support them as it stands. we'd have to write special entries (remember that dirs are only recorded by the file paths in the index). in the object store it would be easy since every subdir has a tree entry, so you just put an empty tree there14:15
bgerber left14:15
jn_ left14:16
Sky[x] left14:16
bremner charon: thanks for the correction. It occured to me afterwards that empty tree objects were part of the answer.14:16
Esa_ left14:18
Sky[x] joined14:20
Esa_1 left14:22
jbub left14:22
hyperair joined14:22
Desproges joined14:24
Esa_1 joined14:25
tureba joined14:26
chucky_ joined14:26
bgerber joined14:28
chris64 left14:28
chris64 joined14:29
Imaginativeone left14:30
unreal left14:31
Imaginativeone joined14:31
h0bbit left14:33
jbub joined14:36
unreal joined14:37
rednaks joined14:37
eletuchy joined14:37
ShadeTornado joined14:38
claudiu___ joined14:39
sbodo left14:40
adamben left14:41
drizzd_ joined14:43
rednaks left14:46
drizzd left14:46
Virunga joined14:47
eletuchy left14:48
huoxito joined14:49
tjbiddle joined14:49
o] left14:50
JoeAngel_ left14:50
Desproges_ joined14:50
Sigma joined14:51
o] joined14:51
Desproges_ left14:51
herdingcat joined14:52
herdingcat left14:52
herdingcat joined14:53
Sigma left14:56
Imaginativeone left14:58
ewong left14:58
MissionCritical left14:58
ewong joined14:58
herdingcat left14:59
tjbiddle left15:00
Virunga Hi guys15:01
Imaginativeone joined15:01
Virunga And girls.15:02
Goles left15:02
gusnan joined15:02
jbub left15:04
aspotashev joined15:06
Virunga If i remove files in a branch that are present in the master and then i merge the branch with the master, what happen? Will those files be gone?15:07
rob_w left15:07
Xethron left15:08
jbub joined15:08
hoschi left15:09
kukks joined15:12
kukks left15:12
kukks joined15:12
chisler joined15:13
MissionCritical joined15:13
rednaks joined15:13
huoxito left15:14
eletuchy joined15:14
Virunga I tried, the answer is yes.15:14
minusthetiger joined15:15
bgerber left15:15
normanrichards joined15:19
ebouchut left15:19
Adget joined15:20
adamben joined15:20
rednaks left15:21
adb joined15:21
normanrichards left15:22
tewecske joined15:22
DatumDrop joined15:23
eletuchy left15:25
chisler left15:25
Goles joined15:27
DatumDrop left15:27
sbodo joined15:30
bgerber joined15:32
Dr4g joined15:34
rondale_sc joined15:34
RoyK joined15:35
RoyK left15:35
Esa_1 left15:36
stayarrr left15:36
rob_w joined15:37
Leeol left15:38
rednaks joined15:38
trungqtran joined15:40
glennpratt joined15:41
NetJunky Why after unstashing a stash and changing file to way it was before manually gets file to be as modified.15:42
staged unstaged path15:42
1: +0/-0 +0/-0 index.php15:42
It even shows, that now lines where added or removed.15:43
jcao219 joined15:43
ebouchut joined15:43
NetJunky Why is it still marked as modified then?15:43
rednaks left15:44
ubolonton left15:47
rgr left15:48
comps git status15:48
beny joined15:49
jcao219_ joined15:50
jcao219 left15:50
eletuchy joined15:51
Desproges left15:54
Sonderblade joined15:54
vjacob joined15:55
lresende left15:56
vjacob left15:57
cebor joined15:57
madewokherd joined15:58
glennpratt left15:58
rgr joined16:00
rgr left16:01
eletuchy left16:01
rgr joined16:02
Sky[x] left16:02
ebouchut left16:02
ISF joined16:05
jcao219_jcao21916:06
rednaks joined16:08
JaredMiller joined16:13
mark06 joined16:13
trungqtran left16:13
glennpratt joined16:13
mark06 why does the windows download 1.8.0 is called preview?16:14
pantsman joined16:14
pantsman left16:14
pantsman joined16:14
Chillance joined16:14
mark06 why is the windows download 1.8.0 called preview?16:14
infynyxx joined16:15
andrewhl joined16:16
rideh left16:17
rideh joined16:17
ewong left16:17
EugeneKay mark06 - because the msysgit binaries are not adequately tested before release16:17
They are full of fun stupid bugs that you are going to find and cry yourself to sleep about16:18
ewong joined16:18
giallu joined16:19
Gentlecat left16:20
BSaboia joined16:20
JEEB joined16:21
Zeising joined16:22
Zeising is there any way to compile in one git branch and working on another git branch, at the same time, short of cloning the repo twice?16:22
bassliner Zeising: without cloning twice i wouldn't see a way to do that.16:24
Zeising Ok16:24
jargon left16:24
undecim joined16:24
Zeising then I clone again, thanks bassliner16:24
bassliner Zeising: but maybe i just don't know either.16:24
Zeising: but never seen someone working like that so i really think that's not possible.16:24
Zeising bassliner: Sometimes building and/or testing and stuff like that takes time, so it's nice to be able to have one run of it, while still working on fixes someplace else :)16:25
EugeneKay Zeising - there are stupid tricks involving GIT_DIR and GIT_WORK_TREE, but they aren't pretty.16:25
Zeising EugeneKay: then it's probably easier to just clone twice. It's not a humongous repo16:26
EugeneKay You can make one repo a local clone of the other, so you fetch from your local working repo into your build repo, then fire off the process16:26
Zeising oh.16:26
bassliner the latter one seems to make sense to me16:26
Zeising just git clone file://path/to/local foo-clone?16:26
EugeneKay If you fiddle the refspec a bit you can even avoid all of the mess with remote/foo/branch stuff16:26
Yup16:26
Zeising EugeneKay: What mess with remote/foo/branch?16:27
Esa_ joined16:27
EugeneKay Normally in a clone the remote branches get stuck under remotes/origin/master16:27
Your "build" clone can be fiddled-with so that they end up in heads/master directly ;-)16:27
eletuchy joined16:28
CausaMortis left16:28
bassliner Emmycakes: hm, as long as you just check out that branch you're tracking the remote branch anyways, so why bother?16:28
gain joined16:28
CausaMortis joined16:28
CausaMortis left16:28
CausaMortis joined16:28
Sky[x] joined16:29
Zeising EugeneKay: I'm not sure I understand, but I guess I'll notice when I run into trouble. I'm not too used to the nunances of using git.16:29
EugeneKay You'll git it ;-)16:30
rjmt___ joined16:30
Zeising :)16:31
hakril left16:35
Sky[x] left16:37
stayarrr joined16:37
Sigma joined16:39
eletuchy left16:39
trungqtran joined16:39
BSaboia__ joined16:41
mark06 doesn't git track renames?16:44
j416 mark06: git does not track renames.16:44
BSaboia left16:44
lmg_ joined16:44
j416 mark06: it detects renames by looking at the change a commit introduces.16:45
ebouchut joined16:45
mark06 so if I want to see a log for a particular files, it starts and ends between renames?16:46
*file16:47
yshh left16:47
j416 mark06: use the --follow option to git log to follow a file across renames.16:47
e66 joined16:48
mark06 then it does track renames16:49
j416 no, it detects them.16:49
mark06 otherwise how would it know16:49
mishok13 left16:49
thiago joined16:49
j416 git tracks content16:49
if the content is similar enough but it moves between different places, it can follow it16:50
mark06 ok, so on a commit log, it's not indicated that a file is renamed, I should figure it out instead by seeing that a whole file deletion is the same as a whole file addition in same commit?16:50
maletor joined16:50
gain left16:51
j416 mark06: correct. Although it will also detect a rename that is not a 100% match, I don't remember the default similarity threshold. You can set it.16:52
Adget1 joined16:52
Adget left16:53
mark06 awesome, wornderful16:55
--follow is wonderful too16:55
mvensky joined16:55
vu_ left16:57
fanweixiao left16:57
Vert joined17:03
eletuchy joined17:05
BSaboia__ left17:05
Artpicre joined17:07
m0ltar joined17:07
Goles left17:09
smoofra joined17:10
Goles joined17:11
Adget joined17:11
flaguy48 left17:12
Element9 joined17:12
skul left17:13
Adget1 left17:14
Xethron joined17:15
bgerber left17:15
sobhan left17:16
infynyxx left17:16
eletuchy left17:16
smoofra question... is there any tool that would let you track the history of a patch set? Something where you have a branch with each of your patches as ordinary git commits, but you would also have a separate reposotiory who's contents was the patches themselves?17:17
i mean i know you coudl just do this yourself with git format-patch and git am17:17
axl_ joined17:17
smoofra but has anyone made a nice script to automate it17:17
Goles left17:17
bauruine left17:18
bremner smoofra: there is stgit and topgit17:18
sobhan joined17:18
bremner and guilt17:18
marhaban joined17:18
smoofra yea, i've looked at all those17:18
bgerber joined17:20
esing joined17:21
rjmt___ left17:22
mathmonkey joined17:23
mark06 left17:24
smoofra oh well, git format-patch and git-am provide 99% of what i want... it's really just a little bit of script to make the interface more usable17:26
bremner smoofra: there is also git-quiltimport17:27
I'm not sure if that has any real advantages over git-am17:28
wrouesnel left17:28
mvensky left17:28
Artpicre_ joined17:28
milStaja left17:28
bauruine joined17:29
JaredMiller left17:31
quazimodo left17:32
Artpicre left17:32
flaguy48 joined17:33
rednaks left17:33
quazimodo joined17:33
GuruShah left17:34
JohnBat26 joined17:34
marhaban left17:35
shruggar joined17:36
mishok13 joined17:37
ewong left17:37
chucky_ left17:37
m0ltar left17:38
ewong joined17:38
Galaris joined17:40
Glados__ left17:40
Artpicre_Artpicre17:41
sbodo left17:42
Galaris_ joined17:42
eletuchy joined17:43
michaelmartinez joined17:44
Galaris left17:45
ezrafree joined17:46
axl_ left17:52
ebouchut left17:53
eletuchy left17:54
Sigma left17:55
nickpresta joined17:55
Sigma joined17:55
Imaginativeone left17:57
Imaginativeone joined17:57
yshh joined17:57
MrDHat joined17:58
chucky joined17:59
Imaginativeone left17:59
Imaginativeone joined17:59
tjbiddle joined17:59
nioncode left17:59
michaelmartinez left17:59
andygrossman left18:00
braddcadd joined18:00
nickpresta left18:02
yshh left18:02
undecim left18:02
esc is there a good way to delete all branches except for one on the remote side18:04
mlb- left18:04
thiago esc: one by one18:05
AdrienBrault left18:05
braddcadd left18:05
esc too many18:05
i'll script it with git for-each-ref18:05
shruggar left18:10
bgerber left18:11
smoofra left18:13
ebouchut joined18:13
Yuuhi` left18:14
shruggar joined18:14
marhaban joined18:14
tjbiddle_ joined18:15
GuruShah joined18:15
e66 left18:15
SBoudrias joined18:16
ebouchut left18:16
maletor left18:16
tjbiddle left18:18
tjbiddle_tjbiddle18:18
braddcadd joined18:18
nickpresta joined18:18
howlymowly joined18:18
bgerber joined18:18
beny left18:18
CausaMortis left18:19
howlymowly left18:19
CausaMortis joined18:20
CausaMortis left18:20
CausaMortis joined18:20
[pabu] left18:20
fanweixiao joined18:20
maletor joined18:20
sbodo joined18:21
eletuchy joined18:21
Argat joined18:23
x82_nicole joined18:23
rgr left18:24
fanweixiao left18:24
DatumDrop joined18:24
R1KRDO joined18:24
R1KRDO left18:24
R1KRDO joined18:25
flavius left18:25
DatumDrop left18:28
rastar joined18:28
maletor left18:28
rgr joined18:29
eletuchy left18:32
mneorr joined18:34
CausaMortis left18:36
Galaris__ joined18:38
Galaris_ left18:38
undecim joined18:40
fanweixiao joined18:40
amigojapan left18:41
Carlsson left18:42
giallu left18:42
axl_ joined18:44
ebouchut joined18:44
howlymowly joined18:45
mishok13 left18:45
Adget left18:46
MrDHat left18:47
EugeneKay Fetch the one you ant to keep, delete them all remotely, then repush the one you wanted18:49
mercy____ joined18:49
ebouchut left18:50
ampz joined18:51
R1KRDO left18:52
g3orge left18:52
fanweixiao left18:53
ebouchut joined18:53
ebouchut left18:53
saltcod_ left18:55
ewong left18:58
ewong joined18:58
eletuchy joined18:58
pandeiro joined19:00
arietis left19:00
MrDHat joined19:01
MrDHat left19:01
pastime joined19:02
arietis joined19:02
Milossh left19:02
sobhan left19:02
Davey joined19:02
TML left19:03
Dr4g left19:03
meLon left19:03
sobhan1 joined19:04
Vinnie_win left19:04
GuruShah left19:05
saltcod joined19:05
Davey left19:06
meLon joined19:07
pandeiro left19:07
cardguy1000 joined19:07
sie joined19:08
johnthebear joined19:08
Davey joined19:08
cenuij joined19:09
cenuij left19:09
cenuij joined19:09
cardguy1000 I'm trying to install git on my shared web hosting site. I found this tutorial http://joemaller.com/908/how-to-install-git-on-a-shared-host/ and followed it unto the make command. I got the following output on my terminal at this point: http://pastebin.com/J3BgkVYp anyone know how I might fix this?19:09
eletuchy left19:10
bremner cardguy1000: install those header files?19:10
cardguy1000 I'm not sure I follow19:11
thiago you need to install OpenSSL19:11
chris64 left19:13
wrouesnel joined19:13
cardguy1000 Ok, will google install for that. As long as I have SSH access on the shared hosting site should I also be able to install openssl?19:14
nickpresta left19:14
bgerber left19:15
sie left19:15
_adnasa_ joined19:16
_adnasa_ left19:16
thiago yes19:16
_adnasa_ joined19:16
_adnasa_ left19:16
_adnasa_ joined19:17
fanweixiao joined19:17
rondale_sc left19:17
kyledr joined19:17
private joined19:18
cardguy1000 great, thanks guys19:19
Artpicre_ joined19:20
m0ltar joined19:21
obind joined19:21
Artpicre left19:22
fobban joined19:24
BadProphet joined19:24
sobhan1 left19:26
sobhan joined19:27
BadProphet left19:33
wermel left19:33
cardguy1000 Ok I tried to install openssl on my shared hosting site so that I can install git. I downloaded openssl with curl in /src/ untarred it to openssl-1.0.1c then ran make, and finally make install. However I'm getting the following output in terminal can anyone point me in the right direction? http://pastebin.com/NUjrJDh6 (I'm new to linux)19:33
mastro left19:34
EugeneKay If you're new to linux then installing stuff on shared hosting is probably not the best wayto learn. Try buying a low-end VPS someplace with full root access and just use your package manager to do it for you(apt-get install git). I like Linode myself, but the price for the basic model is a bit steep for students, etc.19:34
chimay left19:34
EugeneKay You may be interested to know that AWS will give you a free Micro S3 instance for 1 year, which is plenty capable for basic tasks19:35
s/S3/EC2/19:35
cardguy1000 Yeah, I've got a server I can do this on I'm just trying to use git to download packages for my VIM plugins for my development server19:36
I mean I could of course work around by FTP'ing them up19:36
eletuchy joined19:36
cardguy1000 I'm just hoping to learn it19:36
kwaleDesign joined19:37
drizzd joined19:37
Akufen left19:39
drizzd_ left19:40
cardguy1000 So is that what the message means, I don't have privileges to install it?19:41
khmarbaise_ joined19:42
ivan if I do git clone -b somebranch ../local/repo, how do I avoid getting HEAD if somebranch doesn't exist?19:42
I want a fatal error, not a warning19:42
ehsan left19:42
Carlsson joined19:43
Akufen joined19:43
Akufen left19:43
Akufen joined19:43
khmarbaise left19:44
khmarbaise_khmarbaise19:44
Carlsson left19:47
eletuchy left19:47
JohnBat26 left19:48
Carlsson joined19:49
Akufen left19:51
ivan oh, I just noticed this was changed to be fatal sometime after 1.7.919:51
SirCmpwn left19:54
SirCmpwn joined19:55
SirCmpwn left19:55
eletuchy joined19:55
SirCmpwn joined19:55
SirCmpwn left19:55
rondale_sc joined19:55
DrPoole joined19:55
SirCmpwn joined19:56
SirCmpwn left19:56
SirCmpwn joined19:56
SirCmpwn left19:56
DrPoole_ left19:56
tinti left19:56
SirCmpwn joined19:57
SirCmpwn left19:57
lresende joined19:57
tinti joined19:57
SirCmpwn joined19:58
SirCmpwn left19:58
SirCmpwn joined19:58
SirCmpwn left19:58
SirCmpwn joined19:59
SirCmpwn left19:59
SirCmpwn joined19:59
SirCmpwn left19:59
_Qman joined20:00
SirCmpwn joined20:00
SirCmpwn left20:01
mercy____ left20:03
robotmay left20:04
mishok13 joined20:06
iqualfragile joined20:08
iqualfragile noob here: how do i archive an effect similar to hg pull -u? i want to merge my local changes with upstream20:08
mikef joined20:09
bremner iqualfragile: man git pull, perhaps git pull --rebase20:10
gitinfo iqualfragile: the git-pull manpage is available at http://jk.gs/git-pull.html20:10
bremner or if you know that already, what is it that isn't what you want?20:11
cinderblockcinderblock_away20:12
bgerber joined20:13
iqualfragile bremner: the changes are un commited does that still apply?20:14
kerrick left20:14
lresende left20:15
bremner The best idea would be to commit them. You could also investigate man git-stash.20:15
gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html20:15
Davey left20:15
Zerobeholder joined20:15
robotmay joined20:16
Zerobeholder not sure why but my me:me owned 770 permission directory tree that has been git init'd won't git add . recursively for reasons I don't understand.20:17
bremner !repro20:17
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session. This will help immensely with troubleshooting.20:17
ewong left20:17
bremner or at least tell us the real error message.20:18
normanrichards joined20:18
Zerobeholder there is no error, it just adds the two directories-- but empty20:18
I will get you a cut/paste20:18
ewong joined20:18
robotmay left20:19
sbodo left20:20
Zerobeholder ooh, it is going unresponsive now like it is really doing something...20:20
iqualfragile git-stash works20:21
JaredMiller joined20:22
JaredMiller left20:24
Zerobeholder http://pastebin.com/3BUpwBAx20:24
These are just files I copied into a directory. I chown -R brad:brad * and chmod -R 770 *20:25
Now I will try to clone locally.20:26
akheron Zerobeholder: "Reinitialized existing Git repository..."20:26
so that directory already was under version control20:26
tinti left20:26
Zerobeholder Right I ran the commands over again.20:26
SirCmpwn joined20:27
Zerobeholder Anything worth doing is worth doing wrong a half dozen times... right?20:27
bremner Zerobeholder: by chance are these directories empty?20:27
oh, submodules20:27
run away.20:27
_adnasa_ left20:28
bremner Zerobeholder: did you _intend_ to use submodules?20:28
Zerobeholder http://pastebin.com/1QVDTg7920:29
submodules?20:29
x82_nicole left20:29
Zerobeholder What is a submodule (OFF TO THE GOOGLE!)20:29
bremner you have .git directories in your subdirectories, and by running git add you told it to use submodules. Which you probably don't want.20:30
sbodo joined20:30
Zerobeholder ok, so delete the .git directories and I should be okay?20:30
Bilge sub mod jewels20:31
Zerobeholder No, I just want regular git. This submodule stuff is not any good for me.20:31
Well, maybe it is a really cool feature I don't understand...20:31
The-Compiler left20:31
fanweixi_ joined20:31
hinst left20:32
Zerobeholder Son is awake, thanks for the pointer as to how to google for the solution to my problem.20:32
bremner yes, just delete the .git directory20:33
fanweixi_ left20:34
nitrix joined20:34
axl_ left20:35
sdeyerle left20:35
sdeyerle_ joined20:36
relipse joined20:36
nick_h left20:36
fanweixiao left20:37
rastar left20:39
nick_h joined20:43
Sigma left20:46
TML joined20:46
fanweixiao joined20:46
jdav_gone left20:47
Chillance left20:48
Chillance joined20:48
robotmay joined20:49
m0viefreak left20:50
Anders_J joined20:51
friskd joined20:52
pandeiro joined20:55
phipes joined20:56
h0bbit joined20:56
BD-- left20:57
i42n joined21:01
esing left21:03
pandeiro left21:05
PaulCapestany joined21:06
iqualfragile1 joined21:12
wrouesnel left21:13
phipes left21:13
iqualfragile left21:13
i42n left21:15
arietis left21:16
fanweixiao left21:17
i42n joined21:18
john3 left21:18
JoeAngel_ joined21:19
worksgd joined21:19
NetJunky Guys could anyone help with submodules?21:20
I don't quite understand why they aren't working as I thought they should.21:21
thiago we may21:21
john3 joined21:21
NetJunky So both my repos are local and private, so they are located only at my PC.21:21
angelsl left21:22
thiago ok21:22
NetJunky In one of them called "git submodule add /path/to/dir/with/another/repo name_for_submodule_in_my_dir"21:22
LeMike joined21:23
m0ltar left21:23
NetJunky So after calling it first time it told me21:23
$ git submodule add /path/to/dir/with/another/repo test21:23
fatal: You are on a branch yet to be born21:23
Unable to checkout submodule 'test'21:23
thiago go to /path/to/dir/with/another/repo and do a git log21:24
does it print anything?21:24
NetJunky sure it does21:24
it is my another project21:24
it has few commits already21:24
thiago but in the superproject, it's still empty?21:24
camt joined21:25
zivester left21:25
Artpicre_Artpicre21:25
NetJunky After first time call it gave me a fatal as you see, so there is no submodule, but after calling same time same command it gave me that:21:26
$ git submodule add /path/to/dir/with/another/repo test21:26
Adding existing repo at 'test' to the index21:26
warning: LF will be replaced by CRLF in .gitmodules.21:26
The file will have its original line endings in your working directory.21:26
m0ltar joined21:26
NetJunky Why did it work seconf time and not the first time?21:26
zivester joined21:26
thiago I don't know21:26
NetJunky But this is not the whole issue.21:26
After it did work git submodule init or git submodule update didn't do anything21:27
fanweixiao joined21:27
NetJunky submodule directory stays empty21:27
JoeAngel__ joined21:27
fanweixiao 21:27
JoeAngel_ left21:28
thiago so it didn't check out21:28
try git submodule update21:28
avpx joined21:28
NetJunky it did create .gitsubmodule and it did create directory test, but it is empty21:28
fanweixiao left21:29
pandeiro joined21:29
NetJunky As I said before I tryed update and init, but there was no reaction to any of that.21:29
lb_ joined21:29
jdav_gone joined21:30
NetJunky So now I'm confused how to work with them locally, since examples in the book show only the work with remotes, but I thought it should be same.21:30
Sky[x] joined21:30
irqq left21:31
SuperrMann joined21:32
ehsan joined21:33
lresende joined21:34
tureba left21:34
nlogn left21:34
tureba joined21:37
ewong left21:37
NetJunky If anyone had such issues or can explain such behavior it would be awesome.21:38
ewong joined21:38
thiago it should be the same21:38
NetJunky Could you try to reproduce?21:39
Are you using windows?21:39
Dreamer3 left21:39
thiago not using windows21:40
NetJunky ^(21:40
:(*21:40
friskd left21:40
friskd joined21:40
thiago I don't see why anyone would willingly choose to use windows...21:41
offby1 me neither21:41
Dreamer3 joined21:41
offby1 The only good reason to use Windows is that you're forced to interoperate with other people who use Windows.21:41
thiago yeah, I use it to run outlook and lync21:42
that's all21:42
when I need to build, I pull from my linux machine (actually, fetch + reset)21:42
h0bbit left21:43
dvide left21:44
i42n left21:44
i42n joined21:45
lb_ left21:45
N256 joined21:48
dwmw2_gone left21:48
etcetera joined21:48
longbeach left21:50
guns joined21:51
g_bleezy joined21:53
NetJunky It is all great and everything, but the issue with submodules on my side still remaines at large.21:55
ISF left21:55
valgrindGuest2791921:56
cbreak issue?21:56
dwmw2_gone joined21:57
cbreak the main issue with submodules is usually that they are not the solution to the problems people think they solve.21:57
g_bleezy left21:58
NetJunky @cbreak: I have a framework I'm developing in one repo and project I need to base upon it in the other repo, so how it is not a solution?21:58
cbreak "base upon it"?21:59
NetJunky I need some directory (submodule) to be inside my project and contain framework, but at the same time I need framework to be a separate project.22:00
base on it*22:00
cbreak that'll work fine.22:00
as long as you are happy with strong binding22:00
NetJunky But it doesn't22:00
cbreak why not?22:01
[Gingersnap] joined22:01
NetJunky I will copy dialog from above for you and paste a link here.22:01
Actually the main issue is that.22:01
http://pastebin.com/XThEThKf22:01
cbreak sounds like windows issues22:02
well, the first seems to be that you weren't on a real branch yet22:03
after an initial commit, that problem should have vanished22:03
the other is probably line ending conversion22:03
NetJunky Well it isn't master, but it is real22:03
cbreak disable it and ensure that only LF gets ever committed22:03
a branch isn't real until it points to a commit22:03
tinti joined22:03
cbreak branch yet to be born means that HEAD points to a non-existing other branch, like after a git init or a git checkout --orphan22:04
etcetera left22:04
NetJunky It had several commits on it22:04
cbreak hmm...22:04
weird.22:04
what you also have to watch for is that the path you use for submodule add is externally reachable22:05
NetJunky What do you mean by externally?22:05
cbreak if someone clones your main repository22:05
NetJunky Both projects are on my PC at home.22:05
cbreak he has to have access to all submodules22:05
cybersphinx joined22:06
NetJunky Projects don't have remotes and never will22:06
cbreak hmm. Ok.22:06
pastime left22:06
cbreak well, the submodules will have a remote22:06
NetJunky So since they aren't on server they will not be cloned and will not be reachable by others.22:06
cbreak the one you specify at submodule add22:06
NetJunky @cbreak: why submodule will have a remote?22:07
cbreak because they are cloned from the remote22:07
apok left22:07
cbreak and that remote is also entered into .gitmodules22:07
and later .git/config22:07
apok joined22:07
NetJunky So even thou it is on my pc the submodule itself will have a remote to it's original location.22:08
Right?22:08
cbreak yes22:08
NetJunky Okey. Got it.22:08
Well I will try again from clean slate22:09
Error404NotFound left22:09
Imaginativeone left22:09
the_cybersphinx left22:10
NetJunky Trying to update TortoiseGit22:10
Maybe this is issue is solved with update.22:11
valgrind joined22:11
cbreak eeew22:13
NetJunky left22:14
lmg_ left22:14
x82_nicole joined22:14
mastro joined22:14
wagle_wagle22:14
_iron left22:15
bgerber left22:15
lresende left22:16
bgerber joined22:16
offby1 yeah, well.22:18
You give 'em books, and you give 'em books; but they just chew on the covers.22:19
a-l-e left22:19
Carlsson left22:20
Goles joined22:23
Error404NotFound joined22:23
flijten joined22:24
flijten left22:24
i42n left22:26
cbreak offby1: maybe they are just book cover worms.22:26
Xizor left22:27
mcdebugger left22:27
verxion joined22:30
WinstonSmith left22:30
WinstonSmith joined22:32
Samual left22:32
Argat left22:32
rob_w left22:33
Goles left22:33
Argat joined22:33
Argat left22:34
Argat joined22:34
valgrind left22:36
apok left22:36
worksgd left22:38
NetJunky joined22:39
valgrid joined22:41
NetJunky @cbreak: so one more time. Would that be a proper path for a repo when adding it as a submodule22:41
$ git submodule add /C/users/Fidel/work test ?22:41
cbreak if you don't care about portability, and work is the repository22:42
valgrid left22:42
NetJunky Or should there be maybe .git at the end, or file:// protocol?22:42
Samual joined22:42
cbreak what ever you like more. the .git is mandatory if the name contains the .git22:42
it's part of the name22:42
valgrind joined22:42
cbreak file:// makes git not use hard links22:43
so you'll have more hard disk space usage22:43
NetJunky Didn't quite get the last part.22:43
cbreak although I doubt that hardlinks are even supported on windows22:43
NetJunky about .git22:43
cbreak if the directory is work22:43
then you have to use work22:43
if the directory is work.git22:43
NetJunky I see. Okey.22:43
cbreak then you have to use work.git22:43
something.git is normally used on bare repositories22:44
howlymowly left22:44
PaulCapestany left22:45
NetJunky @cbreak: okey I'm cluless how to work with that behavior https://gist.github.com/430004322:46
cbreak type git branch -a22:47
and show the result in a pastebin22:47
both in your current repository22:47
and the submodule you try to clone22:47
NetJunky gist is bad?22:47
cbreak doesn't matter22:48
it's a pastebin as well22:48
chucky left22:48
cbreak as long as it's not here in the channel :)22:48
NetJunky Same link22:48
cbreak oh, and git rev-parse HEAD too22:49
and both from the submodule's repo too: /C/Users/Eugene/Desktop/tmp_git22:49
NetJunky Okey. 1 sec.22:49
buggaboo joined22:49
buggaboo left22:49
cbreak (I think you can use relative paths for submodules)22:49
moondoggy left22:49
EugeneKay Mrh?22:49
JoeAngel__ left22:50
Davey joined22:50
ehsan left22:50
NetJunky @cbreak: same link again22:51
j416 left22:51
Artpicre left22:51
cbreak that's not the right one22:52
NetJunky I see, that it didn't get the repo for submodule, but why I don't get22:52
cbreak you have to cd to the submodule22:52
NetJunky I did22:52
Artpicre joined22:52
cbreak because you have to go to the repository of the submodule22:52
go to /C/Users/Eugene/Desktop/tmp_git22:52
that's the submodule you want to clone22:53
NetJunky So when I do cd to submodule it should transfer me automatically?22:53
stayarrr left22:53
cbreak no22:53
why should it?22:53
pantsman left22:53
Cassiel left22:54
RichardBronosky_ left22:54
NetJunky I've just didn't understand your comment about cd, since I did go inside my submodule directory22:54
cbreak no22:54
cd to /C/Users/Eugene/Desktop/tmp_git22:54
RichardBronosky joined22:54
NetJunky Okey22:54
cbreak that's the repository of the submodule22:54
that's the one you try to git submodule add22:54
eletuchy left22:54
cbreak it must have a valid history to clone22:55
otherwise it won't work22:55
eletuchy joined22:55
NetJunky F5 on the link22:56
cbreak F5?22:56
NetJunky As I said before this other repo is valid as well22:56
Refresh the link22:56
I've updated and pasted the result22:56
cbreak hmm.22:56
git clone of the submodule failed22:56
wonder why22:57
OMGOMG nthuu22:57
cbreak did you create a test directory already?22:57
Artpicre_ joined22:57
ewong left22:57
NetJunky nope, there was only on dir in main project /lib22:57
one*22:57
cbreak hmm.22:58
rm -rf test then, and try to add again22:58
Artpicre left22:58
NetJunky I should probably remove .gitsubmodule as well, right?22:58
ewong joined22:58
cbreak maybe. I don't think so.22:59
more likely you'd have to do git rm --cached test22:59
ampz left23:00
fisted left23:00
marhaban left23:00
eletuchy left23:00
rideh left23:00
fisted joined23:01
NetJunky Interesing. So first time I ".. submodule add .." it doesn't create .gitmodules file, but if I call it two times in a row it adds '.gitmodule' file two. Very odd behavior23:02
cbreak the .gitmodules file isn't that important23:03
more important is wether the submodule was created23:03
and the entry in the tree is done23:03
(see git status for example)23:03
NetJunky https://gist.github.com/430025023:04
There is newer version of msysgit23:04
Git-1.8.0-preview20121022.exe23:04
But only "Featured Beta"23:05
sbodo left23:05
cbreak something fails when cloning the submodule23:05
can you try to do that yourself?23:05
git clone /C/Users/Eugene/Desktop/tmp_git test23:05
NetJunky Sure. One moment23:06
cbreak (after removing test)23:06
EugeneKay STAY OUT OF MY DESKTOP DAMNIT23:07
sbodo joined23:07
Davey left23:08
chucky joined23:08
NetJunky @cbreak: https://gist.github.com/430030823:08
tplaner on github, do you have to fork a repo in order to submit a pull request?23:09
NetJunky So that works fine23:09
cbreak now, try to submodule add again23:09
it should try to reuse the existing repository23:09
EugeneKay tplaner - yes23:09
NetJunky @tplaner: if you haven't got the write access23:09
cbreak tplaner: you can also do a normal pull request23:09
apok joined23:09
cbreak without doing it via github23:09
but you'll need a repository where they can pull from23:10
NetJunky @cbreak: you were right. Update last link.23:11
@cbreak: but it souldn't work like that, right?23:12
cbreak it should work both ways23:12
tplaner pardon my ignorance, but doesn't that seem sort of repetitive? shouldn't a push to the remote master branch automatically act as a pull request on that repo?23:12
cbreak but it's weird that you used different URLs23:12
it's weird that you still have enabled those stupid windows line ending conversion routines23:12
and it's weird that it failed without cloning manually23:12
tplaner: no.23:13
apok left23:13
infynyxx joined23:13
cbreak tplaner: what you do with your repositories is of no concern to anyone else23:13
and no consequence either23:13
johnw joined23:13
NetJunky @cbreak: so in the end all of it is weird :)23:13
cbreak they are all separate23:13
mostly windows things NetJunky :)23:13
I'd blame tortoise or windows. But I have no evidence.23:13
NetJunky @cbreak: I can't fix that. I need windows to be the main system, since it is needed for my day-to-day work.23:14
@cbreak: and since I'm not a mac user.23:14
relipse can any programmers paid hourly please test out my new time-tracking website: https://cworklog.com23:15
cbreak I heard rumors that git works on linux too.23:15
danie514 joined23:15
NetJunky @cbreak: rumors might be true :), but then will need to setup a server. Since my Ubuntu server is rungin on vm under windows.23:16
Goles joined23:16
NetJunky @cbreak: the main thing, why I thought to use git is that I heard it is simple, but it seems to me, that it is really raw on windows.23:17
cbreak I rarely use it on windows23:18
(since I rarely use windows)23:18
but from what I've seen it mostly works23:18
gitinfo set mode: +v23:18
danie514 Hello. I combined four commits into one using "git rebase HEAD~4" as explained here "Updates were rejected because the tip of your current branch is behind". Now I need help sorting this out.23:18
cbreak there are just some dumb windows things like this line ending conversion crap23:18
Artpicre joined23:18
cbreak or some things windows can't do that aren't of huge consequence23:18
danie514: well. How about pulling?23:19
or did you rewrite published history?23:19
avpx danie514: Have you rebased commits that were already pushed publically?23:19
toothrtoothrot23:19
danie514 cbreak: I am scared my changes get lost. avpx: Yes.23:19
normanrichards left23:19
avpx danie514: Okay, you really really should not do this23:19
cbreak pulling never loses changes23:19
SuperrMann left23:20
cbreak pulling will merge the original four commits with your current state23:20
after that, you will be able to push23:20
avpx But wait, he said he's rewritten public history23:20
cbreak yes. it'll work23:20
it will look nasty23:20
and the public history rewrite will be worthless23:20
but it'll work23:20
avpx Well yes.23:20
But why rewrite at all then?23:21
cbreak that's the question he'll have to answer.23:21
rewriting public history comes at considerable cost23:21
(mainly dealing with all the people that already have that public history)23:21
avpx Indeed. That's why I was advising him not to push that23:21
Artpicre_ left23:21
danie514 cbreak: I work on a local fork, that only me uses.23:21
fuzzybunny69y joined23:21
avpx danie514: Ah.23:22
Galaris__ left23:22
danie514 so i think its not too bad23:22
avpx Then perhaps you want to push -f23:22
tinti_ joined23:22
Galaris__ joined23:22
avpx IF, that is, the origin doesn't have any commits you'd be abandoning23:22
cbreak force pushing will kill history23:23
avpx Again, your choice, but you can just point the upstream at the rewritten history and not merge23:23
But yes, it will kill the commits you left behind on that upstream branch23:23
Galaris__ left23:24
Galaris__ joined23:24
danie514 Okay, let me understand what you wrote, it's complicated :)23:24
(and with that I mean, I must read it calmly)23:24
NetJunky @cbreak: but when do you work on windows and use git, did ever come across this issue with submodules?23:25
cbreak nope.23:25
I've never added submodules on windows.23:25
NetJunky Ou. I see.23:25
eletuchy joined23:25
avpx danie514: I do think that if you're unsure, you should avoid rewriting public history.23:26
mcdebugger joined23:27
danie514 avpx, what do you mean by "the origin doesn't have any commits you'd be abandoning"?23:27
cardguy1000 left23:28
avpx danie514: I mean that, if your upstream branch has some commits your history doesn't, and you do a "git push -f", you will lose those commits.23:28
ozette_ joined23:28
cbreak chances are you want to lose them23:28
but if you don't23:28
then you're fucked.23:28
m0ltar left23:29
danie514 Ah, okay.23:29
cbreak every single commit on the remote will be replaced with the history you push23:29
no fast forwarding, no merging, no anything23:29
danie514 I understand.23:29
May I quickly explain, what I wanted to achieve, and why.23:29
avpx NO! I mean yes.23:29
marhaban joined23:30
marhaban left23:30
m0ltar joined23:31
danie514 First, I still play around with git. I forked a repo and work on a branch to update some code. I did four bigger changes, commited them and pushed them to my origin. Now, it's a bit hard to have to look through 4 commits on github, where sometimes I have changes in one function over three commits *g*. That's why I wanted to merge the four commits into one commit and update Github to show only one big commit, instead of four totally23:32
messy ones.23:32
What options would I have instead of rewriting that history (that, as far as I know, is no problem, if I am the only working person on that fork).23:34
mikef left23:35
apok joined23:36
cbreak making a new branch23:36
danie514 I made a new branch before starting work.23:37
gitinfo set mode: +v23:39
verxion I'm having trouble with pass 2 of cvs2git23:39
anyone familiar with cvs2git?23:39
avpx danie514: If it's your fork and only you have been or will be working on it, rewriting and then using a force push (git push -f) is fine23:39
danie514 Okay.23:40
:)23:40
thanks23:40
pandeiro left23:40
verxion This is what I am getting during pass 2 of cvs2git: http://pastebin.com/1ZzT4aLC23:40
pandeiro joined23:41
rondale_sc left23:41
verxion I'm not clear on how to begin with pass 2 again23:41
it always seems to start with pass 1 no matter what I do23:41
rondale_sc joined23:42
offby1 verxion: I don't know how to use cvs2git, but it's possible that "reposurgeon" does the same thing, better23:42
alfplayer Can I output the diff of a single commit (only the diff) specifying the commit in only one argument? git show --format=%b outputs blank lines before each file and the patch command fails when the diff is passed23:42
mcdebugger left23:43
sbodo left23:43
verxion offby1: true to your name, you were off by one. reposurgeon doesn't work with cvs. :)23:44
avpx left23:45
offby1 drat23:46
p3rror joined23:46
p3rror left23:46
p3rror joined23:47
verxion ok, contrary to the docs, you cannot specify "END" as a pass23:47
but I did a "-p 2:9" and it is trying again now23:47
NetJunky @cbreak: seems that I found an issue23:48
@cbreak: regarding submodules on windows23:48
it has a problem with clongin into specified directory. Passing just "$ git submodule add file:///C/Users/Eugene/Desktop/tmp_git" without test at the end worked fine.23:49
At least for submodule23:49
Normal repo cloning works fine.23:50
mneorr left23:50
cbreak maybe windows doesn't support directories named test?23:50
EugeneKay I will eat the head ofthe next person I find in my Desktop23:50
trigen joined23:50
Chibby joined23:50
NetJunky I think, that maybe there is an issue with rights for creating a directory that way.23:51
but I might be wrong.23:51
trigen left23:51
Targen joined23:56
valgrind left23:58

Logs Search ←Prev date Next date→ Channels Documentation