IRCloggy #git 2010-07-27

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.

2010-07-27

← Gitzilla left00:03
← andyj left00:04
← bcardarella left00:05
→ s0ber_ joined00:05
← s0ber left00:06
→ Tuller joined00:06
→ emmanueloga joined00:06
→ bcardarella joined00:08
→ Bucciarati joined00:08
← Yuffster left00:09
→ Yuffster joined00:09
← CarlFK left00:12
← sammcd left00:12
← tjholowaychuk left00:13
← justin-george left00:14
← brosner left00:15
← Tuller left00:15
← dreiss left00:17
← gsan left00:17
→ \mjd joined00:18
\mjd I just noticed that when git saves a tree that contains a symlink, it uses mode 120000, and records the linked-to path as the blob content.00:19
Has it always done that?00:20
← zeropointo left00:20
← Adriannom left00:20
\mjd I had some weird notion that the symlink would be recorded the same as if it had been an identical copy of the linked file.00:20
Which on further reflection is not only a bad idea, but also impossible to implement.00:21
→ MacHat joined00:21
← eighty4_ left00:21
→ eighty4 joined00:22
sitaram ju2wheels: ping00:22
← didlix left00:23
sitaram ju2wheels: projects list? the one used by gitweb? that goes by read access to the special "gitweb" user, not "C". Also you will want the latest pu for wildcard-ed "R = gitweb" to work, I think00:23
→ dna joined00:24
→ Tuller joined00:24
← engla left00:25
→ droolingmnky joined00:28
← AAABeef left00:29
← beni- left00:31
← steveire left00:35
← hipe left00:35
→ welly joined00:36
→ hagebake joined00:36
← hagebake left00:36
→ hagebake joined00:36
← hagabaka left00:37
← sh1mmer left00:37
← kenichi left00:38
→ steveire joined00:39
← steveire left00:39
→ steveire joined00:39
← MacHat left00:41
→ rorist joined00:42
ProLoser|Work how hello00:43
← intripoon left00:43
→ jrmuizel joined00:44
← jrmuizel left00:44
→ ajpiano joined00:45
← Alagar left00:46
→ abgrilo joined00:47
← ProLoser|Work left00:49
← frakturfreak left00:50
→ torben_ joined00:50
→ developernotes joined00:51
← developernotes left00:51
← torben left00:52
← droolingmnky left00:52
← bcardarella left00:53
→ sh1mmer joined00:54
→ steph021 joined00:55
→ schlortoo joined00:55
neurodamage what does rebasing in git mean exactly?00:56
→ pedrobelo joined00:57
davr neurodamage: basically it takes commits and moves them to a new location. there's an explanation here: http://progit.org/book/ch3-6.html00:58
→ droolingmnky joined00:58
davr if you don't already understand the basics of git & merging, go back and read those chapters on that site00:58
← pedrobelo left00:59
← Tuller left01:00
→ frakturfreak joined01:02
← tildeequals left01:03
→ flaguy48 joined01:03
→ dreiss joined01:06
← droolingmnky left01:06
← iruediger left01:07
→ secoif joined01:08
→ hebz0rl_ joined01:09
← sagsousuke left01:09
← jtdowney left01:11
→ jtdowney joined01:11
← hebz0rl left01:11
→ Vampire0_ joined01:11
← Chaser_ left01:11
→ justin-george joined01:12
← zenazn_ left01:12
← d0k left01:14
← Vampire0 left01:14
→ bradallen137 joined01:14
← justin-george left01:15
← dreiss left01:15
← jtdowney left01:16
← henkboom left01:17
→ Tuller joined01:18
→ henkboom joined01:20
← henkboom left01:21
← hobodave left01:21
→ henkboom joined01:24
← drako left01:24
→ Chaser_ joined01:24
← vals_ left01:25
← dr_win left01:26
← Yuffster left01:27
← Bombe left01:28
→ Yuffster joined01:28
→ tango_ joined01:29
→ Bombe joined01:29
← hyperair left01:30
→ mFacenet joined01:31
← Vampire0_ left01:32
cpg|away → cpg01:33
→ thwart joined01:33
→ ignatp joined01:33
→ hyperair joined01:35
→ tildeequals joined01:36
→ brizly1 joined01:38
← brizly left01:39
← aziz left01:40
← kpreid left01:41
← tobiassjosten left01:41
← thwart left01:41
→ thwart joined01:42
← TML left01:42
→ stringoO joined01:43
→ guilhermeblanco joined01:43
→ andrewl joined01:43
← dropdrive left01:44
→ TML joined01:45
← schlortoo left01:46
→ schlortoo joined01:46
← sh1mmer left01:47
← bradallen137 left01:48
→ thiago joined01:49
← entrigan left01:49
← johnw left01:50
vinse i pushed a new branch to a shared repo with a typo in the name. no one's pulled it yet, how can i delete?01:50
jjuran vinse: git push repo_name :branch_name01:53
frogonwheels vinse: I just did this with a tag.. look at man git-branch01:53
Gitbot vinse: the git-branch manpage can be found at http://git.or.cz/man/git-branch01:53
frogonwheels err. git-push01:53
yeah - what jjuran said.01:53
← tar- left01:53
frogonwheels vinse: if you look at man git-push and search for 'Pushing an empty'01:54
Gitbot vinse: the git-push manpage can be found at http://git.or.cz/man/git-push01:54
← eighty4 left01:54
→ Vampire0 joined01:54
vinse ugh, some one else went and deleted it directly at the shared repo01:55
so it's gone from tehre, but it's still showing up int he local repo when i do git branch -a01:55
frogonwheels vinse: you can just delete it locally then01:56
vinse yes, i did that first. what's still showing up in branch -a is origin/bad_branch01:56
this is where i get confused. that's just the local ref?01:57
because it's not actually on origin anymore, so why is that still in the list?01:57
jjuran vinse: git remote prune repo_name01:57
frogonwheels that's still a local branch - it just refers to where the remote branch should be up to.01:57
vinse but git branch -D origin/bad_branch didnt seem to work01:58
frogonwheels vinse: see jjuran's thing.01:58
vinse oooh01:58
frogonwheels vinse: they are protected from users using them as a normal branch.01:58
vinse git prune -n has no output02:00
what if i just do plain ol' *nix rm on the file in refs?02:01
← schlortoo left02:01
vinse that seemed to do it.02:03
so if i had done: git branch -D bad_branch; git push origin :bad_branch02:04
that would have done the trick?02:04
what is the colon about? is that this whole "refspec" thing i've been avoiding actually understanding?02:04
← tongueroo left02:06
← Elfe left02:06
→ Elfe_ joined02:07
→ AngryParsley joined02:08
AngryParsley how do I get git diff to show only one change since a revision?02:09
git diff 14e496d2588d311e7e67d9ba4a88e81f9125455e shows all changes since 14e496d2588d311e7e67d9ba4a88e81f9125455e02:09
I want to see the change between 14e496d2588d311e7e67d9ba4a88e81f9125455e and the revision before that02:10
mmattice -n 1 ?02:10
oh, that'd work for git-log02:10
git diff 14e496^?02:10
← abgrilo left02:10
→ Mage joined02:10
mmattice or 14e496^ 14e49602:10
← parasti left02:11
→ entrigan joined02:11
← stringoO left02:11
AngryParsley ah, that last one works02:11
can I somehow not repeat myself there?02:12
mmattice diff between a commit and the same commit?02:12
AngryParsley oh, git show 14e496 seems to work02:12
→ Eaven joined02:14
← Tuller left02:14
AngryParsley mmattice: it just seems reasonable to have shortcuts for previous/next revisions02:14
← friskd left02:18
ju2wheels sitaram: crap, sorry i just noticed you said something to me like 2 hrs ago. Yes i was referring to the one used by gitweb. Im using the same type of wildcarded repo as I had on my initial test box, the only difference is I added CREATOR to the repo. I do have R = gitweb as a rule but the repos of the form /pub/CREATOR/..* never get added to the projects.list file. I may have to try pu after all on this server then and see what happens.02:18
→ Heimidal joined02:20
→ cytrinox_ joined02:20
Ilari ju2wheels: And one can't have seperate wildcard rule to cover those (I don't remember if it works or not)?02:21
← cytrinox left02:24
cytrinox_ → cytrinox02:24
← ilteris___ left02:24
→ kpreid joined02:25
→ hilikuz joined02:28
hilikuz is there a way i can ignore the whitespaces when I push the repositories?02:29
→ justin-george joined02:29
← kpreid left02:30
Ilari hilikuz: No. Push always copies branches exactly, it does not merge.02:30
→ ilteris___ joined02:32
blueshift whitespace problems are evil insidious things02:32
ju2wheels llari: yea i just tried separating the wildcard rule out into /pub/..* for R=gitweb and /pub/CREATOR/..* for the rest and it complained about two matching regex. Im not sure if its my regex with the CREATOR in it thats at issue or if maybe its not kicking off the hooks properly on push.02:33
→ gu1l7y5p4rk joined02:34
← flaguy48 left02:35
→ Bass10 joined02:35
← gu1l7y5p4rk left02:36
← Bass10 left02:37
← fod left02:38
→ Bass10 joined02:38
steph021 hello, i need some help with gitolite access permissions. Is there a way to make a repo readable to the public? I know I can use @all but that is only for users that have a ssh pub key in gitolite already.02:41
→ kpreid joined02:41
← unreal left02:43
→ unreal joined02:43
→ yngress_ joined02:43
← yngress left02:43
bremner steph021: yes, look for gitweb and git-daemon in the docs02:44
(the gitolite docs that is)02:44
steph021 bremner: ok thanks02:45
← rorist left02:45
→ shiba_yu36 joined02:46
← Yuffster left02:52
→ Yuffster joined02:52
← Theravadan left02:53
steph021 bremner: so i edited my gitolite.conf to give the user "daemon" R access for one of my repo's. When i try to git clone from a remote client I get prompted for a password still.02:54
→ rgr joined02:55
→ MacHat joined02:55
→ tongueroo joined02:58
← slonopotamus left02:58
← ju2wheels left02:59
← mar77i left02:59
← Dave^| left03:00
→ Dave^| joined03:00
← kpreid left03:02
← henkboom left03:03
← mFacenet left03:04
→ henkboom joined03:04
← jd00z left03:04
→ lightcap joined03:05
← lightcap left03:05
← Yuffster left03:06
→ Yuffster joined03:06
→ rchavik joined03:08
← Dave^| left03:09
→ aeioyou joined03:14
← coderdad_ left03:15
→ coderdad joined03:16
Ilari steph021: The URL is incorrect. git:// does not prompt for password.03:16
← rgr left03:16
← name left03:17
steph021 Ilari: when i use git:// i get a connection refused error message03:17
← guilhermeblanco left03:17
Ilari steph021: You don't have git-daemon there or the connection is blocked.03:18
→ guilhermeblanco joined03:18
steph021 Ilari: in the gitolite.conf file is the user "daemon" or "git-daemon" ?03:19
← aresnick left03:20
← coderdad left03:20
Ilari steph021: Its 'daemon', but the 'connection refused' is not caused by that.03:21
steph021: Is 'git daemon' running as gitolite user on that machine?03:21
sitaram (or umask set loosely so other users can read?)03:25
→ hearit joined03:25
→ mobidroid joined03:25
sitaram steph021: just to clarify, see http://github.com/sitaramc/gitolite/blob/pu/doc/2-admin.mkd#specifying_gitweb_and_daemon_access especially the part that starts with "Note that gitolite does not..."03:25
steph021 sitaram: ok i must have missed that part. let me try this again thanks03:27
mobidroid Hi there fellow humans, I must be completly retarded but I assume that if i put bin or bin/* or bin/**/* in my .gitignore the file in the bin folder wont show when I type git status. What i'm doing wrong? (the .gitignore file must be at the root of the project right?)03:27
← krawek left03:27
← Bass10 left03:28
mobidroid argg i really dont it :(03:30
→ kpreid joined03:30
→ Limb joined03:30
mobidroid even if i type all the file in the git ignore the file dont seem to have a effect on the git status, anyone have seen this here?03:31
← thwart left03:31
→ adrianomelo joined03:32
← adrianomelo left03:33
mobidroid I feel very weak to not get this... i look like to simple03:33
cpg → cpg|away03:34
mobidroid to the point that none of the 618 persons on this chanel can answer :S03:34
It look*03:34
frogonwheels mobidroid: be patient.03:34
mobidroid: have the files been added to git?03:34
blueshift mobidroid: giving up in 7 minutes? wow03:34
mobidroid frogonwheels: hehe yeah i'll try be patient ;)03:35
frogonwheels mobidroid: it's kinda a dead time. think about what timezones are awake!03:35
mobidroid frogonwheels: well yes because they are all flaged modified in the status03:35
frogonwheels mobidroid: you can't ignore stuff which is in the index.03:35
mobidroid: well you can, but it's more difficult, and requires a newish git.03:35
mobidroid frogonwheels: yeah i know i was more kiding than anything else :P03:36
frogonwheels: Hmm so i need to remove them from the index?03:36
← ruskie left03:36
frogonwheels mobidroid: if you put them in git at some point, they're in the index.03:37
→ ToxicFrog joined03:37
ToxicFrog Sanity check: git preserves the +x status of files, right?03:37
← MacHat left03:37
frogonwheels ToxicFrog: I'm 99% sure it does.03:38
ToxicFrog: there's a mode mask when you add it to the index.03:38
mobidroid frogonwheels: Hmm ok, so if i flush all .git folders and reinit using the .gitignore it should do the trick?03:38
ToxicFrog Ok. Because I have a bunch of new +x files here, that when staged for add are reported by git gui as "new file mode 100644"03:38
frogonwheels mobidroid: is this a new repo?03:38
mobidroid frogonwheels: yeah i just switched over svn03:39
frogonwheels mobidroid: and you're not using the svn history?03:39
mobidroid frogonwheels: bah ill branch from there so the history will burn like the alexandria library03:39
frogonwheels lol.03:40
sure - then start again :)03:40
mobidroid frogonwheels: aye captain, let's burn everything :P03:40
frogonwheels mobidroid: if you've got commits in there..03:40
mobidroid: apart from the initial one .. you can always either save them as patches and apply them on thebase..03:41
mobidroid: or use man git filter-branch to expunge the files from history03:41
mobidroid a file named like this .#.classpath is created by git or it's remaning mess from svn?03:41
frogonwheels mobidroid: it could be a fun training exercise on using git filter-branch03:41
mobidroid: all stuff git creates is in .git03:42
← thiago left03:42
mobidroid frogonwheels: I already love git then ;)03:42
frogonwheels mobidroid: there are good examples of where the size of all the .svn dirs is double or more the size of the .git dir of the same (exported) project03:43
mobidroid frogonwheels: svn is really a pain especially when copying folder, 20 min copy delay of .svn overhead03:44
frogonwheels mobidroid: :)03:44
mobidroid frogonwheels: it work like a charm no more vilain bin folder on the radar03:45
→ krawek joined03:45
mobidroid frogonwheels: you must now accept my Thanks03:46
frogonwheels mobidroid: i will :)03:46
mobidroid good good hehehe, git commit my thanks then :P03:46
frogonwheels mobidroid: you can be quite generous with .gitignore - if there's an exception or two.. you can git add them explicitly.03:47
Ilari mobidroid: That file looks like Emacs autosave backup file.03:48
→ hohoho joined03:48
mobidroid Ilari: the .# files?03:49
Ilari mobidroid: Yes.03:49
mobidroid: Perhaps some other editors name them the same, dunno.03:49
mobidroid Ilari: i was investigating these mysterious files... I think it's from the android SDK i got some synapse in my brain that tell me the last time i removed these files i cried since they where containing precious stuff03:49
← sftp left03:50
mobidroid frogonwheels: well basicly bin/* and gen/* will fit my need for now. I think we should add this note in the git for the lazy (section gitignore) Note: If files are already indexed you can't ignore them anymore (or something meaning like it)03:51
Ilari mobidroid: Anyway, they aren't related to Git. I don't think any file directly related to git would have name starting with '.#' (especially since branch names can't start with dot).03:51
← scarabx left03:51
mobidroid Ilari: i think it's a merged file after a really bad experiment... anyway thank all for your help it was pretty much appreciated I'll now be able to branch my project and continue my world domination Mouahaahh ah ah ah aaah03:53
← guilhermeblanco left03:53
mobidroid think need to go to bed really soon03:54
← krawek left03:54
→ sftp joined03:54
→ krawek joined03:54
← ajpiano left03:56
← tongueroo left03:56
→ ajpiano joined03:56
← ajpiano left03:57
→ Theravadan joined03:58
← dj_tjerk left04:09
← kloeri left04:09
← ribasushi left04:09
← sondreb left04:09
← sitaram left04:09
← ft left04:10
← pasky left04:10
← tic left04:10
← dirker left04:10
← rettub left04:10
← LRN left04:10
← pragma_ left04:10
← rvsjoen left04:10
← hearit left04:10
← cytrinox left04:10
← ciaranm left04:10
← flazz_ left04:10
← alin-gym left04:10
← kenyon left04:10
← fr left04:10
← redondos left04:10
← flodin left04:10
← Tac left04:10
← adamm left04:10
← Sigma left04:10
← David-T left04:10
← mutex left04:10
← The_Ball left04:10
← eno left04:10
← psil left04:10
← maxb left04:10
← sigmonsays left04:10
← akraut left04:10
← jonmasters left04:10
← nairb774 left04:10
← univate left04:10
← cpg|away left04:10
← copyleft left04:10
← ToxicFrog left04:10
← harv left04:10
← troyt left04:10
← pprkut left04:10
← kristian42 left04:10
mobidroid Hmm maybe one last question, how can I have vi for default editor?04:10
← StuckMojo left04:10
mobidroid (for the commit, i'm not a big fan of emac)04:10
frogonwheels mobidroid: surprised it isn't by default.04:10
← lu_zero left04:10
← Vampire0 left04:10
→ ajpiano joined04:10
← kadoban left04:10
← jfkw left04:10
← badboy_ left04:10
← ptor left04:10
→ badboy joined04:10
← doener left04:10
← johnjay left04:10
→ Vampire0_ joined04:10
← Vampire0_ left04:10
→ Vampire0_ joined04:10
badboy → 15SAALM1P04:10
→ sword``` joined04:10
← comawhite left04:10
→ ToxicFrog joined04:10
→ hearit joined04:10
→ cytrinox joined04:10
→ sigmonsays joined04:10
→ ciaranm joined04:10
→ flazz_ joined04:10
→ alin-gym joined04:10
→ kenyon joined04:10
→ pprkut joined04:10
→ fr joined04:10
→ redondos joined04:10
→ flodin joined04:10
→ Tac joined04:10
→ adamm joined04:10
→ Sigma joined04:10
→ David-T joined04:10
→ mutex joined04:10
→ The_Ball joined04:10
→ akraut joined04:10
→ eno joined04:10
→ psil joined04:10
→ maxb joined04:10
→ jonmasters joined04:10
→ nairb774 joined04:10
→ univate joined04:10
→ cpg|away joined04:10
→ copyleft joined04:10
→ harv joined04:10
→ troyt joined04:10
→ epic joined04:10
→ cmyers joined04:10
→ _Unode joined04:10
→ TTilus joined04:10
→ rphillips joined04:10
→ naderman joined04:10
→ Derander joined04:10
→ Helios joined04:10
→ Blafasel joined04:10
→ runasand joined04:10
→ levifig joined04:10
→ Pieter joined04:10
← adamm left04:10
← Sigma left04:10
→ Sigma joined04:10
mobidroid frogonwheels: well emac is a bit more user frendly i guess that's why they made this choice04:10
→ vals_ joined04:10
mobidroid nevermind Mr. google tell me this : git config --global core.editor04:10
← Sigma left04:10
→ Sigma joined04:10
→ amstan_ joined04:10
← amstan left04:10
→ context- joined04:10
frogonwheels mobidroid: on debian/ubuntu? need to set your alternative text editor to be vim rather than emacs04:10
← tstclair left04:10
→ luis joined04:10
→ Chillance joined04:10
frogonwheels mobidroid: update-alternatives --help04:10
→ adamm joined04:10
← adamm left04:10
→ adamm joined04:10
→ lu_zero joined04:10
→ kadoban joined04:10
← Limb left04:10
→ robins joined04:10
← tango_ left04:10
adamm → 31NAA7BID04:10
mobidroid frogonwheels: git config --global core.editor vi really did a good job what's the difference with update alternative?04:10
← context- left04:10
→ context- joined04:10
← zuez left04:10
→ doener joined04:10
← context left04:10
→ amstan__ joined04:10
→ rvsjoen_ joined04:10
→ lut4rp joined04:10
← BlindOracle left04:10
→ BlindOracle joined04:10
← SvenDowideit left04:10
← entrigan left04:10
← CoinOpeBoy left04:10
← Oxf13 left04:10
← MetaCosm left04:10
← chkpnt left04:10
← marienz left04:10
← d1zzy left04:10
← GarethAdams|Work left04:10
← walf443 left04:10
← termie left04:10
← tmz left04:10
← Aikawa left04:10
← DrNick left04:10
← niko left04:10
← chuck left04:10
← NuubiRuby_ left04:10
← NuubiRuby left04:10
← amstan_ left04:10
← andrewl left04:10
← Bucciarati left04:10
← s0ber_ left04:10
← jast left04:10
← Aides left04:10
← AAA_awright left04:10
← AlexanderS left04:10
← LeLutin left04:10
← up_the_irons left04:10
← ryanakca left04:10
← koki left04:10
← trochala left04:10
← EvanCarroll left04:10
← BP{k} left04:10
← bgerber left04:10
← armenb_ left04:10
← Husio left04:10
← joschi left04:10
← dfr|work left04:10
← meuh left04:10
← d1b left04:10
← frsk left04:10
← fahadsadah left04:10
← Arjen left04:10
← trodrigues left04:10
← ponzao____ left04:10
← kokx left04:10
← naquad left04:10
← broonie left04:10
← Slush- left04:10
← 31NAA7BID left04:10
← TML left04:10
← torben_ left04:10
← adymitruk left04:10
← TheUni left04:10
← Andy_ODT_1 left04:10
← wereHamster left04:10
← stevepsharpe left04:10
← saiyr9000 left04:10
← tedoc2000 left04:10
← GodEater left04:10
← jds left04:10
← Amorphous left04:10
← frogonwheels left04:10
← GTXL94 left04:10
← Thumper_ left04:10
← hsa2|gone left04:10
← CompanionCube left04:10
← ScottMac left04:10
← Soliton left04:10
← krunaldo left04:10
← th1 left04:10
← xrogaan left04:10
← adamholt left04:10
← lcuk left04:10
← Ilari_antrcomp left04:10
← bd left04:10
← mattw left04:10
← Tasser left04:10
← JStoker left04:10
← gabiruh left04:10
← LucasWilcox left04:10
← xaxes left04:10
← Ilari left04:10
← nick_h_ left04:10
← Woody2143 left04:10
← mapreduce left04:10
← s4msung left04:10
← wimt left04:10
← dmlloyd left04:10
← ahf left04:10
← jjcm left04:10
← rudi_s left04:10
← cota left04:10
← Nilbus left04:10
← raim0 left04:10
← halfline left04:10
← kadoban left04:10
← context- left04:10
← krawek left04:10
← mobidroid left04:10
← aeioyou left04:10
← Yuffster left04:10
← henkboom left04:10
← ignatp left04:10
← hagebake left04:10
← \mjd left04:10
← emmanueloga left04:10
← brntbeer left04:10
← vinse left04:10
← _Vi left04:10
← RobertLaptop_ left04:10
← hasen left04:10
← programble left04:10
← knittl left04:10
← charon left04:10
← marc_kdab_ left04:10
← jkp left04:10
← jtauber left04:10
← madewokherd left04:10
← jjuran left04:10
← Gitbot left04:10
← curtana left04:10
← resmo left04:10
← pielgrzym left04:10
← chitragupt left04:10
← candybar left04:10
← SRabbelier left04:10
← traviscline left04:10
← stymo left04:10
← jones- left04:10
← agile left04:10
← ricky left04:10
← nsussman` left04:10
← mackstann left04:10
← ebneter left04:10
← Ramblurr left04:10
← ericdc left04:10
← manjunaths left04:10
← chrizz left04:10
← eldragon left04:10
← elb0w left04:10
← buu left04:10
← Khisanth left04:10
← Rhonda left04:10
← hachi left04:10
← rduplain left04:10
← Juri_Agarin left04:10
← slakmagik left04:10
← BeerSerc left04:10
← jksz left04:10
← Tuomas left04:10
← jason237 left04:10
← drry left04:10
← sejo left04:10
← dionoea left04:10
← ska-fan left04:10
← peper left04:10
← trash left04:10
← __ed left04:10
← adxp-2`` left04:10
← bartek left04:10
← Caelum left04:10
← doki_pen left04:10
← elliottcable left04:10
← Bartman007 left04:10
← tahorg left04:10
← joevano left04:10
← diofeher left04:10
← robins left04:10
← kpreid left04:10
← yngress_ left04:10
← justin-george left04:10
← Elfe_ left04:10
← tildeequals left04:10
← hyperair left04:10
← cYmen left04:10
← poli left04:10
← esc left04:10
← Leemp left04:10
← squentin left04:10
← wolog left04:10
← bball__ left04:10
← stockholm left04:10
← hyperboreean left04:10
← merlin83 left04:10
← avar left04:10
← tchan left04:10
← tro left04:10
← Grum left04:10
← sobersabre left04:10
← vals_ left04:10
← Heimidal left04:10
← Bombe left04:10
← steveire left04:10
← eletuchy left04:10
← yann left04:10
← biz left04:10
← patrikf left04:10
← stepnem left04:10
← Zeelot3k left04:10
← adam[pac] left04:10
← tomaw left04:10
← unixtippse left04:10
← nimrod10 left04:10
← jarh left04:10
← Reticenti left04:10
← grumpytoad left04:10
← cbreak left04:10
← thomas_b left04:10
← przemoc left04:10
← selckin left04:10
← tg left04:10
← ijuma left04:10
← injekt left04:10
← guerrilla left04:10
← monokrome left04:10
← Hadaka left04:10
← agib left04:10
← crab left04:10
← comcor left04:10
← luis left04:10
← Chaser_ left04:10
← frakturfreak left04:10
← drubies left04:10
← Kovensky left04:10
← binjured left04:10
← w00tz left04:10
← nionith left04:10
← divVerent left04:10
← kingfishr left04:10
← topi left04:10
← adrien left04:10
← nobody left04:10
← Risar left04:10
← vpilo left04:10
← thedeeno left04:10
← issyl0 left04:10
← mstormo left04:10
← crazed left04:10
← jasom left04:10
← fauxhawk left04:10
← twmi left04:10
← odin_ left04:10
← baccenfutter left04:10
← shad left04:10
← wanders left04:10
← AngryParsley left04:10
← crankharder left04:10
← Chillance left04:10
← unreal left04:10
← Eaven left04:10
← welly left04:10
← davidc_ left04:10
← elijahbal left04:10
← impulze left04:10
← mquin left04:10
← yashi left04:10
← daethorian left04:10
← shade\ left04:10
← jpieper left04:10
← floppyears left04:10
← dwmw2_ left04:10
← jeffszusz left04:10
← JamesA left04:10
← jspiros left04:10
← sunn left04:10
← Gullik left04:10
← uau left04:10
← NfNitLoop left04:10
← no_maam left04:10
← cwillu_at_work left04:10
← jayne left04:10
← gonzojive left04:10
← lu_zero left04:10
← EricInBNE left04:10
← rvalue left04:10
← optixx left04:10
← second3 left04:10
← Ingmar left04:10
← bburhans left04:10
← sven^ left04:10
← xou left04:10
← crazy2k left04:10
← Goneri left04:10
← zorzar left04:10
← nadim left04:10
← darnold left04:10
← muep left04:10
← karihre left04:10
← reaVer left04:10
← Will| left04:10
← Veinor left04:10
← FauxFaux left04:10
← MacGyverNL left04:10
← madduck left04:10
← septic left04:10
← picasso left04:10
← niki left04:10
← mmattice left04:10
← jenk left04:10
← Carneus left04:10
← ke4qqq left04:10
← avtobiff left04:10
← homa_rano left04:10
← scottz_ left04:10
← tonyj left04:10
← sjn left04:10
← sword`` left04:10
← jlogsdon left04:10
ilteris___ → ilteris04:10
ilteris → 17SAA5YVU04:10
→ LRN joined04:10
→ dj_tjerk joined04:10
→ StuckMojo joined04:10
→ SvenDowideit joined04:10
→ johnjay joined04:10
→ zuez joined04:10
→ robins joined04:10
→ kadoban joined04:10
→ lu_zero joined04:10
→ NAA7BID joined04:10
→ Chillance joined04:10
→ luis joined04:10
→ context- joined04:10
→ amstan_ joined04:10
→ vals_ joined04:10
→ krawek joined04:10
→ kpreid joined04:10
→ mobidroid joined04:10
→ aeioyou joined04:10
→ Yuffster joined04:10
→ henkboom joined04:10
→ yngress_ joined04:10
→ unreal joined04:10
→ justin-george joined04:10
→ Heimidal joined04:10
→ Eaven joined04:10
→ entrigan joined04:10
→ Elfe_ joined04:10
→ TML joined04:10
→ andrewl joined04:10
→ tildeequals joined04:10
→ hyperair joined04:10
→ ignatp joined04:10
→ Bombe joined04:10
→ Chaser_ joined04:10
→ frakturfreak joined04:10
→ torben_ joined04:10
→ steveire joined04:10
→ hagebake joined04:10
→ welly joined04:10
→ \mjd joined04:10
→ Bucciarati joined04:10
→ emmanueloga joined04:10
→ s0ber_ joined04:10
→ brntbeer joined04:10
→ lcuk joined04:10
→ CoinOpeBoy joined04:10
→ EricInBNE joined04:10
→ adymitruk joined04:10
→ eletuchy joined04:10
→ TheUni joined04:10
→ rvalue joined04:10
→ Aikawa joined04:10
→ vinse joined04:10
→ slakmagik joined04:10
→ drubies joined04:10
→ Andy_ODT_1 joined04:10
→ davidc_ joined04:10
→ _Vi joined04:10
→ Kovensky joined04:10
→ RobertLaptop_ joined04:10
→ squentin joined04:10
→ hasen joined04:10
→ programble joined04:10
→ yann joined04:10
→ adxp-2`` joined04:10
→ optixx joined04:10
→ wereHamster joined04:10
→ jast joined04:10
→ second3 joined04:10
→ biz joined04:10
→ patrikf joined04:10
→ knittl joined04:10
→ Ingmar joined04:10
→ BeerSerc joined04:10
→ charon joined04:10
→ cYmen joined04:10
→ sven^ joined04:10
→ bburhans joined04:10
→ pielgrzym joined04:10
→ binjured joined04:10
→ crankharder joined04:10
→ xou joined04:10
→ marc_kdab_ joined04:10
→ stevepsharpe joined04:10
→ saiyr9000 joined04:10
→ jkp joined04:10
→ stymo joined04:10
→ Aides joined04:10
→ tedoc2000 joined04:10
→ crazy2k joined04:10
→ stepnem joined04:10
→ monokrome joined04:10
→ AlexanderS joined04:10
→ AAA_awright joined04:10
→ jtauber joined04:10
→ poli joined04:10
→ w00tz joined04:10
→ GodEater joined04:10
→ madewokherd joined04:10
→ jjuran joined04:10
→ DrNick joined04:10
→ Oxf13 joined04:10
→ jksz joined04:10
→ Goneri joined04:10
→ Gitbot joined04:10
→ jds joined04:10
→ curtana joined04:10
→ zorzar joined04:10
→ esc joined04:10
→ Amorphous joined04:10
→ NuubiRuby_ joined04:10
→ divVerent joined04:10
→ Tuomas joined04:10
→ daethorian joined04:10
→ frogonwheels joined04:10
→ LeLutin joined04:10
→ kingfishr joined04:10
→ Leemp joined04:10
→ Veinor joined04:10
→ topi joined04:10
→ GTXL94 joined04:10
→ resmo joined04:10
→ chkpnt joined04:10
→ jason237 joined04:10
→ chitragupt joined04:10
→ up_the_irons joined04:10
→ candybar joined04:10
→ Thumper_ joined04:10
→ Zeelot3k joined04:10
→ SRabbelier joined04:10
→ traviscline joined04:10
→ adam[pac] joined04:10
→ adrien joined04:10
→ nobody joined04:10
→ wolog joined04:10
→ tomaw joined04:10
→ elijahbal joined04:10
→ impulze joined04:10
→ drry joined04:10
→ sejo joined04:10
→ NuubiRuby joined04:10
→ dionoea joined04:10
→ niko joined04:10
→ mquin joined04:10
→ MetaCosm joined04:10
→ unixtippse joined04:10
→ bball__ joined04:10
→ ryanakca joined04:10
→ yashi joined04:10
→ Risar joined04:10
→ dfr|work joined04:10
→ ska-fan joined04:10
→ nimrod10 joined04:10
→ shade\ joined04:10
→ marienz joined04:10
→ peper joined04:10
→ d1zzy joined04:10
→ jpieper joined04:10
→ vpilo joined04:10
→ trash joined04:10
→ stockholm joined04:10
→ koki joined04:10
→ __ed joined04:10
→ trochala joined04:10
→ jones- joined04:10
→ hyperboreean joined04:10
→ bartek joined04:10
→ hsa2|gone joined04:10
→ thedeeno joined04:10
→ agile joined04:10
→ ricky joined04:10
→ nsussman` joined04:10
→ mackstann joined04:10
→ termie joined04:10
→ nadim joined04:10
→ issyl0 joined04:10
→ agib joined04:10
→ mstormo joined04:10
→ diofeher joined04:10
→ floppyears joined04:10
→ Caelum joined04:10
→ jarh joined04:10
→ doki_pen joined04:10
→ GarethAdams|Work joined04:10
→ merlin83 joined04:10
→ EvanCarroll joined04:10
→ chuck joined04:10
→ crazed joined04:10
→ tmz joined04:10
→ walf443 joined04:10
→ CompanionCube joined04:10
→ BP{k} joined04:10
→ ScottMac joined04:10
→ odin_ joined04:10
→ bgerber joined04:10
→ elliottcable joined04:10
→ armenb_ joined04:10
→ darnold joined04:10
→ Reticenti joined04:10
→ muep joined04:10
→ Soliton joined04:10
→ crab joined04:10
→ krunaldo joined04:10
→ Husio joined04:10
→ dwmw2_ joined04:10
→ karihre joined04:10
→ joschi joined04:10
→ grumpytoad joined04:10
→ reaVer joined04:10
→ jasom joined04:10
→ Will| joined04:10
→ jeffszusz joined04:10
→ th1 joined04:10
→ JamesA joined04:10
→ Bartman007 joined04:10
→ avar joined04:10
→ jspiros joined04:10
→ cbreak joined04:10
→ sunn joined04:10
→ tahorg joined04:10
→ thomas_b joined04:10
→ tchan joined04:10
→ FauxFaux joined04:10
→ xrogaan joined04:10
→ adamholt joined04:10
→ meuh joined04:10
→ MacGyverNL joined04:10
→ ebneter joined04:10
→ sjn joined04:10
→ madduck joined04:10
→ septic joined04:10
→ Ramblurr joined04:10
→ ericdc joined04:10
→ Gullik joined04:10
→ fauxhawk joined04:10
→ manjunaths joined04:10
→ d1b joined04:10
→ przemoc joined04:10
→ sobersabre joined04:10
→ uau joined04:10
→ gonzojive joined04:10
→ Slush- joined04:10
→ broonie joined04:10
→ naquad joined04:10
→ Ilari joined04:10
→ nick_h_ joined04:10
→ Woody2143 joined04:10
→ s4msung joined04:10
→ Nilbus joined04:10
→ jjcm joined04:10
→ wimt joined04:10
→ dmlloyd joined04:10
→ ahf joined04:10
→ rudi_s joined04:10
→ cota joined04:10
→ raim0 joined04:10
→ halfline joined04:10
→ xaxes joined04:10
→ LucasWilcox joined04:10
→ ponzao____ joined04:10
→ kokx joined04:10
→ gabiruh joined04:10
→ trodrigues joined04:10
→ JStoker joined04:10
→ Tasser joined04:10
→ mattw joined04:10
→ Arjen joined04:10
→ mapreduce joined04:10
→ fahadsadah joined04:10
→ Ilari_antrcomp joined04:10
→ bd joined04:10
→ frsk joined04:10
→ chrizz joined04:10
→ tro joined04:10
→ selckin joined04:10
→ picasso joined04:10
→ Juri_Agarin joined04:10
→ rduplain joined04:10
→ hachi joined04:10
→ Rhonda joined04:10
→ Khisanth joined04:10
→ elb0w joined04:10
→ buu joined04:10
→ eldragon joined04:10
→ joevano joined04:10
→ twmi joined04:10
→ tg joined04:10
→ niki joined04:10
→ mmattice joined04:10
→ jenk joined04:10
→ NfNitLoop joined04:10
→ ijuma joined04:10
→ no_maam joined04:10
→ scottz_ joined04:10
→ injekt joined04:10
→ Carneus joined04:10
→ ke4qqq joined04:10
→ guerrilla joined04:10
→ baccenfutter joined04:10
→ Grum joined04:10
→ avtobiff joined04:10
→ Hadaka joined04:10
→ cwillu_at_work joined04:10
→ shad joined04:10
→ jayne joined04:10
→ homa_rano joined04:10
→ wanders joined04:10
→ tonyj joined04:10
→ ndim joined04:10
→ fualo joined04:10
→ spb joined04:10
→ kmap joined04:10
→ majoh joined04:10
→ zomg joined04:10
→ StyleWarz joined04:10
→ joelpet joined04:10
→ tghw joined04:10
→ arkx joined04:10
→ stoove joined04:10
→ teuf joined04:10
→ zchydem joined04:10
→ bnovc joined04:10
→ LotR joined04:10
→ defn joined04:10
→ jham joined04:10
→ eMBee joined04:10
→ jailbox joined04:10
→ ozzloy joined04:10
→ JonasF joined04:10
→ Ratler joined04:10
→ jacobat joined04:10
→ stuffcorpse joined04:10
→ alip joined04:10
→ felipe joined04:10
→ pcc1 joined04:10
→ comcor joined04:10
→ EgS joined04:10
→ bs joined04:10
→ AlexP joined04:10
→ yacc joined04:10
→ sbob joined04:10
→ electrogeek joined04:10
→ teknotus joined04:10
→ wagle joined04:10
→ davr joined04:10
→ hegge joined04:10
→ codejunky joined04:10
→ blueshift joined04:10
→ sgronblo joined04:10
→ vlt joined04:10
→ jakob joined04:10
→ coopsh joined04:10
→ housetier joined04:10
→ metze_away joined04:10
→ solatis joined04:10
→ Ferris joined04:10
→ ayaka_t joined04:10
→ siprbaum joined04:10
→ dennda joined04:10
→ s0enke joined04:10
→ pom joined04:10
zuez → 77CAAZ04A04:11
→ pasky_ joined04:11
→ zuez joined04:11
← zuez left04:11
← entrigan left04:11
← CoinOpeBoy left04:11
← Oxf13 left04:11
← MetaCosm left04:11
← chkpnt left04:11
← marienz left04:11
← d1zzy left04:11
← GarethAdams|Work left04:11
← walf443 left04:11
← termie left04:11
← tmz left04:11
← Aikawa left04:11
← DrNick left04:11
← niko left04:11
← chuck left04:11
← NuubiRuby_ left04:11
← NuubiRuby left04:11
← amstan_ left04:11
← andrewl left04:11
← Bucciarati left04:11
← s0ber_ left04:11
← jast left04:11
← Aides left04:11
← AAA_awright left04:11
← AlexanderS left04:11
← LeLutin left04:11
← up_the_irons left04:11
← ryanakca left04:11
← koki left04:11
← trochala left04:11
← EvanCarroll left04:11
← BP{k} left04:11
← bgerber left04:11
← armenb_ left04:11
← Husio left04:11
← joschi left04:11
← dfr|work left04:11
← meuh left04:11
← d1b left04:11
← frsk left04:11
← fahadsadah left04:11
← Arjen left04:11
← trodrigues left04:11
← ponzao____ left04:11
← kokx left04:11
← naquad left04:11
← broonie left04:11
← Slush- left04:11
← TML left04:11
← torben_ left04:11
← adymitruk left04:11
← TheUni left04:11
← Andy_ODT_1 left04:11
← wereHamster left04:11
← stevepsharpe left04:11
← saiyr9000 left04:11
← tedoc2000 left04:11
← GodEater left04:11
← jds left04:11
← Amorphous left04:11
← frogonwheels left04:11
← GTXL94 left04:11
← Thumper_ left04:11
← hsa2|gone left04:11
← CompanionCube left04:11
← ScottMac left04:11
← Soliton left04:11
← krunaldo left04:11
← th1 left04:11
← xrogaan left04:11
← adamholt left04:11
← lcuk left04:11
← Ilari_antrcomp left04:11
← bd left04:11
← mattw left04:11
← Tasser left04:11
← JStoker left04:11
← gabiruh left04:11
← LucasWilcox left04:11
← xaxes left04:11
← Ilari left04:11
← nick_h_ left04:11
← Woody2143 left04:11
← mapreduce left04:11
← s4msung left04:11
← wimt left04:11
← dmlloyd left04:11
← ahf left04:11
← jjcm left04:11
← rudi_s left04:11
← cota left04:11
← Nilbus left04:11
← raim0 left04:11
← halfline left04:11
← kadoban left04:11
← context- left04:11
← krawek left04:11
← mobidroid left04:11
← aeioyou left04:11
← Yuffster left04:11
← henkboom left04:11
← ignatp left04:11
← hagebake left04:11
← \mjd left04:11
← emmanueloga left04:11
← brntbeer left04:11
← vinse left04:11
← _Vi left04:11
← RobertLaptop_ left04:11
← hasen left04:11
← programble left04:11
← knittl left04:11
← charon left04:11
← marc_kdab_ left04:11
← jkp left04:11
← jtauber left04:11
← madewokherd left04:11
← jjuran left04:11
← Gitbot left04:11
← curtana left04:11
← resmo left04:11
← pielgrzym left04:11
← chitragupt left04:11
← candybar left04:11
← SRabbelier left04:11
← traviscline left04:11
← stymo left04:11
← jones- left04:11
← agile left04:11
← ricky left04:11
← nsussman` left04:11
← mackstann left04:11
← ebneter left04:11
← Ramblurr left04:11
← ericdc left04:11
← manjunaths left04:11
← chrizz left04:11
← eldragon left04:11
← elb0w left04:11
← buu left04:11
← Khisanth left04:11
← Rhonda left04:11
← hachi left04:11
← rduplain left04:11
← Juri_Agarin left04:11
← slakmagik left04:11
← BeerSerc left04:11
← jksz left04:11
← Tuomas left04:11
← jason237 left04:11
← drry left04:11
← sejo left04:11
← dionoea left04:11
← ska-fan left04:11
← peper left04:11
← trash left04:11
← __ed left04:11
← adxp-2`` left04:11
← bartek left04:11
← Caelum left04:11
← doki_pen left04:11
← elliottcable left04:11
← Bartman007 left04:11
← tahorg left04:11
← joevano left04:11
← diofeher left04:11
← StuckMojo left04:11
← 77CAAZ04A left04:11
← robins left04:11
← kpreid left04:11
← yngress_ left04:11
← justin-george left04:11
← Elfe_ left04:11
← tildeequals left04:11
← hyperair left04:11
← cYmen left04:11
← poli left04:11
← esc left04:11
← Leemp left04:11
← squentin left04:11
← wolog left04:11
← bball__ left04:11
← stockholm left04:11
← hyperboreean left04:11
← merlin83 left04:11
← avar left04:11
← tchan left04:11
← tro left04:11
← Grum left04:11
← sobersabre left04:11
← fualo left04:11
← eMBee left04:11
← jham left04:11
← defn left04:11
← LotR left04:11
← bnovc left04:11
← zchydem left04:11
← teuf left04:11
← johnjay left04:11
← vals_ left04:11
← Heimidal left04:11
← Bombe left04:11
← steveire left04:11
← eletuchy left04:11
← yann left04:11
← biz left04:11
← patrikf left04:11
← stepnem left04:11
← Zeelot3k left04:11
← adam[pac] left04:11
← tomaw left04:11
← unixtippse left04:11
← nimrod10 left04:11
← jarh left04:11
← Reticenti left04:11
← grumpytoad left04:11
← cbreak left04:11
← thomas_b left04:11
← przemoc left04:11
← selckin left04:11
← tg left04:11
← ijuma left04:11
← injekt left04:11
← guerrilla left04:11
← monokrome left04:11
← Hadaka left04:11
← majoh left04:11
← zomg left04:11
← StyleWarz left04:11
← tghw left04:11
← agib left04:11
← crab left04:11
← JonasF left04:11
← jacobat left04:11
← felipe left04:11
← yacc left04:11
← AlexP left04:11
← bs left04:11
← EgS left04:11
← comcor left04:11
← pcc1 left04:11
← luis left04:11
← Chaser_ left04:11
← frakturfreak left04:11
← drubies left04:11
← Kovensky left04:11
← binjured left04:11
← w00tz left04:11
← divVerent left04:11
← kingfishr left04:11
← topi left04:11
← adrien left04:11
← nobody left04:11
← Risar left04:11
← vpilo left04:11
← thedeeno left04:11
← issyl0 left04:11
← mstormo left04:11
← crazed left04:11
← jasom left04:11
← fauxhawk left04:11
← twmi left04:11
← odin_ left04:11
← baccenfutter left04:11
← shad left04:11
← wanders left04:11
← spb left04:11
← kmap left04:11
← ozzloy left04:11
← alip left04:11
← crankharder left04:11
← sbob left04:11
← davr left04:11
← wagle left04:11
← teknotus left04:11
← electrogeek left04:11
← Chillance left04:11
← unreal left04:11
← Eaven left04:11
← welly left04:11
← davidc_ left04:11
← elijahbal left04:11
← impulze left04:11
← mquin left04:11
← yashi left04:11
← daethorian left04:11
← shade\ left04:11
← jpieper left04:11
← floppyears left04:11
← dwmw2_ left04:11
← jeffszusz left04:11
← JamesA left04:11
← jspiros left04:11
← sunn left04:11
← Gullik left04:11
← uau left04:11
← NfNitLoop left04:11
← no_maam left04:11
← cwillu_at_work left04:11
← jayne left04:11
← ndim left04:11
← joelpet left04:11
← Ratler left04:11
← stoove left04:11
← gonzojive left04:11
← hegge left04:11
← dj_tjerk left04:11
← SvenDowideit left04:11
← lu_zero left04:11
← EricInBNE left04:11
← rvalue left04:11
← optixx left04:11
← second3 left04:11
← Ingmar left04:11
← bburhans left04:11
← sven^ left04:11
← xou left04:11
← crazy2k left04:11
← Goneri left04:11
← zorzar left04:11
← nadim left04:11
← darnold left04:11
← muep left04:11
← karihre left04:11
← reaVer left04:11
← Will| left04:11
← Veinor left04:11
← FauxFaux left04:11
← MacGyverNL left04:11
← madduck left04:11
← septic left04:11
← picasso left04:11
← niki left04:11
← mmattice left04:11
← jenk left04:11
← Carneus left04:11
← ke4qqq left04:11
← avtobiff left04:11
← homa_rano left04:11
← scottz_ left04:11
← tonyj left04:11
← arkx left04:11
← jailbox left04:11
← stuffcorpse left04:11
← codejunky left04:11
← sgronblo left04:11
← sjn left04:11
← vlt left04:11
← jakob left04:11
← coopsh left04:11
← metze_away left04:11
← solatis left04:11
← Ferris left04:11
← ayaka_t left04:11
← siprbaum left04:11
← housetier left04:11
← blueshift left04:11
← pom left04:11
← s0enke left04:11
← dennda left04:11
← Philwelch left04:11
→ jlogsdon_ joined04:11
→ ft joined04:11
→ frogonwheels joined04:11
← srcerer left04:11
→ krawek joined04:11
→ tic_ joined04:11
→ sitaram_ joined04:11
→ Snow-Man_ joined04:11
→ nionith joined04:11
→ ribasushi joined04:11
→ dj_tjerk joined04:11
→ StuckMojo joined04:11
→ SvenDowideit joined04:11
→ johnjay joined04:11
→ robins joined04:11
→ kadoban joined04:11
→ lu_zero joined04:11
→ NAA7BID joined04:11
→ Chillance joined04:11
→ luis joined04:11
→ context- joined04:11
→ vals_ joined04:11
→ kpreid joined04:11
→ mobidroid joined04:11
→ aeioyou joined04:11
→ Yuffster joined04:11
→ henkboom joined04:11
→ yngress_ joined04:11
→ unreal joined04:11
→ justin-george joined04:11
→ Heimidal joined04:11
→ Eaven joined04:11
→ entrigan joined04:11
→ Elfe_ joined04:11
→ TML joined04:11
→ andrewl joined04:11
→ tildeequals joined04:11
→ hyperair joined04:11
→ ignatp joined04:11
→ Bombe joined04:11
→ Chaser_ joined04:11
→ frakturfreak joined04:11
→ torben_ joined04:11
→ steveire joined04:11
→ hagebake joined04:11
→ welly joined04:11
→ \mjd joined04:11
→ Bucciarati joined04:11
→ emmanueloga joined04:11
→ s0ber_ joined04:11
→ brntbeer joined04:11
→ lcuk joined04:11
→ CoinOpeBoy joined04:11
→ EricInBNE joined04:11
→ adymitruk joined04:11
→ eletuchy joined04:11
→ TheUni joined04:11
→ rvalue joined04:11
→ Aikawa joined04:11
→ vinse joined04:11
→ slakmagik joined04:11
→ drubies joined04:11
→ Andy_ODT_1 joined04:11
→ davidc_ joined04:11
→ _Vi joined04:11
→ Kovensky joined04:11
→ RobertLaptop_ joined04:11
→ squentin joined04:11
→ hasen joined04:11
→ programble joined04:11
→ yann joined04:11
→ adxp-2`` joined04:11
→ optixx joined04:11
→ wereHamster joined04:11
→ jast joined04:11
→ second3 joined04:11
→ biz joined04:11
→ patrikf joined04:11
→ knittl joined04:11
→ Ingmar joined04:11
→ BeerSerc joined04:11
→ charon joined04:11
→ cYmen joined04:11
→ sven^ joined04:11
→ bburhans joined04:11
→ pielgrzym joined04:11
→ binjured joined04:11
→ crankharder joined04:11
→ xou joined04:11
→ marc_kdab_ joined04:11
→ stevepsharpe joined04:11
→ saiyr9000 joined04:11
→ jkp joined04:11
→ stymo joined04:11
→ Aides joined04:11
→ tedoc2000 joined04:11
→ crazy2k joined04:11
→ stepnem joined04:11
→ monokrome joined04:11
→ AlexanderS joined04:11
→ AAA_awright joined04:11
→ jtauber joined04:11
→ poli joined04:11
→ w00tz joined04:11
→ GodEater joined04:11
→ madewokherd joined04:11
→ jjuran joined04:11
→ DrNick joined04:11
→ Oxf13 joined04:11
→ jksz joined04:11
→ Goneri joined04:11
→ Gitbot joined04:11
→ jds joined04:11
→ curtana joined04:11
→ zorzar joined04:11
→ esc joined04:11
→ Amorphous joined04:11
→ NuubiRuby_ joined04:11
→ divVerent joined04:11
→ Tuomas joined04:11
→ daethorian joined04:11
→ NAA65YA joined04:11
→ LeLutin joined04:11
→ kingfishr joined04:11
→ Leemp joined04:11
→ Veinor joined04:11
→ topi joined04:11
→ GTXL94 joined04:11
→ resmo joined04:11
→ chkpnt joined04:11
→ jason237 joined04:11
→ chitragupt joined04:11
→ up_the_irons joined04:11
→ candybar joined04:11
→ Thumper_ joined04:11
→ Zeelot3k joined04:11
→ SRabbelier joined04:11
→ traviscline joined04:11
→ adam[pac] joined04:11
→ adrien joined04:11
→ nobody joined04:11
→ wolog joined04:11
→ tomaw joined04:11
→ elijahbal joined04:11
→ impulze joined04:11
→ drry joined04:11
→ sejo joined04:11
→ NuubiRuby joined04:11
→ dionoea joined04:11
→ niko joined04:11
→ mquin joined04:11
→ MetaCosm joined04:11
→ unixtippse joined04:11
→ bball__ joined04:11
→ ryanakca joined04:11
→ yashi joined04:11
→ Risar joined04:11
→ dfr|work joined04:11
→ ska-fan joined04:11
→ nimrod10 joined04:11
→ shade\ joined04:11
→ marienz joined04:11
→ peper joined04:11
→ d1zzy joined04:11
→ jpieper joined04:11
→ vpilo joined04:11
→ trash joined04:11
→ stockholm joined04:11
→ koki joined04:11
→ __ed joined04:11
→ trochala joined04:11
→ jones- joined04:11
→ hyperboreean joined04:11
→ bartek joined04:11
→ hsa2|gone joined04:11
→ thedeeno joined04:11
→ agile joined04:11
→ ricky joined04:11
→ nsussman` joined04:11
→ mackstann joined04:11
→ termie joined04:11
→ nadim joined04:11
→ issyl0 joined04:11
→ agib joined04:11
→ mstormo joined04:11
→ diofeher joined04:11
→ floppyears joined04:11
→ Caelum joined04:11
→ jarh joined04:11
→ doki_pen joined04:11
→ GarethAdams|Work joined04:11
→ merlin83 joined04:11
→ EvanCarroll joined04:11
→ chuck joined04:11
→ crazed joined04:11
→ tmz joined04:11
→ walf443 joined04:11
→ CompanionCube joined04:11
→ BP{k} joined04:11
→ ScottMac joined04:11
→ odin_ joined04:11
→ bgerber joined04:11
→ elliottcable joined04:11
→ armenb_ joined04:11
→ darnold joined04:11
→ Reticenti joined04:11
→ muep joined04:11
→ Soliton joined04:11
→ crab joined04:11
→ krunaldo joined04:11
→ Husio joined04:11
→ dwmw2_ joined04:11
→ karihre joined04:11
→ joschi joined04:11
→ grumpytoad joined04:11
→ reaVer joined04:11
→ jasom joined04:11
→ Will| joined04:11
→ jeffszusz joined04:11
→ th1 joined04:11
→ JamesA joined04:11
→ Bartman007 joined04:11
→ avar joined04:11
→ jspiros joined04:11
→ cbreak joined04:11
→ sunn joined04:11
→ tahorg joined04:11
→ thomas_b joined04:11
→ tchan joined04:11
→ FauxFaux joined04:11
→ xrogaan joined04:11
→ adamholt joined04:11
→ meuh joined04:11
→ MacGyverNL joined04:11
→ ebneter joined04:11
→ sjn joined04:11
→ madduck joined04:11
→ septic joined04:11
→ Ramblurr joined04:11
→ ericdc joined04:11
→ Gullik joined04:11
→ fauxhawk joined04:11
→ manjunaths joined04:11
→ d1b joined04:11
→ przemoc joined04:11
→ sobersabre joined04:11
→ uau joined04:11
→ gonzojive joined04:11
→ Slush- joined04:11
→ broonie joined04:11
→ naquad joined04:11
→ Ilari joined04:11
→ nick_h_ joined04:11
→ Woody2143 joined04:11
→ s4msung joined04:11
→ Nilbus joined04:11
→ jjcm joined04:11
→ wimt joined04:11
→ dmlloyd joined04:11
→ ahf joined04:11
→ rudi_s joined04:11
→ cota joined04:11
→ raim0 joined04:11
→ halfline joined04:11
→ xaxes joined04:11
→ LucasWilcox joined04:11
→ ponzao____ joined04:11
→ kokx joined04:11
→ gabiruh joined04:11
→ trodrigues joined04:11
→ JStoker joined04:11
→ Tasser joined04:11
→ mattw joined04:11
→ Arjen joined04:11
→ mapreduce joined04:11
→ fahadsadah joined04:11
→ Ilari_antrcomp joined04:11
→ bd joined04:11
→ frsk joined04:11
→ chrizz joined04:11
→ tro joined04:11
→ selckin joined04:11
→ picasso joined04:11
→ Juri_Agarin joined04:11
→ rduplain joined04:11
→ hachi joined04:11
→ Rhonda joined04:11
→ Khisanth joined04:11
→ elb0w joined04:11
→ buu joined04:11
→ eldragon joined04:11
→ joevano joined04:11
→ twmi joined04:11
→ tg joined04:11
→ niki joined04:11
→ mmattice joined04:11
→ jenk joined04:11
→ NfNitLoop joined04:11
→ ijuma joined04:11
→ no_maam joined04:11
→ scottz_ joined04:11
→ injekt joined04:11
→ Carneus joined04:11
→ ke4qqq joined04:11
→ guerrilla joined04:11
→ baccenfutter joined04:11
→ Grum joined04:11
→ avtobiff joined04:11
→ Hadaka joined04:11
→ cwillu_at_work joined04:11
→ shad joined04:11
→ jayne joined04:11
→ homa_rano joined04:11
→ wanders joined04:11
→ tonyj joined04:11
→ ndim joined04:11
→ fualo joined04:11
→ spb joined04:11
→ kmap joined04:11
→ majoh joined04:11
→ zomg joined04:11
→ StyleWarz joined04:11
→ joelpet joined04:11
→ tghw joined04:11
→ arkx joined04:11
→ stoove joined04:11
→ teuf joined04:11
→ zchydem joined04:11
→ bnovc joined04:11
→ LotR joined04:11
→ defn joined04:11
→ jham joined04:11
→ eMBee joined04:11
→ jailbox joined04:11
→ ozzloy joined04:11
→ JonasF joined04:11
→ Ratler joined04:11
→ jacobat joined04:11
→ stuffcorpse joined04:11
→ alip joined04:11
→ felipe joined04:11
→ pcc1 joined04:11
→ comcor joined04:11
→ EgS joined04:11
→ bs joined04:11
→ AlexP joined04:11
→ yacc joined04:11
→ sbob joined04:11
→ electrogeek joined04:11
→ teknotus joined04:11
→ wagle joined04:11
→ davr joined04:11
→ hegge joined04:11
→ codejunky joined04:11
→ blueshift joined04:11
→ sgronblo joined04:11
→ vlt joined04:11
→ jakob joined04:11
→ coopsh joined04:11
→ housetier joined04:11
→ metze_away joined04:11
→ solatis joined04:11
→ Ferris joined04:11
→ ayaka_t joined04:11
→ siprbaum joined04:11
→ dennda joined04:11
→ s0enke joined04:11
→ pom joined04:11
← David-T left04:11
← jamuraa left04:11
← Snow-Man left04:11
→ yzlin_ joined04:11
→ nevyn_ joined04:11
← entrigan left04:11
← CoinOpeBoy left04:11
← Oxf13 left04:11
← MetaCosm left04:11
← chkpnt left04:11
← marienz left04:11
← d1zzy left04:11
← GarethAdams|Work left04:11
← walf443 left04:11
← termie left04:11
← tmz left04:11
← Snow-Man_ left04:11
← Aikawa left04:11
← DrNick left04:11
← niko left04:11
← chuck left04:11
← NuubiRuby_ left04:11
← NuubiRuby left04:11
← tic_ left04:11
← andrewl left04:11
← Bucciarati left04:11
← s0ber_ left04:11
← jast left04:11
← Aides left04:11
← AAA_awright left04:11
← AlexanderS left04:11
← LeLutin left04:11
← up_the_irons left04:11
← ryanakca left04:11
← koki left04:11
← trochala left04:11
← EvanCarroll left04:11
← BP{k} left04:11
← bgerber left04:11
← armenb_ left04:11
← Husio left04:11
← joschi left04:11
← dfr|work left04:11
← meuh left04:11
← d1b left04:11
← frsk left04:11
← fahadsadah left04:11
← Arjen left04:11
← trodrigues left04:11
← ponzao____ left04:11
← kokx left04:11
← naquad left04:11
← broonie left04:11
← Slush- left04:11
← TML left04:11
← torben_ left04:11
← adymitruk left04:11
← TheUni left04:11
← Andy_ODT_1 left04:11
← wereHamster left04:11
← stevepsharpe left04:11
← saiyr9000 left04:11
← tedoc2000 left04:11
← GodEater left04:11
← jds left04:11
← Amorphous left04:11
← GTXL94 left04:11
← Thumper_ left04:11
← hsa2|gone left04:11
← CompanionCube left04:11
← ScottMac left04:11
← Soliton left04:11
← krunaldo left04:11
← th1 left04:11
← xrogaan left04:11
← adamholt left04:11
← lcuk left04:11
← Ilari_antrcomp left04:11
← bd left04:11
← mattw left04:11
← Tasser left04:11
← JStoker left04:11
← gabiruh left04:11
← LucasWilcox left04:11
← xaxes left04:11
← Ilari left04:11
← nick_h_ left04:11
← Woody2143 left04:11
← mapreduce left04:11
← s4msung left04:11
← wimt left04:11
← dmlloyd left04:11
← ahf left04:11
← jjcm left04:11
← rudi_s left04:11
← cota left04:11
← Nilbus left04:11
← raim0 left04:11
← halfline left04:11
← krawek left04:11
← nionith left04:11
← kadoban left04:11
← context- left04:11
← mobidroid left04:11
← aeioyou left04:11
← Yuffster left04:11
← henkboom left04:11
← ignatp left04:11
← hagebake left04:11
← \mjd left04:11
← emmanueloga left04:11
← brntbeer left04:11
← vinse left04:11
← _Vi left04:11
← RobertLaptop_ left04:11
← hasen left04:11
← programble left04:11
← knittl left04:11
← charon left04:11
← marc_kdab_ left04:11
← jkp left04:11
← jtauber left04:11
← madewokherd left04:11
← jjuran left04:11
← Gitbot left04:11
← curtana left04:11
← resmo left04:11
← pielgrzym left04:11
← chitragupt left04:11
← candybar left04:11
← SRabbelier left04:11
← traviscline left04:11
← stymo left04:11
← jones- left04:11
← agile left04:11
← ricky left04:11
← nsussman` left04:11
← mackstann left04:11
← ebneter left04:11
← Ramblurr left04:11
← ericdc left04:11
← manjunaths left04:11
← chrizz left04:11
← eldragon left04:11
← elb0w left04:11
← buu left04:11
← Khisanth left04:11
← Rhonda left04:11
← hachi left04:11
← rduplain left04:11
← Juri_Agarin left04:11
← slakmagik left04:11
← BeerSerc left04:11
← jksz left04:11
← Tuomas left04:11
← jason237 left04:11
← drry left04:11
← sejo left04:11
← dionoea left04:11
← ska-fan left04:11
← peper left04:11
← trash left04:11
← __ed left04:11
← adxp-2`` left04:11
← bartek left04:11
← Caelum left04:11
← doki_pen left04:11
← elliottcable left04:11
← Bartman007 left04:11
← tahorg left04:11
← joevano left04:11
← diofeher left04:11
← sitaram_ left04:11
← StuckMojo left04:11
← robins left04:11
← kpreid left04:11
← yngress_ left04:11
← justin-george left04:11
← Elfe_ left04:11
← tildeequals left04:11
← hyperair left04:11
← cYmen left04:11
← poli left04:11
← esc left04:11
← Leemp left04:11
← squentin left04:11
← wolog left04:11
← bball__ left04:11
← stockholm left04:11
← hyperboreean left04:11
← merlin83 left04:11
← avar left04:11
← tchan left04:11
← tro left04:11
← Grum left04:11
← sobersabre left04:11
← fualo left04:11
← eMBee left04:11
← jham left04:11
← defn left04:11
← LotR left04:11
← bnovc left04:11
← zchydem left04:11
← teuf left04:11
← ribasushi left04:11
← johnjay left04:11
← vals_ left04:11
← Heimidal left04:11
← Bombe left04:11
← steveire left04:11
← eletuchy left04:11
← yann left04:11
← biz left04:11
← patrikf left04:11
← stepnem left04:11
← Zeelot3k left04:11
← adam[pac] left04:11
← tomaw left04:11
← unixtippse left04:11
← nimrod10 left04:11
← jarh left04:11
← Reticenti left04:11
← grumpytoad left04:11
← cbreak left04:11
← thomas_b left04:11
← przemoc left04:11
← selckin left04:11
← tg left04:11
← ijuma left04:11
← injekt left04:11
← guerrilla left04:11
← monokrome left04:11
← Hadaka left04:11
← majoh left04:11
← zomg left04:11
← StyleWarz left04:11
← tghw left04:11
← agib left04:11
← crab left04:11
← JonasF left04:11
← jacobat left04:11
← felipe left04:11
← yacc left04:11
← AlexP left04:11
← bs left04:11
← EgS left04:11
← comcor left04:11
← pcc1 left04:11
← luis left04:11
← Chaser_ left04:11
← frakturfreak left04:11
← drubies left04:11
← Kovensky left04:11
← binjured left04:11
← w00tz left04:11
← divVerent left04:11
← kingfishr left04:11
← topi left04:11
← adrien left04:11
← nobody left04:11
← Risar left04:11
← vpilo left04:11
← thedeeno left04:11
← issyl0 left04:11
← mstormo left04:11
← crazed left04:11
← jasom left04:11
← fauxhawk left04:11
← twmi left04:11
← odin_ left04:11
← baccenfutter left04:11
← shad left04:11
← wanders left04:11
← spb left04:11
← kmap left04:11
← ozzloy left04:11
← alip left04:11
← crankharder left04:11
← sbob left04:11
← davr left04:11
← wagle left04:11
← teknotus left04:11
← electrogeek left04:11
← Chillance left04:11
← unreal left04:11
← Eaven left04:11
← welly left04:11
← davidc_ left04:11
← elijahbal left04:11
← impulze left04:11
← mquin left04:11
← yashi left04:11
← daethorian left04:11
← shade\ left04:11
← jpieper left04:11
← floppyears left04:11
← dwmw2_ left04:11
← jeffszusz left04:11
← JamesA left04:11
← jspiros left04:11
← sunn left04:11
← Gullik left04:11
← uau left04:11
← NfNitLoop left04:11
← no_maam left04:11
← cwillu_at_work left04:11
← jayne left04:11
← ndim left04:11
← joelpet left04:11
← Ratler left04:11
← stoove left04:11
← gonzojive left04:11
← hegge left04:11
← dj_tjerk left04:11
← SvenDowideit left04:11
← lu_zero left04:11
← EricInBNE left04:11
← rvalue left04:11
← optixx left04:11
← second3 left04:11
← Ingmar left04:11
← bburhans left04:11
← sven^ left04:11
← xou left04:11
← crazy2k left04:11
← Goneri left04:11
← zorzar left04:11
← nadim left04:11
← darnold left04:11
← muep left04:11
← karihre left04:11
← reaVer left04:11
← Will| left04:11
← Veinor left04:11
← FauxFaux left04:11
← MacGyverNL left04:11
← madduck left04:11
← septic left04:11
← picasso left04:11
← niki left04:11
← mmattice left04:11
← jenk left04:11
← Carneus left04:11
← ke4qqq left04:11
← avtobiff left04:11
← homa_rano left04:11
← scottz_ left04:11
← tonyj left04:11
← arkx left04:11
← jailbox left04:11
← stuffcorpse left04:11
← codejunky left04:12
← sgronblo left04:12
← sjn left04:12
← vlt left04:12
← jakob left04:12
← coopsh left04:12
← metze_away left04:12
← solatis left04:12
← Ferris left04:12
← ayaka_t left04:12
← siprbaum left04:12
← housetier left04:12
← blueshift left04:12
← pom left04:12
← s0enke left04:12
← dennda left04:12
→ sftp_ joined04:12
← Sigma left04:12
→ _jexmex joined04:12
→ nothingmuch_ joined04:12
→ iff_ joined04:12
← SpiceMan left04:12
→ rtyler_ joined04:12
→ Tabstar joined04:12
→ SpiceMan joined04:12
← Tabstar left04:12
← _jexmex left04:12
← nevyn_ left04:12
← ft left04:12
← doener left04:12
← brizly1 left04:12
← dna left04:12
← mastro left04:12
← aspotashev left04:12
← lemonchicken left04:12
← bartman left04:12
← Haarg left04:12
← cehteh left04:12
← Whoop left04:12
← dermoth left04:12
← awx left04:12
→ taufiqkh joined04:12
→ Tabstar joined04:12
→ _jexmex joined04:12
→ nevyn_ joined04:12
→ ft joined04:12
→ doener joined04:12
→ brizly1 joined04:12
→ dna joined04:12
→ mastro joined04:12
→ aspotashev joined04:12
→ lemonchicken joined04:12
→ bartman joined04:12
→ Haarg joined04:12
→ cehteh joined04:12
→ Whoop joined04:12
→ dermoth joined04:12
→ awx joined04:12
→ fda314925 joined04:12
→ bremner joined04:12
→ jettero joined04:12
→ rektide joined04:12
→ Liberum joined04:12
→ csgeek joined04:12
→ blinky joined04:12
→ cantoma joined04:12
→ tokkee joined04:12
→ bjornbjorn joined04:12
→ andres joined04:12
→ zenwryly` joined04:13
→ milli` joined04:13
→ pragma_ joined04:13
SpiceMan → 18VAA9RZ804:13
pragma_ → Guest1034104:14
koollman → 84XAAO6F504:14
junebugreport → 84XAANC6T04:14
makubi → 84XAAPBDJ04:14
← sivy left04:14
→ Sigma joined04:14
← bgy left04:14
← Vampire0_ left04:14
← 84XAANC6T left04:14
← iff left04:14
← 84XAAPBDJ left04:14
← nothingmuch left04:14
← 84XAAO6F5 left04:14
→ LeLutin_ joined04:14
→ mrico joined04:14
→ dirker joined04:14
→ comawhite joined04:14
→ makubi joined04:14
→ junebugreport joined04:14
→ BAAVBOK joined04:14
→ koollman joined04:14
→ CAAZ09I joined04:14
→ kloeri joined04:14
→ jamuraa joined04:14
→ stamina_ joined04:14
→ David-T_ joined04:14
→ rettub_ joined04:14
→ tye_ joined04:14
→ krawek joined04:14
→ tic_ joined04:14
→ sitaram_ joined04:14
→ Snow-Man_ joined04:14
→ nionith joined04:14
→ ribasushi joined04:14
→ dj_tjerk joined04:14
→ StuckMojo joined04:14
→ SvenDowideit joined04:14
→ johnjay joined04:14
→ robins joined04:14
→ kadoban joined04:14
→ lu_zero joined04:14
→ NAA7BID joined04:14
→ Chillance joined04:14
→ luis joined04:14
→ context- joined04:14
→ vals_ joined04:14
→ kpreid joined04:14
→ aeioyou joined04:14
→ Yuffster joined04:14
→ henkboom joined04:14
→ unreal joined04:14
→ justin-george joined04:14
→ Heimidal joined04:14
→ Eaven joined04:14
→ entrigan joined04:14
→ Elfe_ joined04:14
→ TML joined04:14
→ andrewl joined04:14
→ tildeequals joined04:14
→ hyperair joined04:14
→ ignatp joined04:14
→ Bombe joined04:14
→ Chaser_ joined04:14
→ frakturfreak joined04:14
→ torben_ joined04:14
→ steveire joined04:14
→ hagebake joined04:14
→ \mjd joined04:14
→ Bucciarati joined04:14
→ emmanueloga joined04:14
→ s0ber_ joined04:14
→ brntbeer joined04:14
→ lcuk joined04:14
→ CoinOpeBoy joined04:14
→ EricInBNE joined04:14
→ adymitruk joined04:14
→ eletuchy joined04:14
→ TheUni joined04:14
→ rvalue joined04:14
→ Aikawa joined04:14
→ vinse joined04:14
→ slakmagik joined04:14
→ drubies joined04:14
→ Andy_ODT_1 joined04:14
→ davidc_ joined04:14
→ _Vi joined04:14
→ Kovensky joined04:14
→ RobertLaptop_ joined04:14
→ squentin joined04:14
→ hasen joined04:14
→ programble joined04:14
→ yann joined04:14
→ adxp-2`` joined04:14
→ optixx joined04:14
→ wereHamster joined04:14
→ jast joined04:14
→ second3 joined04:14
→ biz joined04:14
→ patrikf joined04:14
→ knittl joined04:14
→ Ingmar joined04:14
→ BeerSerc joined04:14
→ charon joined04:14
→ cYmen joined04:14
→ sven^ joined04:14
→ bburhans joined04:14
→ pielgrzym joined04:14
→ binjured joined04:14
→ crankharder joined04:14
→ xou joined04:14
→ marc_kdab_ joined04:14
→ stevepsharpe joined04:14
→ saiyr9000 joined04:14
→ jkp joined04:14
→ stymo joined04:14
→ Aides joined04:14
→ tedoc2000 joined04:14
→ crazy2k joined04:14
→ stepnem joined04:14
→ monokrome joined04:14
→ AlexanderS joined04:14
→ AAA_awright joined04:14
→ jtauber joined04:14
→ poli joined04:14
→ w00tz joined04:14
→ GodEater joined04:14
→ madewokherd joined04:14
→ jjuran joined04:14
→ DrNick joined04:14
→ Oxf13 joined04:14
→ jksz joined04:14
→ Goneri joined04:14
→ Gitbot joined04:14
→ jds joined04:14
→ curtana joined04:14
→ zorzar joined04:14
→ esc joined04:14
→ Amorphous joined04:14
→ NuubiRuby_ joined04:14
→ divVerent joined04:14
→ Tuomas joined04:14
→ daethorian joined04:14
→ LeLutin joined04:14
→ kingfishr joined04:14
→ Leemp joined04:14
→ Veinor joined04:14
→ topi joined04:14
→ GTXL94 joined04:14
→ resmo joined04:14
→ chkpnt joined04:14
→ jason237 joined04:14
→ chitragupt joined04:14
→ up_the_irons joined04:14
→ candybar joined04:14
→ Thumper_ joined04:14
→ Zeelot3k joined04:14
→ SRabbelier joined04:14
→ traviscline joined04:14
→ adam[pac] joined04:14
→ adrien joined04:14
→ nobody joined04:14
→ wolog joined04:14
→ tomaw joined04:14
→ elijahbal joined04:14
→ impulze joined04:14
→ drry joined04:14
→ sejo joined04:14
→ NuubiRuby joined04:14
→ dionoea joined04:14
→ niko joined04:14
→ mquin joined04:14
→ MetaCosm joined04:14
→ unixtippse joined04:14
→ bball__ joined04:14
→ ryanakca joined04:14
→ yashi joined04:14
→ Risar joined04:14
→ dfr|work joined04:14
→ ska-fan joined04:14
→ nimrod10 joined04:14
→ shade\ joined04:14
→ marienz joined04:14
→ peper joined04:14
→ d1zzy joined04:14
→ jpieper joined04:14
→ vpilo joined04:14
→ trash joined04:14
→ stockholm joined04:14
→ koki joined04:14
→ __ed joined04:14
→ trochala joined04:14
→ jones- joined04:14
→ hyperboreean joined04:14
→ bartek joined04:14
→ hsa2|gone joined04:14
→ thedeeno joined04:14
→ agile joined04:14
→ ricky joined04:14
→ nsussman` joined04:14
→ mackstann joined04:14
→ termie joined04:14
→ nadim joined04:14
→ issyl0 joined04:14
→ agib joined04:14
→ diofeher joined04:14
→ floppyears joined04:14
→ Caelum joined04:14
→ jarh joined04:14
→ doki_pen joined04:14
→ GarethAdams|Work joined04:14
→ merlin83 joined04:14
→ EvanCarroll joined04:14
→ chuck joined04:14
→ crazed joined04:14
→ tmz joined04:14
→ walf443 joined04:14
→ CompanionCube joined04:14
→ BP{k} joined04:14
→ ScottMac joined04:14
→ odin_ joined04:14
→ bgerber joined04:14
→ elliottcable joined04:14
→ armenb_ joined04:14
→ darnold joined04:14
→ Reticenti joined04:14
→ muep joined04:14
→ Soliton joined04:14
→ crab joined04:14
→ krunaldo joined04:14
→ Husio joined04:14
→ dwmw2_ joined04:14
→ karihre joined04:14
→ joschi joined04:14
→ grumpytoad joined04:14
→ reaVer joined04:14
→ jasom joined04:14
→ Will| joined04:14
→ jeffszusz joined04:14
→ th1 joined04:14
→ JamesA joined04:14
→ Bartman007 joined04:14
→ avar joined04:14
→ jspiros joined04:14
→ cbreak joined04:14
→ sunn joined04:14
→ tahorg joined04:14
→ thomas_b joined04:14
→ tchan joined04:14
→ FauxFaux joined04:14
→ xrogaan joined04:14
→ adamholt joined04:14
→ meuh joined04:14
→ MacGyverNL joined04:14
→ ebneter joined04:14
→ sjn joined04:14
→ madduck joined04:14
→ septic joined04:14
→ Ramblurr joined04:14
→ ericdc joined04:14
→ Gullik joined04:14
→ fauxhawk joined04:14
→ manjunaths joined04:14
→ d1b joined04:14
→ przemoc joined04:14
→ sobersabre joined04:14
→ uau joined04:14
→ gonzojive joined04:14
→ pom joined04:14
→ s0enke joined04:14
→ dennda joined04:14
→ siprbaum joined04:14
→ ayaka_t joined04:14
→ Ferris joined04:14
→ solatis joined04:14
→ metze_away joined04:14
→ housetier joined04:14
→ coopsh joined04:14
→ jakob joined04:14
→ vlt joined04:14
→ sgronblo joined04:14
→ blueshift joined04:14
→ codejunky joined04:14
→ hegge joined04:14
→ davr joined04:14
→ wagle joined04:14
→ teknotus joined04:14
→ electrogeek joined04:14
→ sbob joined04:14
→ yacc joined04:14
→ AlexP joined04:14
→ bs joined04:14
→ EgS joined04:14
→ comcor joined04:14
→ pcc1 joined04:14
→ felipe joined04:14
→ alip joined04:14
→ stuffcorpse joined04:14
→ jacobat joined04:14
→ Ratler joined04:14
→ JonasF joined04:14
→ ozzloy joined04:14
→ jailbox joined04:14
→ eMBee joined04:14
→ jham joined04:14
→ defn joined04:14
→ LotR joined04:14
→ bnovc joined04:14
→ zchydem joined04:14
→ teuf joined04:14
→ stoove joined04:14
→ arkx joined04:14
→ tghw joined04:14
→ joelpet joined04:14
→ StyleWarz joined04:14
→ zomg joined04:14
→ majoh joined04:14
→ kmap joined04:14
→ spb joined04:14
→ fualo joined04:14
→ ndim joined04:14
→ tonyj joined04:14
→ wanders joined04:14
→ homa_rano joined04:14
→ jayne joined04:14
→ shad joined04:14
→ cwillu_at_work joined04:14
→ Hadaka joined04:14
→ avtobiff joined04:14
→ Grum joined04:14
→ baccenfutter joined04:14
→ guerrilla joined04:14
→ ke4qqq joined04:14
→ Carneus joined04:14
→ injekt joined04:14
→ scottz_ joined04:14
→ no_maam joined04:14
→ ijuma joined04:14
→ NfNitLoop joined04:14
→ jenk joined04:14
→ mmattice joined04:14
→ niki joined04:14
→ tg joined04:14
→ twmi joined04:14
→ joevano joined04:14
→ eldragon joined04:14
→ buu joined04:14
→ elb0w joined04:14
→ Khisanth joined04:14
→ Rhonda joined04:14
→ hachi joined04:14
→ rduplain joined04:14
→ Juri_Agarin joined04:14
→ picasso joined04:14
→ selckin joined04:14
→ tro joined04:14
→ chrizz joined04:14
→ frsk joined04:14
→ bd joined04:14
→ Ilari_antrcomp joined04:14
→ fahadsadah joined04:14
→ mapreduce joined04:14
→ Arjen joined04:14
→ mattw joined04:14
→ Tasser joined04:14
→ JStoker joined04:14
→ trodrigues joined04:14
→ gabiruh joined04:14
→ kokx joined04:14
→ ponzao____ joined04:14
→ LucasWilcox joined04:14
→ xaxes joined04:14
→ halfline joined04:14
→ raim0 joined04:14
→ cota joined04:14
→ rudi_s joined04:14
→ ahf joined04:14
→ dmlloyd joined04:14
→ wimt joined04:14
→ jjcm joined04:14
→ Nilbus joined04:14
→ s4msung joined04:14
→ Woody2143 joined04:14
→ nick_h_ joined04:14
→ Ilari joined04:14
→ naquad joined04:14
→ broonie joined04:14
→ Slush- joined04:14
← logankoester left04:14
← stamina left04:14
← nevyn left04:14
← tye left04:14
← xenoterracide left04:14
nothingmuch_ → nothingmuch04:15
→ KindOne joined04:15
→ Vampire0_ joined04:15
→ logankoester joined04:15
← tyru left04:15
18VAA9RZ8 → SpiceMan04:15
→ bgy_ joined04:15
← stamina_ left04:15
← entrigan left04:15
← CoinOpeBoy left04:15
← Oxf13 left04:15
← MetaCosm left04:15
← chkpnt left04:15
← marienz left04:15
← d1zzy left04:15
← GarethAdams|Work left04:15
← walf443 left04:15
← termie left04:15
← tmz left04:15
← Snow-Man_ left04:15
← Aikawa left04:15
← DrNick left04:15
← niko left04:15
← chuck left04:15
← NuubiRuby_ left04:15
← NuubiRuby left04:15
← jamuraa left04:15
← comawhite left04:15
← krawek left04:15
← nionith left04:15
← kadoban left04:15
← context- left04:15
← aeioyou left04:15
← Yuffster left04:15
← henkboom left04:15
← KindOne left04:15
← ignatp left04:15
← hagebake left04:15
← \mjd left04:15
← emmanueloga left04:15
← brntbeer left04:15
← vinse left04:15
← _Vi left04:15
← RobertLaptop_ left04:15
← hasen left04:15
← programble left04:15
← knittl left04:15
← charon left04:15
← marc_kdab_ left04:15
← jkp left04:15
← jtauber left04:15
← madewokherd left04:15
← jjuran left04:15
← Gitbot left04:15
← curtana left04:15
← resmo left04:15
← pielgrzym left04:15
← chitragupt left04:15
← candybar left04:15
← SRabbelier left04:15
← traviscline left04:15
← stymo left04:15
← jones- left04:15
← agile left04:15
← ricky left04:15
← nsussman` left04:15
← mackstann left04:15
← ebneter left04:15
← Ramblurr left04:15
← ericdc left04:15
← manjunaths left04:15
← chrizz left04:15
← eldragon left04:15
← elb0w left04:15
← buu left04:15
← Khisanth left04:15
← Rhonda left04:15
← hachi left04:15
← rduplain left04:15
← Juri_Agarin left04:15
← junebugreport left04:15
← slakmagik left04:15
← BeerSerc left04:15
← jksz left04:15
← Tuomas left04:15
← jason237 left04:15
← drry left04:15
← sejo left04:15
← dionoea left04:15
← ska-fan left04:15
← peper left04:15
← trash left04:15
← __ed left04:15
← adxp-2`` left04:15
← bartek left04:15
← Caelum left04:15
← doki_pen left04:15
← elliottcable left04:15
← Bartman007 left04:15
← tahorg left04:15
← joevano left04:15
← diofeher left04:15
← dirker left04:15
← sitaram_ left04:15
← StuckMojo left04:15
← robins left04:15
← kpreid left04:15
← justin-george left04:15
← Elfe_ left04:15
← tildeequals left04:15
← hyperair left04:15
← cYmen left04:15
← poli left04:15
← esc left04:15
← Leemp left04:15
← squentin left04:15
← wolog left04:15
← bball__ left04:15
← stockholm left04:15
← hyperboreean left04:15
← merlin83 left04:15
← avar left04:15
← tchan left04:15
← tro left04:15
← Grum left04:15
← sobersabre left04:15
← fualo left04:15
← eMBee left04:15
← jham left04:15
← defn left04:15
← LotR left04:15
← bnovc left04:15
← zchydem left04:15
← teuf left04:15
← ribasushi left04:15
← johnjay left04:15
← vals_ left04:15
← Heimidal left04:15
← Bombe left04:15
← steveire left04:15
← eletuchy left04:15
← yann left04:15
← biz left04:15
← patrikf left04:15
← stepnem left04:15
← Zeelot3k left04:15
← adam[pac] left04:15
← tomaw left04:15
← unixtippse left04:15
← nimrod10 left04:15
← jarh left04:15
← Reticenti left04:15
← grumpytoad left04:15
← cbreak left04:15
← thomas_b left04:15
← przemoc left04:15
← selckin left04:15
← tg left04:15
← ijuma left04:15
← injekt left04:15
← guerrilla left04:15
← monokrome left04:15
← Hadaka left04:15
← majoh left04:15
← zomg left04:15
← StyleWarz left04:15
← tghw left04:15
← agib left04:15
← crab left04:15
← JonasF left04:15
← jacobat left04:15
← felipe left04:15
← yacc left04:15
← AlexP left04:15
← bs left04:15
← EgS left04:15
← comcor left04:15
← pcc1 left04:15
← bgy_ left04:15
← mrico left04:15
← makubi left04:15
← kloeri left04:15
← rettub_ left04:15
← tye_ left04:15
← luis left04:15
← Chaser_ left04:15
← frakturfreak left04:15
← drubies left04:15
← Kovensky left04:15
← binjured left04:15
← w00tz left04:15
← divVerent left04:15
← kingfishr left04:15
← topi left04:15
← adrien left04:15
← nobody left04:15
← Risar left04:15
← vpilo left04:15
← thedeeno left04:15
← issyl0 left04:15
← crazed left04:15
← jasom left04:15
← fauxhawk left04:15
← twmi left04:15
← odin_ left04:15
← baccenfutter left04:15
← shad left04:15
← wanders left04:15
← spb left04:15
← kmap left04:15
← ozzloy left04:15
← alip left04:15
← crankharder left04:15
← sbob left04:15
← davr left04:15
← wagle left04:15
← teknotus left04:15
← electrogeek left04:15
← koollman left04:15
← Chillance left04:15
← unreal left04:15
← Eaven left04:15
← davidc_ left04:15
← elijahbal left04:15
← impulze left04:15
← mquin left04:15
← yashi left04:15
← daethorian left04:15
← shade\ left04:15
← jpieper left04:15
← floppyears left04:15
← dwmw2_ left04:15
← jeffszusz left04:15
← JamesA left04:15
← jspiros left04:15
← sunn left04:15
← Gullik left04:15
← uau left04:15
← NfNitLoop left04:15
← no_maam left04:15
← cwillu_at_work left04:15
← jayne left04:15
← ndim left04:15
← joelpet left04:15
← Ratler left04:15
← stoove left04:15
← gonzojive left04:15
← hegge left04:15
← David-T_ left04:15
← dj_tjerk left04:15
← SvenDowideit left04:15
← lu_zero left04:15
← EricInBNE left04:15
← rvalue left04:15
← optixx left04:15
← second3 left04:15
← Ingmar left04:15
← bburhans left04:15
← sven^ left04:15
← xou left04:15
← crazy2k left04:15
← Goneri left04:15
← zorzar left04:15
← nadim left04:15
← darnold left04:15
← muep left04:15
← karihre left04:15
← reaVer left04:15
← Will| left04:15
← Veinor left04:15
← FauxFaux left04:15
← MacGyverNL left04:15
← madduck left04:15
← septic left04:15
← picasso left04:15
← niki left04:15
← mmattice left04:15
← jenk left04:15
← Carneus left04:15
← ke4qqq left04:15
← avtobiff left04:15
← homa_rano left04:15
← scottz_ left04:15
← tonyj left04:15
← arkx left04:15
← jailbox left04:15
← stuffcorpse left04:15
← codejunky left04:15
← sgronblo left04:15
← sjn left04:15
← vlt left04:15
← jakob left04:15
← coopsh left04:15
← metze_away left04:15
← solatis left04:15
← Ferris left04:15
← ayaka_t left04:15
← siprbaum left04:15
← housetier left04:15
← blueshift left04:15
← pom left04:15
← s0enke left04:15
← dennda left04:15
← SpiceMan left04:15
← LeLutin left04:15
nevyn_ → nevyn04:16
→ krawek joined04:17
← tedoc2000 left04:17
← jexmex left04:17
← sftp left04:17
← vmiklos left04:17
← sshc left04:17
← zenwryly left04:17
→ xenoterracide joined04:17
→ vmiklos joined04:17
→ comawhite joined04:18
→ lamont joined04:18
→ bgy_ joined04:18
→ KindOne joined04:18
→ mrico joined04:18
→ dirker joined04:18
→ makubi joined04:18
→ junebugreport joined04:18
→ BAAVBOK joined04:18
→ koollman joined04:18
→ CAAZ09I joined04:18
→ kloeri joined04:18
→ jamuraa joined04:18
→ stamina_ joined04:18
→ David-T_ joined04:18
→ rettub_ joined04:18
→ tye_ joined04:18
→ sitaram_ joined04:18
→ Snow-Man_ joined04:18
→ nionith joined04:18
→ ribasushi joined04:18
→ dj_tjerk joined04:18
→ StuckMojo joined04:18
→ SvenDowideit joined04:18
→ johnjay joined04:18
→ robins joined04:18
→ kadoban joined04:18
→ lu_zero joined04:18
→ Chillance joined04:18
→ luis joined04:18
→ context- joined04:18
→ vals_ joined04:18
→ kpreid joined04:18
→ aeioyou joined04:18
→ Yuffster joined04:18
→ henkboom joined04:18
→ unreal joined04:18
→ justin-george joined04:18
→ Heimidal joined04:18
→ Eaven joined04:18
→ entrigan joined04:18
→ Elfe_ joined04:18
→ tildeequals joined04:18
→ hyperair joined04:18
→ ignatp joined04:18
→ Bombe joined04:18
→ Chaser_ joined04:18
→ frakturfreak joined04:18
→ steveire joined04:18
→ hagebake joined04:18
→ \mjd joined04:18
→ emmanueloga joined04:18
→ brntbeer joined04:18
→ CoinOpeBoy joined04:18
→ EricInBNE joined04:18
→ eletuchy joined04:18
→ rvalue joined04:18
→ Aikawa joined04:18
→ vinse joined04:18
→ slakmagik joined04:18
→ drubies joined04:18
→ davidc_ joined04:18
→ _Vi joined04:18
→ Kovensky joined04:18
→ RobertLaptop_ joined04:18
→ squentin joined04:18
→ hasen joined04:18
→ programble joined04:18
→ yann joined04:18
→ adxp-2`` joined04:18
→ optixx joined04:18
→ second3 joined04:18
→ biz joined04:18
→ patrikf joined04:18
→ knittl joined04:18
→ Ingmar joined04:18
→ BeerSerc joined04:18
→ charon joined04:18
→ cYmen joined04:18
→ sven^ joined04:18
→ bburhans joined04:18
→ pielgrzym joined04:18
→ binjured joined04:18
→ crankharder joined04:18
→ xou joined04:18
→ marc_kdab_ joined04:18
→ jkp joined04:18
→ stymo joined04:18
→ crazy2k joined04:18
→ stepnem joined04:18
→ monokrome joined04:18
→ jtauber joined04:18
→ poli joined04:18
→ w00tz joined04:18
→ madewokherd joined04:18
→ jjuran joined04:18
→ DrNick joined04:18
→ Oxf13 joined04:18
→ jksz joined04:18
→ Gitbot joined04:18
→ curtana joined04:18
→ zorzar joined04:18
→ esc joined04:18
→ NuubiRuby_ joined04:18
→ divVerent joined04:18
→ Tuomas joined04:18
→ daethorian joined04:18
→ kingfishr joined04:18
→ Leemp joined04:18
→ Veinor joined04:18
→ topi joined04:18
→ resmo joined04:18
→ chkpnt joined04:18
→ jason237 joined04:18
→ chitragupt joined04:18
→ candybar joined04:18
→ Zeelot3k joined04:18
→ SRabbelier joined04:18
→ traviscline joined04:18
→ adam[pac] joined04:18
→ adrien joined04:18
→ nobody joined04:18
→ wolog joined04:18
→ tomaw joined04:18
→ elijahbal joined04:18
→ impulze joined04:18
→ drry joined04:18
→ sejo joined04:18
→ NuubiRuby joined04:18
→ dionoea joined04:18
→ niko joined04:18
→ mquin joined04:18
→ MetaCosm joined04:18
→ unixtippse joined04:18
→ bball__ joined04:18
→ yashi joined04:18
→ Risar joined04:18
→ ska-fan joined04:18
→ nimrod10 joined04:18
→ shade\ joined04:18
→ peper joined04:18
→ d1zzy joined04:18
→ jpieper joined04:18
→ vpilo joined04:18
→ trash joined04:18
→ stockholm joined04:18
→ __ed joined04:18
→ jones- joined04:18
→ hyperboreean joined04:18
→ bartek joined04:18
→ thedeeno joined04:18
→ agile joined04:18
→ ricky joined04:18
→ nsussman` joined04:18
→ mackstann joined04:18
→ termie joined04:18
→ nadim joined04:18
→ issyl0 joined04:18
→ agib joined04:18
→ diofeher joined04:18
→ floppyears joined04:18
→ Caelum joined04:18
→ jarh joined04:18
→ doki_pen joined04:18
→ GarethAdams|Work joined04:18
→ merlin83 joined04:18
→ chuck joined04:18
→ crazed joined04:18
→ tmz joined04:18
→ walf443 joined04:18
→ odin_ joined04:18
→ elliottcable joined04:18
→ darnold joined04:18
→ Reticenti joined04:18
→ muep joined04:18
→ crab joined04:18
→ dwmw2_ joined04:18
→ karihre joined04:18
→ grumpytoad joined04:18
→ reaVer joined04:18
→ jasom joined04:18
→ Will| joined04:18
→ jeffszusz joined04:18
→ JamesA joined04:18
→ Bartman007 joined04:18
→ avar joined04:18
→ jspiros joined04:18
→ cbreak joined04:18
→ sunn joined04:18
→ tahorg joined04:18
→ thomas_b joined04:18
→ tchan joined04:18
→ FauxFaux joined04:18
→ MacGyverNL joined04:18
→ ebneter joined04:18
→ sjn joined04:18
→ madduck joined04:18
→ septic joined04:18
→ Ramblurr joined04:18
→ ericdc joined04:18
→ Gullik joined04:18
→ fauxhawk joined04:18
→ manjunaths joined04:18
→ przemoc joined04:18
→ sobersabre joined04:18
→ uau joined04:18
→ gonzojive joined04:18
→ chrizz joined04:18
→ tro joined04:18
→ selckin joined04:18
→ picasso joined04:18
→ Juri_Agarin joined04:18
→ rduplain joined04:18
→ hachi joined04:18
→ Rhonda joined04:18
→ Khisanth joined04:18
→ elb0w joined04:18
→ buu joined04:18
→ eldragon joined04:18
→ joevano joined04:18
→ twmi joined04:18
→ tg joined04:18
→ niki joined04:18
→ mmattice joined04:18
→ jenk joined04:18
→ NfNitLoop joined04:18
→ ijuma joined04:18
→ no_maam joined04:18
→ scottz_ joined04:18
→ injekt joined04:18
→ Carneus joined04:18
→ ke4qqq joined04:18
→ guerrilla joined04:18
→ baccenfutter joined04:18
→ Grum joined04:18
→ avtobiff joined04:18
→ Hadaka joined04:18
→ cwillu_at_work joined04:18
→ shad joined04:18
→ jayne joined04:18
→ homa_rano joined04:18
→ wanders joined04:18
→ tonyj joined04:18
→ ndim joined04:18
→ fualo joined04:18
→ spb joined04:18
→ kmap joined04:18
→ majoh joined04:18
→ zomg joined04:18
→ StyleWarz joined04:18
→ joelpet joined04:18
→ tghw joined04:18
→ arkx joined04:18
→ stoove joined04:18
→ teuf joined04:18
→ zchydem joined04:18
→ bnovc joined04:18
→ LotR joined04:18
→ defn joined04:18
→ jham joined04:18
→ eMBee joined04:18
→ jailbox joined04:18
→ ozzloy joined04:18
→ JonasF joined04:18
→ Ratler joined04:18
→ jacobat joined04:18
→ stuffcorpse joined04:18
→ alip joined04:18
→ felipe joined04:18
→ pcc1 joined04:18
→ comcor joined04:18
→ EgS joined04:18
→ bs joined04:18
→ AlexP joined04:18
→ yacc joined04:18
→ sbob joined04:18
→ electrogeek joined04:18
→ teknotus joined04:18
→ wagle joined04:18
→ davr joined04:18
→ hegge joined04:18
→ codejunky joined04:18
→ blueshift joined04:18
→ sgronblo joined04:18
→ vlt joined04:18
→ jakob joined04:18
→ coopsh joined04:18
→ housetier joined04:18
→ metze_away joined04:18
→ solatis joined04:18
→ Ferris joined04:18
→ ayaka_t joined04:18
→ siprbaum joined04:18
→ dennda joined04:18
→ s0enke joined04:18
→ pom joined04:18
→ mstormo joined04:18
← mstormo left04:18
→ mstormo joined04:18
← thedeeno left04:18
← mrico left04:19
steph021 Ilari + sitaram_ : thanks for your help, after i got git-daemon running public read access works04:19
→ mrico joined04:19
kloeri → Guest690804:19
→ Goneri joined04:20
→ sivy joined04:21
→ marienz joined04:21
→ apsysoev joined04:24
→ sunaku joined04:26
→ adamm joined04:26
← marc_kdab_ left04:27
← sunaku left04:28
→ AngryParsley joined04:32
← AngryParsley left04:33
← marienz left04:34
← apsysoev left04:35
→ thisch joined04:35
cpg|away → cpg04:39
→ thwart joined04:40
← KindOne left04:40
→ aspotashev| joined04:40
← aspotashev left04:41
← mrico left04:42
← sivy left04:43
→ coppro joined04:43
→ slonopotamus joined04:45
→ sh1mmer joined04:49
zenwryly` → serenely04:51
blueshift ignores joins parts quits nicks here.. ah, peace and quiet(ish)04:51
serenely → zenwryly04:51
→ marienz joined04:51
← hearit left04:54
nevyn hrm04:54
← ignatp left04:57
rtyler_ → rtyler05:00
← hyperair left05:01
← jonmasters left05:01
← marienz left05:04
→ freimatz joined05:04
← _Vi left05:05
← hagebake left05:05
← Guest10341 left05:05
→ Guest10341 joined05:05
Guest10341 → pragma05:05
pragma → pragma_05:05
→ hyperair joined05:06
aeioyou how can I checkout my project from my localhost into a separate directory? I need to get only my versioned files out of a greater ap and i'm new to git05:06
selckin clone it05:07
← krawek left05:08
→ lightcap joined05:09
→ fmardini joined05:10
aeioyou sweet that was easy enough thanks05:10
← thisch left05:12
← hyperair left05:13
→ mithro joined05:13
aeioyou wow git is awesome05:16
→ jonmasters joined05:18
← justin-george left05:20
→ marc_kdab_ joined05:21
→ johnw joined05:22
← aeioyou left05:26
← AAA_awright left05:27
→ bambule joined05:28
→ Belna joined05:28
→ welly joined05:29
→ portablejim joined05:29
→ vu3rdd joined05:29
→ killerchicken_ joined05:30
→ scott_ joined05:30
scott_ how can I move my 4 latest commits to a new branch?05:31
mapreduce git branch newbranch05:32
frogonwheels scott_: make sure your tree is clean, then git branch branchname ; git reset --hard HEAD~405:32
← comawhite left05:32
← molokai left05:32
frogonwheels presuming you wanted your current branch to be back 4 commits05:32
scott_ yes, thanks05:32
frogonwheels scott_: then git checkout branchname and away you go.05:33
scott_ yep05:33
→ molokai joined05:33
← kingfishr left05:35
→ hasen_ joined05:35
cpg → cpg|away05:35
→ JonathanT joined05:36
← hasen left05:39
→ hasen joined05:39
→ krawek joined05:40
← hasen_ left05:40
portablejim Would there be an easy (nice) way to manage this ( http://gist.github.com/491795 ) file structure with git, while allowing all files to be cloned to another location?05:40
Bombe I’m not quite sure what you think Git is doing.05:43
← davidc_ left05:43
→ AAA_awright joined05:45
cmyers portablejim: why not `cd UniWork && git init && git add -A && git commit`05:45
portablejim I will want to work with branches for my programming subject while working on other subjects.05:47
→ roop joined05:47
portablejim *not at the same time05:47
But I will be switching between subjects.05:48
← scott_ left05:48
cmyers ..kay..05:49
so you want to be able to change branches in each directory independently?05:49
← Yuffster left05:49
→ Yuffster joined05:50
portablejim cmyers, yes (or at least I think so - I am a newb).05:51
cmyers portablejim: there are two possibilities05:51
← EspenG left05:52
cmyers either 1. your projects are "big" enough that each deserves its own repo - simply type "git init" in each directory and it creats a repo, then you can check things in and start tracking them05:52
→ opalka joined05:52
cmyers or 2. your projects are too small to warrant their own repo05:52
and changing branches is SO fast it won't even matter, so you might as well keep it all in one repo.05:52
I find that even repos over 50MB still change branches in under 1 second.05:53
so I suspect you are looking at option 2 here.05:53
git is designed and optimized for fast context switch05:53
portablejim yes.05:53
cmyers the only reason why you might choose to go #1, IMHO, is if you plan to share those projects with other people05:54
for example, assignment 1 you work with one group of people, and assignment 2 you work with some other group - and you use git to push branches around - well group 1 doesn't want to get files from project 2.05:54
follow?05:55
→ toabctl joined05:55
portablejim yes.05:55
is there a way to push part of a repo?05:56
or a way to work with multiple repos?05:56
← slonopotamus left05:57
cmyers you can't really push part of a repo. of course, you can make a tarball or a patch and push that arond but it is a pain05:59
remote operations operate at "entire branch" granularity.05:59
as for multiple repos, there is no "way" to do it - you just do it05:59
when you are in the directory, you are using it, when you are in some other directory, you are using another repo05:59
it pretty much just works05:59
← toabctl left06:00
cmyers I have a directory with like 30 different repos in each of 30 subdirectories and it just works.06:00
→ psankar joined06:00
cmyers just as you can't break apart a single repo, however, you can't join together multiple for the purpose of introspection - for example, if you wanted to find all teh changes you made on a given day, you'd have to run a command in each repo.06:01
← sitaram_ left06:02
→ slonopotamus joined06:02
portablejim I guess I can give each subject it's own repo and then work with it separately.06:04
→ sitaram joined06:04
portablejim Then create a bash script or something to commit & push each06:05
cmyers where are you pushing them to? github or some equivalent?06:05
is the point to share each individual project with people, or just get them "somewhere" backed up that is not your personal computer?06:06
← sitaram left06:07
← steph021 left06:07
← welly left06:08
← slonopotamus left06:09
portablejim USB thumb drive or my laptop so I can work on stuff on campus. (Too much stuff to put on the web - for me at least)06:09
→ apsysoev joined06:09
→ resistor joined06:11
resistor hi06:11
← bambule left06:12
resistor is there any way to have git-svn metadata preserved when clone a repository?06:12
← programble left06:12
cmyers resistor: you can copy the repo as a tarball or something, but not with a clone, no.06:12
resistor: there is a way to take a repo you cloned from another repo that used git-svn able to use git-svn itself, but it is complicated.06:12
resistor cmyers: do you have a reference for that?06:13
→ Paraselene_ joined06:13
cmyers I couldn't find one - I painstakingly figured it out. My company is going to post an entry I wrote on our private blog soon probably.06:13
erm, on our *public* blog soon.06:14
but that doesn't help you today, so let me summarize06:14
first you clone - then you have all the history, but git-svn doesn't know anything bout it06:14
← entrigan left06:14
cmyers so then, you run `git svn init ...` with the same args the parent ran.06:14
then, for each remote svn branch run `git svn log <branchname> > /dev/null`06:15
that will "prime" git svn's metadata.06:15
then, `git svn rebase <branchname>` on each branch to pull any new changes on each branch and make sure they are all up to date06:15
portablejim cmyers, just wondering, does renaming the .git folder have any side effects (apart from git not working while it renamed)?06:15
← Yuffster left06:16
cmyers finally, if you want `git svn fetch` to work, find a very recent commit, then do `git svn fetch -r<somerecentcommit>`06:16
it will see that the metadata is there, get everythign up to date. then future invocations of `git svn fetch` should work06:16
portablejim: nope, that is right - it has no effect other than temporarily disabling git.06:16
→ justin-george joined06:17
portablejim cmyers, thanks for all your help.06:17
cmyers no problemo.06:17
David-T_ → David-T06:17
resistor cmyers: i don't think i need svn fetch to work06:17
we have a git mirror on the server that's continuously updated06:17
← lightcap left06:18
resistor the idea is that people can clone that, and then dcommit back to the svn server06:18
cmyers then you can leave off those last few steps and just do "log, rebase", then future rebase (to fetch) and dcommit (to push) for each branch should work06:18
resistor: that is *exactly* what my post is about06:18
a larger svn repo takes forever to fetch06:18
so you want to have a centralized git repo people can clone to avoid duplicating that work06:18
resistor yeah06:18
our repo is pushing 110k commits06:18
cmyers I actually wrote a script which I plan to share which you give the svn and git URL and it does the clone, then does the magic to set up git-svn.06:19
cpg|away → cpg06:19
cmyers our largest one is almost 300k commits, ~5GB. it takes over 36 hrs for git-svn fetch to run. =(06:19
iff_ → Iff06:19
→ leo2007 joined06:19
resistor cmyers: when you say <branch>, do you mean the git branch name?06:19
cmyers correct.06:19
resistor i didn't bother trying to import all of our svn branches. the layout is too complicated ;-)06:20
cmyers I guess it'd be the remote name.06:20
I presume by "complicated" you mean "broken" +)06:20
→ HG` joined06:20
resistor heh06:20
cmyers ours sure was. people using svn that don't understand source control - it might as well be monkeys on typewriters.06:20
resistor i meant our particular layout06:20
our problem is that was have some branches as subdirs of branches/ and some subdirectories that themselves contain branches, etc, etc.06:21
← Chillance left06:21
cmyers since svn has no "real" concept of branches, people do all sorts of copies and merges that make no sense and confuse the shit out of git-svn.06:21
yup, that'll do it.06:21
resistor so... git svn log origin is sitting here doing nothing :-/06:21
and consuming about 50% of a cpu06:22
is that normal?06:22
cmyers `git svn log origin/master` ?06:22
maybe.06:22
see if it is writing stuff to .git/svn/...06:22
→ sitaram joined06:22
← sitaram left06:22
→ sitaram joined06:22
cmyers it has to generate the revmap, which has a line like this: "r1234 = abcdefg123456890etc..." for each revision.06:22
resistor it's not printing anything06:23
just sitting there06:23
← sitaram left06:23
resistor and the .git/svn directory has size 0B06:23
→ sitaram joined06:23
cmyers strace it06:24
← Mage left06:24
cmyers see what it si doing =)06:24
← sitaram left06:24
resistor i'm on darwin06:24
→ sitaram joined06:24
cmyers oh, hmm.06:24
→ cbreak_work joined06:24
cxreg ktrace?06:25
cmyers all I know about darwin is every time I used it I wished it was linux =)06:26
resistor nope06:26
heh06:26
← sitaram left06:26
resistor *shrug* pays the bills ;-)06:26
cxreg seek the rosetta stone06:26
cmyers you might let it run another 5 mins or so06:26
→ sitaram joined06:26
← sitaram left06:26
→ sitaram joined06:26
cmyers but if it doesn't pring anything after that, then it is boned. not sure why =/06:26
cxreg http://bhami.com/rosetta.html06:26
dtruss?06:27
cmyers cxreg: cool site. good reference.06:29
cxreg srsly06:29
ive used that more times than i can count06:29
resistor it looks like it's infinite looping :-/06:30
doing the same read/exec/close pattern over and over06:31
cmyers are you sure it is teh same?06:31
oh, hey, what version of git is this?06:31
resistor git version 1.7.1.106:32
→ Schmallon joined06:32
cmyers hmm, ok, that's pretty new.06:32
→ toabctl joined06:32
cmyers yeh, the thing you describe is actually reassuring to me06:32
that could feasibly be what it is suposed to be doing.06:32
I'm trying to look up where the revmap is stored, it might not be .git/svn after all06:33
← opalka left06:33
blueshift cxreg: the folding of all linux distros into one column seems ugly06:33
← ajpiano left06:34
→ Titosemi joined06:34
← nsussman` left06:34
→ mindworx joined06:34
← junebugreport left06:34
→ jobor joined06:36
resistor cmyers: it ended with: fatal: bad default revision 'refs/remotes/git-svn'06:36
------------------------------------------------------------------------06:36
→ mtkd joined06:36
cmyers hmm06:37
sorry, I am stumped =(06:37
looks like .git/logs/refs/remotes/trunk contains the revmap in it for me (git 1.7.1) - I think that must have changed recently.06:38
at the end of the normal reflog line, it has the svn revision also.06:38
← Amorphous left06:40
← sitaram left06:40
← trochala left06:41
→ sitaram joined06:41
← sitaram left06:41
→ sitaram joined06:41
→ [Po]lentino joined06:42
← LongBeach left06:46
← cpg left06:47
→ cpg|away joined06:48
← _jexmex left06:52
← context- left06:53
→ Amorphous joined06:54
→ mastroDani joined06:56
← Eaven left06:57
→ trivol joined06:58
→ crazy2k_ joined06:59
← taufiqkh left07:00
crazy2k_ Hello. I have two branches. One is just ahead of the other by one commit. I want to merge the changes in the latest branch to the old one, but I'd prefer to disassemble that commit into a few, more specific commits. Any ideas?07:01
→ ralf_e joined07:01
crazy2k_ Maybe I should checkout to the old branch somehow keeping the files in my working tree and make commits from there?07:01
→ airborn joined07:02
sitaram git gui is the best tool for this, IMO07:02
→ pantsman joined07:02
← jobor left07:03
→ junebugreport joined07:04
sitaram start from a clean tree (or stash changes), Frun git gui, click on "amend last commit", move all the changes to the unstaged pane by clicking the file names, then move each set down to commit07:04
using right-click, stage hunk/line etc07:04
crazy2k_ Is it possible to checkout without touching the working tree?07:05
← \mjd left07:08
→ jexmex_ joined07:08
→ context joined07:08
→ zrbecker joined07:09
sitaram stash07:09
← sitaram left07:10
→ skoop joined07:10
sword``` → sword07:11
→ sitaram joined07:12
← junebugreport left07:12
← sitaram left07:14
→ tvw joined07:14
→ steffkes joined07:14
← tvw left07:18
→ jobor joined07:19
→ junebugreport joined07:22
← saiyr9000 left07:25
← resistor left07:25
← sh1mmer left07:28
← hebz0rl_ left07:29
← justin-george left07:30
→ roop_ joined07:30
← [Po]lentino left07:31
← krawek left07:31
→ galderz joined07:32
→ sh1mmer joined07:32
← roop left07:32
→ justin-george joined07:32
→ masterkorp joined07:33
← thwart left07:33
→ dr_win joined07:36
→ workmad3 joined07:38
→ g4bor joined07:38
Guest6908 → kloeri07:39
→ jmspeex joined07:39
← adymitruk left07:42
g4bor hi. i have a lot of git repositories hosted using smart-http. is there a way to create server-side hooks that apply to all of them?07:42
→ adymitruk joined07:43
← ralf_e left07:44
→ incubaton joined07:45
← workmad3 left07:45
← johnw left07:46
→ _Vi joined07:49
→ cilly joined07:49
← brntbeer left07:50
→ lucsky joined07:50
← lucsky left07:51
→ KL-7 joined07:53
← g4bor left07:55
← crazy2k_ left07:56
→ bschindler joined07:58
→ alex__c2022 joined07:58
← toabctl left07:58
bschindler Hi - so I've called git fetch instead of git-pull, so which command exactly is executed after the fetch git merge .... ? I don't know what to fill in there and I don't quite get the manpage07:58
cbreak_work you can just pull07:59
but yes, it's merge07:59
← Schmallon left07:59
bschindler I kinda would love to know how to properly merge them... so yeah, I could just pull, but still...08:00
← _Vi left08:00
→ jtdowney joined08:01
bschindler okay, I finally managed08:02
→ sitaram joined08:04
← sitaram left08:04
→ sitaram joined08:04
→ _Vi joined08:04
← hilikuz left08:05
leo2007 if I check in a sym link, what happens on platform that doesn't support it ie windows?08:06
Arrowmaster they get a text file with the symlink location in it i believe08:07
→ entrigan joined08:07
← alex__c2022 left08:09
frogonwheels hmm.. it would be good if translated it to an ntfs symlink ... (on ntfs of course)08:10
Arrowmaster wont happen08:11
frogonwheels why not?08:11
you mean not now, or not ever, Arrowmaster?08:11
sitaram because the path on the other side probably won't exist anyway, and it'd be hard to guess?08:12
→ Schmallon joined08:12
frogonwheels I would put money on the 'text file with the symlink'08:12
sitaram: would be ok for relative links though.08:12
→ zorzar_ joined08:12
Arrowmaster well first i dont believe ntfs symlinks are anything like posix symlinks, and ntfs only has symlinks in vista or higher right?08:12
frogonwheels Arrowmaster: well I think they have some 'interesting' differences (ie 'what were they thinking' type differences) .. but they are functionally very similar.08:13
Arrowmaster plus you would have to get msys or cgywin updated first to support it and i dont believe either of those can even handle non ascii filenames currently08:13
frogonwheels Arrowmaster: but I know that ln -s in cywin just ends up being a file as Arrowmaster described.08:13
argh sorry mentioning twice - didn't mean that.08:14
Arrowmaster: even vim doesn't support them yet :(08:14
Arrowmaster non ascii filenames?08:14
frogonwheels Arrowmaster: Writing through symlinks08:14
Arrowmaster oh08:15
frogonwheels Arrowmaster: Maybe I should get out a C compiler and fix it ;)08:15
leo2007 how to remove a commit in a remote branch?08:15
← KL-7 left08:15
← robinbowes left08:15
leo2007 ie without leave a trail08:15
frogonwheels leo2007: wind it back in the local branch, make sure everybody upstream is ok, then git push -f it up.08:15
← zorzar left08:15
frogonwheels leo2007: latest commit? or previous commit?08:16
leo2007 latest one08:16
frogonwheels leo2007: just git reset --hard HEAD~1 then git push -f08:16
leo2007: but be careful.08:16
→ KL-7 joined08:16
frogonwheels it will f* round with anybody upstream of you...08:16
← Theravadan left08:17
frogonwheels leo2007: and you can kill commits people have committed and pushed up08:17
← justin-george left08:18
leo2007 frogonwheels: worked. I'd be careful with published history thanks for the warning. Just pushed a commit by mistake.08:18
← stevepsharpe left08:20
cpg|away → cpg08:20
cpg → cpg|away08:22
→ ralf_e joined08:22
← level09 left08:23
← Paraselene_ left08:25
→ ExtraSpice joined08:25
← entrigan left08:26
← pantsman left08:27
rvsjoen_ → rvsjoen08:28
→ robinbowes joined08:28
→ barismetin joined08:31
→ tvw joined08:32
leo2007 frogonwheels: cheers.08:34
→ hebz0rl joined08:37
← leo2007 left08:37
→ myst` joined08:38
← hebz0rl left08:38
myst` hello08:39
→ hebz0rl joined08:39
myst` I get "Item is not writable: Access denied at /usr/bin/git-svn line 461" when trying to do "git svn dcommit"08:39
any suggestions?08:39
→ lhz joined08:40
myst` working copy is clean, and there's only one commit to be commited to svn08:40
erm... anyone here?08:43
rudi_s myst`: Sure, waiting only 4 minutes is a little short for IRC.08:44
→ znake joined08:44
rudi_s But I've no idea regarding your problem. What version of git are you using?08:45
→ Unhammer joined08:45
myst` git version 1.5.6.508:45
Debian Lenny08:45
rudi_s myst`: Sounds a little old. Try the version from backports.08:46
myst` I've used git-svn for almost a year before, it always just worked08:46
i can't try various versions08:46
i am not admin here08:46
rudi_s Maybe somebody else can help, I don't have much experience with git-svn.08:46
myst` git svn rebase works okay08:47
git svn dcommit fails with this message08:47
← _Vi left08:47
Unhammer so I did $ git checkout oldrevision && edit # and now I want my edits as a commit on master HEAD (ie linear history), what's the simplest way?08:47
disregarding merge problems etc ;)08:47
rudi_s myst`: What's the content of line 461?08:47
myst` Unhammer: git stash08:47
← masterkorp left08:47
→ Adriannom joined08:47
Unhammer ah so stash and checkout master works?08:48
cool, thanks myst`08:48
← sitaram left08:48
myst` rudi_s: if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) {08:48
→ didlix joined08:48
→ _Vi joined08:49
← multi_io left08:51
→ tatsuya joined08:51
→ multi_io joined08:52
rudi_s myst`: Sorry, no idea.08:53
→ rajeshsr joined08:53
← _Vi left08:53
myst` shit08:53
:-(08:53
rudi_s myst`: If you can compile stuff, you could build git in your home directory.08:54
myst` I have a hour to make this commit08:54
→ kbingham joined08:54
rudi_s myst`: You could just use SVN ..08:54
→ Mathieu joined08:54
myst` No I can't08:55
it will clone repo for 4-5 hours08:55
over 30k revisions08:55
and it isn't local08:56
now you know why I use Git :-)08:56
oh, checkout, not clone08:56
still 4-5 hrs long, tried it a year ago08:56
→ bluenovember joined08:57
→ mtkd_ joined08:57
myst` how to extract last commit as a patch?08:57
preferably with binary shit in it, since i have PNGs in the commit08:58
← rajeshsr left08:58
rudi_s myst`: git format-patch HEAD~08:58
myst` it will output to stdout?08:58
rudi_s myst`: No, create a file called 0001-...08:59
← didlix left08:59
← mtkd left09:00
→ masterkorp joined09:01
← znake left09:03
→ znake joined09:03
→ workmad3 joined09:04
← alin-gym left09:06
← frakturfreak left09:07
← znake left09:07
→ znake joined09:07
← apsysoev left09:08
→ xiong joined09:08
→ rajeshsr joined09:09
→ opalka joined09:09
→ apsysoev joined09:10
→ [Po]lentino joined09:11
← znake left09:11
→ znake joined09:13
← znake left09:14
← NuubiRuby left09:14
→ ruskie joined09:15
→ znake joined09:16
← ExtraSpice left09:18
← Unhammer left09:18
← znake left09:20
→ znake joined09:21
jds Heya09:21
Is it possible to use git grep to search for files that contain any characters outside of US-ASCII?09:21
→ blueflyy joined09:22
blueflyy how do I make git-diff not show ^M at end of lines? (I don't want to convert EOLs to LFs)09:22
charon blueflyy: --ignore-space-at-eol ?09:24
blueflyy tried that, doesn't do anything09:24
charon oh you mean on lines that were actually changed09:24
blueflyy yeah09:25
cbreak_work you want git to not show the contents of the diff?09:25
charon that's just git-diff being faithful, and less quoting it09:25
cbreak_work maybe you can push it through a sed that replaces all characters you don't like with nothingness09:26
→ ExtraSpice joined09:26
blueflyy I tried piping it through dos2unix but then I lose colors09:26
cbreak_work of course09:26
blueflyy any other solution?09:26
it's really annoying to see those ^M09:26
doener git config core.whitespace cr-at-eol09:27
→ marienz joined09:27
blueflyy doener: nice!09:27
cbreak_work I think git just shows you what's in the file09:27
→ eighty4 joined09:27
doener cbreak_work: the ^M stuff is error highlighting09:27
blueflyy core.whitespace cr-at-eol did the trick09:27
isn't it a carriage return?09:28
doener with the above config setting, the cr is no longer treated as an error09:28
myst` rudi_s: i've created a patch and applied it on my collegue's svn, seems it works, but GNU patch don't understand binary data in patches :(09:28
doener blueflyy: using attributes, you can also disable that on a per file basis09:28
blueflyy doener: will that config affect anything else?09:28
rudi_s myst`: Is the file very big or can you just copy it without binary patch?09:29
charon doener: oh. good catch09:29
myst` rudi_s: there are about ten PNGs in various places09:29
charon myst`: git-apply works outside of git repos, too09:30
← bgy_ left09:30
charon so you can use it to apply git's binary patches09:30
myst` charon: thanks09:31
← znake left09:32
← incubaton left09:32
→ znake joined09:32
→ Dave^| joined09:32
→ der_ewig1_sieg joined09:33
der_ewig1_sieg hi, I performed a git reset --hard on my local repository back to 4 commits. Now when I push to a remote branch, ( which is 4 commits ahead ), I am gettingfailed to merge, non-fast forward.09:34
doener blueflyy: just diff output and diff --check (and thus the pre-commit hook that would usually refuse the commit with the cr stuff in there...)09:35
esc der_ewig1_sieg:try --force09:35
myst` charon: git-apply says "bad git-diff on line ###: /dev/null expected". suprisingly on line ### in the diff is "+++ /dev/null"09:35
git format-patch and git apply are from the same git09:36
→ scarabx joined09:36
myst` even the same installation09:36
zrbecker der_ewig1_sieg: You can only push forward updates to the repo, you ahve to do -f or --force if you reset like that.09:36
charon myst`: evidently a bug. can you verify if it still is in 1.7.2, and if so, report to the list?09:37
→ tizbac joined09:38
← blueflyy left09:40
→ gebi joined09:41
→ d0k joined09:42
← jtdowney left09:42
← kakos left09:43
myst` charon: not now09:46
charon: also, previous chunk also have /dev/null09:47
and it is applied okay09:47
→ _Vi joined09:47
charon shrugs09:48
charon it's a bug. i can't magically fix it, especially if you don't have the time to upgrade and test to begin with09:48
→ kristian42 joined09:48
charon (i'm normally not that quick to say "bug" but if git-diff | git-apply complains it's always a bug)09:49
roop_ → roop09:50
charon myst`: maybe it's already been fixed in 71b989e, which is in 1.6.0? what's your git --version?09:50
Gitbot [git 71b989e]: http://tinyurl.com/3yw4svf -- fix bogus "diff --git" header from "diff --no-index"09:50
→ kakos joined09:51
charon no wait, that's --no-index09:51
myst` charon: 11:45 <myst`> git version 1.5.6.509:52
11:45 <myst`> Debian Lenny09:52
→ MattDiPasquale joined09:52
myst` yep, it's old09:52
nope, I can't update09:52
yep, it sucks09:52
← airborn left09:54
charon you can always upgrade your git for testing by simply installing it in $HOME09:54
→ Nickeeh joined09:57
→ roop_ joined09:59
→ alin-gym joined09:59
← roop left09:59
myst` charon: I am working via thin client, and there's no curl-dev, xxx-dev, etc packages. installing all the shit from source into home, just to test that? I'd better kill my boss10:02
← znake left10:04
charon myst`: read the Makefile (don't use ./configure), you can disable almost all -dev dependencies except libc. but meh. feel free and kill your boss if it makes you feel better.10:04
← mtkd_ left10:05
→ hipe joined10:07
→ nevyn^_ joined10:07
← shiba_yu36 left10:09
→ mtkd joined10:09
← jenk left10:10
→ mietek joined10:10
→ jenk joined10:10
Ilari myst`: The only strictly required deps are zlib and libc (both with dev headers and libs).10:10
mietek How do I view the complete contents of a file at a given commit?10:11
→ jtdowney joined10:11
cbreak_work mietek: look at git cat-file10:11
→ froschi1 joined10:13
← jtdowney left10:14
→ jtdowney joined10:14
→ dajero joined10:16
myst` charon: you won't tell the police, will you? :-)10:19
← nimrod10 left10:20
← scarabx left10:21
← roop_ left10:23
→ intripoon joined10:25
→ RORUBUN joined10:26
→ mbroeker joined10:27
← hebz0rl left10:27
→ ereslibre joined10:28
← poli left10:31
→ gemmes joined10:32
bremner myst`: can you install packages? there is a new version of git for lenny on backports.org10:33
← hohoho left10:34
myst` bremner: no I can not, telling here for 3rd time10:39
→ tar- joined10:39
→ marcob joined10:39
myst` okay all, problem solved10:39
the shit was that my paranoid boss set restrictions on some sevtions of svn repo, so I can't write there10:40
it'll be good if Git write about it more clearly10:40
and I'm going to kill thad idiot10:40
bye all, see you in prison10:40
← myst` left10:40
→ WaltzingAlong joined10:40
→ poli joined10:42
← jtdowney left10:43
← jmspeex left10:43
→ ntoll joined10:44
→ znake joined10:44
portablejim I don't think I will be visiting the prison that myst will be going to since he has an IP from Belaris and I am in Australia.10:44
→ fod joined10:45
bremner I want to visit prisioners with less attitude :)10:45
→ roop__ joined10:46
→ mar77i joined10:48
mietek cbreak_work: I found git show sha:path10:49
→ znake_ joined10:49
← znake_ left10:51
→ simplechat joined10:52
→ Elfe joined10:53
→ leo2007 joined10:53
leo2007 how to get a list of all objects in a repo?10:54
← Elfe_ left10:55
→ znake_ joined10:56
znake ls?10:56
← znake_ left10:59
← xaxes left11:00
← znake left11:00
→ znake joined11:00
← JonathanT left11:00
→ resmo_ joined11:00
→ roop joined11:01
← roop__ left11:01
leo2007 znake: ls-trees can sort of do that.11:01
→ girishr joined11:03
→ ffrank joined11:04
← resmo left11:04
← Kovensky left11:05
→ Kovensky joined11:06
→ nimrod10 joined11:06
→ JonathanT joined11:06
→ parasti joined11:08
ffrank hi. i have a repo that insists that "warning: refname 'suse-kernel' is ambiguous.", but show-ref produces only refs/heads/suse-kernel. git log and rebase, however, seem to be getting it wrong. i used 'update-ref refs/head/suse-kernel HEAD' recently. i have no clue how to clear this mess up. any thoughts?11:08
→ hyperair joined11:10
← Kovensky left11:11
← fod left11:11
→ tango_ joined11:12
← mar77i left11:12
← eighty4 left11:13
→ jmspeex joined11:14
→ jc3 joined11:14
→ winterweaver joined11:14
← vals_ left11:15
← RORUBUN left11:17
← amstan__ left11:17
robins → robinsmidsrod11:18
← mithro left11:18
→ Nemurenai joined11:18
← coppro left11:20
← Mathieu left11:20
← znake left11:20
← hyperair left11:21
→ znake joined11:22
← [Po]lentino left11:23
→ yngress joined11:24
portablejim I accidentally amended a change to the previous commit (I actually wanted it to be in the commit I am about to do). How do I fix it?11:27
← ralf_e left11:29
frogonwheels portablejim: have a look at git reflog of the current branch11:29
portablejim: you should see that the original commit (before you ammended it) is in the history11:30
← gemmes left11:30
frogonwheels portablejim: umm.. make a copy of what you changed in case I get it wrong, however, i'm pretty sure if you:11:31
portablejim: ping?11:32
→ gemmes joined11:32
← mtkd left11:32
→ crash\ joined11:32
portablejim frogonwheels, (ping)pong11:33
crash\ hi11:33
I want to track a ,git dir within a git dir11:33
portablejim frogonwheels, I can only see the amended commit and 2 checkout commands11:34
crash\ sounds wired, but I write a tool for git, writing tests for it and need a test repository for that11:34
frogonwheels portablejim: something like git reset HEAD@{0} should reset your branch back to the previous commit in the reflog11:34
crash\ so is there any way to add .git to git? :)11:34
frogonwheels portablejim: .. and leave your working dir as it is so you can checkin your next stuff.11:34
crash\: hopefully not11:34
crash\: actually there is.11:35
crash\ can you tell me how?11:35
frogonwheels crash\: just thinking..11:35
→ ralf_e joined11:35
frogonwheels crash\: well.. a) you could rename it?11:35
crash\ you mean rename .git to foobar?11:36
→ abgrilo joined11:36
crash\ doesn't matter if I rename it11:37
git wont track it11:37
← Bombe left11:37
→ Bombe joined11:37
← gemmes left11:37
portablejim How do I see what files were modified as part of a commit?11:37
crash\ portablejim: git status?11:37
← Adriannom left11:38
← ralf_e left11:39
← HG` left11:39
portablejim frogonwheels, it was actually `git reset HEAD@{1}`11:40
frogonwheels portablejim: that was my second guess.11:40
..so all good?11:40
crash\ frogonwheels: any other ideas?11:42
frogonwheels ..nope11:42
if git recognises itself.. I'm not sure there's much you can do.11:42
portablejim frogonwheels, yep all good.11:43
thanks11:43
frogonwheels np.11:43
ffrank crash\: maybe if you wrapped .git away? say, in a tarball? would that do any good?11:43
→ eli joined11:43
crash\ ffrank: I'll do that if can't add .git11:44
← abgrilo left11:44
crash\ but that means, when runnig the unit tests to untar those files11:44
← psankar left11:45
ffrank i'm guessing wildly here, since i haven't the faintest idea what you're trying to do there..11:45
also, won't the "outer layer" of git repo hide the inner repo? or is it in a subdir?11:46
crash\ I have /home/crash/public_html/gitty/.git11:49
this is the real repository11:49
and in /home/crash/public_html/gitty/tests/data/example/.git is the repository I want to be added11:49
I think I'll pack that .git dir and unpack it when the test suite is started11:50
→ petercoulton joined11:50
← CoinOpeBoy left11:51
← secoif left11:51
→ CoinOpeBoy joined11:51
KL-7 Hi, is it possible to add spell check to command line git interface? I'm not English native speaker so I make lots of mistakes and typos in commit messages :(11:51
→ cannonball joined11:52
→ ralf_e joined11:53
→ mithro joined11:53
frogonwheels KL-7: you should be able to hook into a umm.. pre-commit hook?11:54
KL-7: git gui can have a spell checker?11:55
KL-7: also you could set up spell checking in vim11:55
KL-7: or look at this thread: http://www.kerneltrap.com/mailarchive/git/2007/1/5/23500711:56
← ereslibre left11:56
frogonwheels KL-7: do you use vim for your commit messages?11:56
KL-7 I'm using default console editor and I think it's nano in my Ubuntu11:57
frogonwheels I'm sorry to hear that.11:57
:)11:57
KL-7: can you use vim?11:58
KL-7 frogonwheels, you think I should use vim instead?11:58
frogonwheels KL-7: of course. but I like vim. there's a bit of an initial time-commitment to learning vim11:59
KL-7 I'm not very familiar with vim and I'm a little bit afraid of it :)11:59
frogonwheels KL-7: #vim is pretty friendly to vim noobs11:59
KL-7: sudo apt-get install vim-gnome then run vimtutor12:00
KL-7: or gvimtutor if you prefer guis12:00
KL-7 thnx, and vim has spell check feature? And how can I set vim as default editor for git commits?12:00
frogonwheels KL-7: there are other non-vim solutions to your problem too12:00
ciaranm if you're in vim you can just use fugitive and do :Gcommit12:01
frogonwheels KL-7: you can do it by setting vim as your default alternative (update-alternatives) or look at man git-config on how to change your editor.12:01
Gitbot KL-7: the git-config manpage can be found at http://git.or.cz/man/git-config12:01
frogonwheels KL-7: in addition, as ciaranm, you can download Tim's fugitive.git (from github) ..12:02
KL-7: you can do all sorts of cool stuff12:02
ciaranm: you tried :Glog yet ?12:02
→ mtkd_ joined12:02
frogonwheels KL-7: .. adn seriously, #vim is a very friendly and active channel - similar in tone to #git12:02
ciaranm frogonwheels: yupyup12:03
ffrank KL-7: other than that, be sure to create a ~/.vimrc and put "set spell" inside12:03
← aspotashev| left12:03
ciaranm :Glog 1.2.3.. -- is rather useful12:03
→ aspotashev joined12:04
KL-7 Thank you, guys, very much. I definitely should learn vim and emacs a bit, but these linux editors are really not so easy to start with =) I think I've got the answer I was looking for. Thnx again12:04
→ thiago joined12:04
ciaranm vim isn't a linux editor. it's an amiga editor.12:05
frogonwheels lol true :) .. but it kinda branched out from there.12:06
→ corni joined12:08
→ Rearden joined12:08
leo2007 or run emacs to replace those oses12:08
frogonwheels .. from Editor_war wiki entry: Emacs as “a great operating system, lacking only a decent editor”.12:10
→ gemmes joined12:10
leo2007 that was written when emacs cannot run vim. now it can perfectly12:11
crash\ thanks for the help12:11
works fine now12:11
frogonwheels leo2007: well.. sorta12:11
ffrank has there been a discussion on wether git mergetool should diff $BASE $MERGED $REMOTE instead of $LOCAL $MERGED $REMOTE? because the latter is rather useless, i feel12:12
leo2007 i dont mean those emulations. There are 2~3 of them. You can run vi/vim right inside emacs.12:12
frogonwheels leo2007: ooh I see. in a shell of course.12:13
leo2007: punctuation is king. I meant: in a shell, of course.12:13
leo2007 in a dedicated shell, ie if you exit vi it also automatically exit that shell12:14
→ lericson joined12:15
lericson how do I stage all removals that are pending?12:15
jast git add -u (by default for current directory and below), but that also stages all changes12:16
for something that truly only stages deletions, perhaps something like git ls-files -d | xargs git rm --cached12:17
lericson ah thank you12:17
and also what does git svn mean when it says A checksum mismatch occurred: Base checksum mismatch on '/trunk/bin/dev/fake_sms.py':12:17
jast uh12:18
probably a) it's confused in some way or another or b) data corruption12:18
lericson what I did to get there was rename a file and then svn dcommit12:18
jast I have no idea which of those is more likely to be the cause12:18
lericson well I doubt corruption12:18
jast it shouldn't normally happen just from dcommitting a renamed file12:18
I've renamed plenty of files and never run into this one12:19
lericson as have I12:19
← mtkd_ left12:19
lericson sigh, can I find commit objects which were created in the last hour?12:20
→ slonopotamus joined12:20
lericson git-svn managed to undo my last commit while dcommitting and now my HEAD is a revision old12:20
→ JonathanT_ joined12:20
← galderz left12:21
jast uh, perhaps the rebase is still in progress?12:21
lericson it is not12:21
jast hum12:21
→ rgr joined12:22
jast check the reflog of the branch (e.g. git log -g), your old commit is probably in there12:22
lericson it is12:22
I should read up on reflogs it seems12:22
jast yep, dead useful feature for preserving data12:22
← hipe left12:22
jast I gotta go away for a second or three thousand12:22
workmad3 lericson: 'git log --since=1.hour.ago'?12:22
→ galderz joined12:22
← galderz left12:22
→ galderz joined12:22
jast no, that only shows commits in the current branch, i.e. it never shows disappeared commits12:23
← JonathanT left12:23
JonathanT_ → JonathanT12:23
lericson exactly, only "reachable commits" as the git manual has it12:23
→ hohoho joined12:23
workmad3 lericson: ah... how about 'git reflog'12:24
← RobertLaptop_ left12:24
workmad3 to see changes to your HEAD12:24
jast we talked about that just a minute ago :)12:24
and now I'm really gone12:24
workmad3 heh :)12:24
lericson jast: thanks for your help, have a good whatever you're up to12:24
← _Vi left12:24
workmad3 so you did... I'm just slow today12:24
jast thanks, I'll try and have a good tedious stuff that needs to be done12:25
→ IslandUsurper joined12:25
lericson gah fuck it I'm going to move these with the subversion client instead12:26
jast oh12:27
did you check whether the commit actually went through to SVN? perhaps it's just not reflected in the local repo12:27
probably not, though12:28
lericson I think svn is what bitched tbh, seemed svn-esque the output12:28
http://cl.ly/3f06b320c04cc945f7c712:28
→ shiba_yu36 joined12:29
jast nah, that message comes from git-svn12:30
I think12:30
→ mostly_harmless joined12:31
lericson here's the line that causes it12:31
if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff)12:31
← jc3 left12:31
charon the manpage even refers to this error12:31
"Normally the contents of an SVN revision should never change and reset should not be necessary. However, if SVN permissions change, or if you alter your --ignore-paths option, a fetch may fail with "not found in commit" (file not previously visible) or "checksum mismatch" (missed a modification). If the problem file cannot be ignored forever (with --ignore-paths) the only way to repair the repo is to use reset."12:31
mostly_harmless hi all, is there a simple way to revert a commit, and revert all the files to a previous version?12:32
lericson mostly_harmless: git reset --hard revisionid12:32
be careful though12:32
that resets the current branch and the filesystem contents to that point12:33
mostly_harmless lericson: thanks, how do I determin the previous revisionid?12:33
workmad3 mostly_harmless: that would reset any changes to your working directory to the state they were in at your last commit12:34
jast this is also not a good idea if you have already pushed the stuff you are now trying to get rid of12:34
workmad3 oh wait, it's the revisionid version :)12:34
err... git log12:34
jast HEAD~ is the commit before the current one12:34
workmad3 ok, I'm gonna be quiet here now... I'm not helping :)12:34
lericson workmad3: :D12:35
jast workmad3: I have no idea what you were saying but the parts I understood were correct ;)12:35
mostly_harmless wow, brutal.12:36
← slonopotamus left12:36
→ dbolser joined12:36
_Unode → Unode12:36
workmad3 jast: heh :) I have that problem at times12:36
jast it can be an advantage12:36
workmad3 jast: I mix my own internal names for things into the actual jargon and confuse the hell out of anybody who listens to me :D12:37
→ spaceonline joined12:37
jast mix in a lot of confusing stuff with the real message, and people will be so distracted by trying to figure it out that the important part slips through their filters :}12:37
mostly_harmless ok, that help. done as asked. as expected. thanks.12:37
→ mtkd joined12:37
mostly_harmless so, it would have been better if I could have reverted a single file, is that possible?12:37
jast well12:38
you can checkout an arbitrary version of a file (which doesn't undo any commits, but you can commit that old version in a new commit): git checkout <commit ID> <file>12:38
← Rearden left12:38
WaltzingAlong mostly_harmless: yes12:38
→ sagsousuke joined12:38
lericson workmad3: I think I coined the "revisionid" :D it's really a commit ID12:39
mostly_harmless jast: oh that would have worked. duly noted.12:39
jast ah well, time to fulfil my promise and go do that tedious stuff that needs to be done. bye-bye. :)12:39
lericson mostly_harmless: the difference is that git reset will actually reset the branch you're on to that commit, and with --hard, also sets the filesystem contents to whatever the tree looks like in said commit12:39
→ Fullmoon joined12:40
← Fullmoon left12:40
→ _Vi joined12:40
lericson meanwhile git checkout commit-ID filename will only check commit-ID for that file, and then copy it to the current filesystem contents12:40
not touching any branches12:40
mostly_harmless lericson: right, so now github has forgotten the commit, that's better. I had a copy of the file I wanted. I can cp and commit.12:41
← winterweaver left12:41
← rchavik left12:41
→ chrisgibson joined12:41
lericson mostly_harmless: github has most probably not forgotten, no.12:41
mostly_harmless erm, no github has not forgotten the commit. <sigh>12:41
→ Rearden joined12:41
lericson lericson: as jast pointed out, 143426 jast this is also not a good idea if you have already pushed the stuff you are now trying to get rid of12:42
← workmad3 left12:42
lericson your commit that you reset from (i.e. are trying to get rid off) already exists in another repository that you fetch from sometimes12:42
so if you do a git pull origin master now you'll get that commit back12:42
you can do one of two things:12:42
man up and make a new commit fixing your mistake12:42
-or-12:43
push -f12:43
should overwrite12:43
but then anybody else who has pulled from your repository will be angry with you12:43
so depending on the age of the commit and how many people regularly pull from your repository, you may want to just make a new commit12:43
mostly_harmless I want to remove a commit from a fork, can I sync with the upstream repo and push that to my fork?12:43
lericson yes12:44
if you use git push -f12:44
you can't undo history12:44
unless you force it to12:44
→ Fullmoon joined12:45
← Fullmoon left12:45
→ formale joined12:46
← henkboom left12:46
zrbecker Where is there documentation for gitosis?12:48
→ frakturfreak joined12:49
bremner zrbecker: most people recommend gitolite as a replacement for gitosis12:49
dbolser any wiki based on git?12:49
→ henkboom joined12:49
bremner dbolser: ikiwiki, for one12:50
dbolser nice name12:50
zrbecker bremner: Ill take a look at that12:51
→ slonopotamus joined12:52
mostly_harmless oh noes I'm in a mess. how do I get my fork in sync with the latest upstream version ?12:53
thiago push to it12:54
mostly_harmless right. thanks. stopped panicing now.12:55
← shiba_yu36 left12:55
mostly_harmless thanks everyone. git curve is steep for me.12:56
← alexmchale left12:57
lericson mostly_harmless: learning git is a lot like being on a rollercoaster12:58
→ jamesmacleod joined12:58
lericson only afterwards you know how to move in all three dimensions disregarding gravity12:58
so yeah totally worth it12:58
→ herdingcat joined13:00
→ mkramer joined13:01
→ tstclair joined13:04
← Nemurenai left13:04
dbolser add puts changes in the index, commit puts changes in the ?13:05
local repo?13:05
← froschi1 left13:05
← poli left13:06
leo2007 mostly_harmless: if u use emacs you can start using git under 5 or 25 minutes.13:07
ie using vc or magit.13:08
→ jim0203 joined13:09
dbolser how do you tell emacs that you're editing files within a git repo?13:09
leo2007 dbolser: it detects automatically.13:09
thanks to the VC mode.13:10
jim0203 just learning git - trying to merge the work of three developers - anyone able to provide some basic support?13:10
leo2007 basically if you have used vc in emacs you can use any vcm in under 1minutes. Otherwise 5minutes.13:10
dbolser vcm?13:11
leo2007 vcs13:11
dbolser vcs?13:11
→ kukks joined13:11
dbolser please don't say vcj ;-)13:11
leo2007 actually it is easier to use git than RCS in VC13:12
dbolser was rcs pre csv?13:12
slonopotamus csv? cvs maybe?13:12
leo2007 I have had locking problems many times with rcs13:12
dbolser slonopotamus: right13:13
leo2007 it is an ancient tool.13:13
dbolser I don't see git in emacs... just rcs-csv13:13
OK, I thought so13:13
leo2007 vc-git.el13:13
I use rcirc on GNU Emacs 23.2.11 (Mac OS X 10.6.4)13:13
dbolser jim0203: if all you want to do is create a new repo, add all developers work to it, its pretty straight forward13:13
leo2007: ty13:14
jim0203 dbolser: tks - have found someone in #github.13:14
dbolser cool13:14
add puts changes in the index, commit puts changes in the ?13:14
leo2007 i got hooked into git because of rebase13:14
dbolser how to complete that sentence?13:14
dbolser hasn't got that far in the manual13:15
leo2007 in the repo13:15
all objects are in .git13:15
dbolser leo2007: OK, and changes that have not been added are just 'files'?13:15
ok, and that is 'the repo'13:15
.git is 'the repo'?13:16
→ Nihility joined13:16
leo2007 up to u. i think the term is unclear.13:16
pjackson leo2007: Are you the same leo on the magit mailing list?13:16
leo2007 pjackson: yes13:17
→ flaguy48 joined13:17
pjackson Righto (just wondering).13:17
dbolser just trying to get a firm conceptual foundation... I'm stuck merging rebases with conflicts, and I though I should really rtfm13:17
pjackson You've reminded me I need to put annotate back...13:17
ffrank dbolser: "merging rebases" sounds a bit off to me, indeed13:18
dbolser right13:18
→ bradallen137 joined13:18
→ RobertLaptop joined13:18
Nihility is there a recommended mirroring strategy of a remote repo. I had been toying with cloning and scping, and also using remote --mirror13:18
→ rpg joined13:18
leo2007 dbolser: watch chacon's video.13:19
pjackson: no worries though. I am still using an old version a few commits before 0.8.213:20
pjackson: do you know how to extend magit-annotated-tag to support tagging other commits than the HEAD13:20
dbolser leo2007: where is that?13:20
pjackson leo2007: I think that's done.13:20
leo2007 dbolser: http://gitcasts.com/13:21
dbolser ty13:21
leo2007 dbolser: the talk on rails conf. GIT is indeed conceptually very simple.13:21
dbolser http://vimeo.com/1099027?pg=embed&sec=109902713:21
pjackson leo2007: Yea, in master magit-tag uses magit-read-rev.13:22
→ beni- joined13:22
leo2007 pjackson: yeah but not magit-annotated-tag13:22
pjackson No13:22
leo2007 dbolser: that's it.13:23
pjackson leo2007: Oh I misread what you typed.13:24
leo2007 pjackson: sometimes doing it in shell is quicker than magit. I hack eshell to complete git extensively.13:24
pjackson Today's not going well so far...13:24
leo2007 pjackson: no worries.13:24
← CoinOpeBoy left13:25
→ sivy joined13:26
leo2007 pjackson: cheery-pick is also a bit clumsy in magit. At some point in Oct I will look at magit more closely before addressing some of its issues that bother me ;)13:27
pjackson Ok, patches always welcome.13:27
leo2007 pjackson: I don't like submitting patches when I don't have the whole picture of magit. I might create wrong fixes. But yes I will.13:28
dbolser I committed a new empty file, I get this:13:29
1 files changed, 0 insertions(+), 89 deletions(-)13:29
89 deletions?13:29
← jtauber left13:30
Nihility could someone point out any flaws in the following git clone --mirror serverA/blah.git; cd blah.git; git remote add --mirror mirror1 serverB; git --bare fetch; git push mirror113:32
dbolser must have also commited a file deletion that I was testing, but I don't remmber doing that13:32
leo2007 dbolser: git log and see the history13:32
dbolser leo2007: it's the history that has me confused13:32
← lemonchicken left13:33
dbolser Nihility: why not just have two remotes, and always push pull in the appropriate order?13:33
leo2007 dbolser: you want git show sha1 to see the diff of that commit13:33
dbolser ty13:33
→ DRMacIver joined13:33
dbolser indeed, shows me deleting the file on that commit13:34
I must have been mistaken when I though I had already commited that action13:34
Nihility dbolser: well im trying to find a workflow where I don't have access to a shell on both remote systems13:34
DRMacIver I'm trying to write a post checkout hook which only fires when you switch to a named branch or tag, but the arguments are actual commit refs. Is there a command to turn refs into branch names?13:35
dbolser Nihility: right13:35
Nihility dbolser: and I also would like to keep all branches, basically make remote2 be a backup of remote113:35
← slonopotamus left13:35
dbolser Nihility: I'm uber noob, so please dont' worry too much about my suggestion, but I thought you could clone a, then push to b, then in future pull a and push b13:36
→ ehabkost joined13:36
ffrank DRMacIver: as a crude workaround, you could awk around in the git show-ref output13:36
pjackson leo2007: It's ok, they're reviewed.13:36
leo2007 dbolser: re-writing private history is a really really awesome feature. I can't use any tool that doesn't support that well.13:36
pjackson: ;)13:37
dbolser leo2007: that was for pjackson ?13:37
leo2007: how would I alter the commit message on the commit where I deleted a file?13:37
pjackson dbolser: Don't wink hijack.13:37
← mtkd left13:38
Nihility dbolser: ah ok, the issue with pull is that it works on one branch, and it implicitly does a merge which leads to different history13:38
leo2007 dbolser: for you. When you get to that you will start ridiculing other tools.13:38
Nihility: git pull --rebase13:38
there's config variable for it too.13:38
DRMacIver ffrank: Hmm. I'll take a look. Thanks.13:38
→ s0ber joined13:38
dbolser Nihility: ahhh... that acually helps explain my situation a bit13:39
DRMacIver ffrank: Hmm. Maybe I'm being stupid, but show-ref doesn't seem to want to take a sha1 hash13:39
→ Bass10 joined13:39
← s0ber_ left13:39
→ mtkd joined13:40
ffrank DRMacIver: i was thinking plain show-ref sans args, then awk or grep for the sha113:40
← dbatbold_ left13:40
→ TeckniX joined13:40
→ dbatbold joined13:40
← cilly left13:40
ffrank i'd prefer awk since you plainly need the ref name only13:40
→ rayners joined13:41
DRMacIver ffrank: Oh, I see.13:41
ffrank: That works. Thanks.13:41
sad that there's not a better way to do it though13:41
→ lemonchicken joined13:42
ffrank there may be, but I'm not aware of it. most use cases of git probably don't need it13:43
← znake left13:43
→ munichlinux joined13:43
→ minver joined13:43
→ loincloth joined13:43
→ HG` joined13:44
minver I try to push my git repo but it's being rejected to prevent losing history. Is it the merge command I use to fetch the updates from the current repo and include it in my own?13:45
→ xc joined13:45
→ bcardarella joined13:45
minver Do I use the mergetool?13:46
DRMacIver ffrank: Fair enough.13:46
ffrank minver: use pull before you push. consider whether pull --rebase is what you want, maybe13:47
← girishr left13:47
← roop left13:47
minver ffrank: I wanna se the code from the current git repo in my own files and then I can choose. I don't know what command that does that13:48
posciak it appears to me that when I run git-commit --amend without --reset-author, the author should remain the same, but it's not... how can I preserve authorship, date (basically everything) on amend?13:49
← Nihility left13:50
← cbreak_work left13:50
ffrank minver: perform a git fetch first, then you can diff against your local master13:51
→ Adriannom joined13:51
← Rearden left13:51
→ Rearden joined13:52
ffrank minver: if and when you're satisfied, perform a merge or rebase. otherwise, just check out your master and forget about the remote13:52
minver ffrank: okay, so what's the difference between pull and fetch?13:53
ffrank minver: pull implies a merge13:53
minver ffrank: okay13:53
→ penguin joined13:53
minver I don't wanna merge it, just fetch it, do some changes and then push it up to master13:54
penguin Hello. I'm very new to git and was wondering how to download a latest git revision using TortiseGit13:54
→ jrmuizel joined13:54
ffrank minver: in such a case, i'd make my local master a branch, then checkout origin/master and just pull. my changes stay safe and sound inside their branch this way13:54
→ yrlnry joined13:56
→ CoinOpeBoy joined13:56
← jrmuizel left13:57
yrlnry I noticed recently that git records symlinks by saving the symlink target as a blob , and making an entry in the containing tree with mode 120000. Has it always done this, or is it a recent change?13:57
← henkboom left13:57
→ hyperair joined13:57
→ [Po]lentino joined13:57
← bradallen137 left13:57
← xiong left13:58
← formale left13:59
← doener left13:59
→ henkboom joined14:00
→ doener joined14:01
fr0sty ffrank: rephrase that.14:01
→ redbaritone joined14:01
← freimatz left14:02
dbolser gitk! OMG14:02
← redbaritone left14:03
→ stringoO joined14:03
→ name joined14:03
fr0sty err, penguin: rephrase that questions.14:03
ffrank: got confused, sorry.14:03
ffrank fr0sty: nm. though you had me in a pinch ;)14:04
← mostly_harmless left14:04
fr0sty minver, ffrank: there is always pull --rebase14:05
name → __name__14:05
← ffrank left14:05
→ Sieben joined14:05
penguin i'm a newbie to git and want to download and install the latest git for our project. I just installed TortiseGit but don't know how to use it.14:05
→ cbreak_work joined14:05
→ p3rg2z joined14:05
minver fr0sty: I don't know what that does. I just ran "git fetch" I it seems that it updated some of my files. So I tried to push again but that failed.14:06
→ jshsu joined14:06
yrlnry git fetch wouldn't normally update your working tree.14:06
fr0sty fetch only puts objects in your .git directory.14:06
jshsu is there a way to split a conflicted file to two files? or a way to pick which version?14:07
→ coppro joined14:07
yrlnry jshsu: lots of ways. could you say in more detail what you want to have happen?14:07
penguin fr0sty: i'm a newbie to git and want to download and install the latest git for our project. I just installed TortiseGit but don't know how to use it.14:07
fr0sty penguin: if you want to use tortoiseGit you are stuck with the version they ship, I believe...14:07
→ Nemurenai joined14:08
jshsu yrlnry: pretty much would like to either pick HEAD or the other version14:08
yrlnry: splitting it would just make it easier to view diff14:08
fr0sty penguin: find a tortoiseGit tutorial if that is what you want to use.14:08
yrlnry jshsu: you can easily get the diff by using git diff otherrevision HEAD -- filename14:09
→ aresnick joined14:09
yrlnry jshsu: I like to use the emacs "emerge" tool to resolve conflicted merges, but if you're not familiar with that maybe now isn't the best time to look into it.14:09
jshsu: you can also git cat-file HEAD:filename and git cat-file otherrevision:filename to print out both versions of the file.14:10
I'm still not clear on what you want to have happen, but I hope some of that was helpful.14:10
→ hugoxrosa joined14:10
← shad left14:11
jshsu yrlnry: hm, i'm doing a merge, resulting in a conflict, and i want to pick either HEAD or the incoming, is that more clear?14:11
minver fr0sty: so which commando update my files and let me choose between version in different conflicts, I remember that I used a command like that last time. Just fetch the repo and watch the conflicts compare to my own repo14:11
cbreak_work you can git checkout the file14:11
yrlnry To pick the HEAD version, you can simply use git reset filename.14:12
→ shad joined14:12
jshsu and to pick the other revision?14:12
cbreak_work git checkout otherhead -- filename14:12
jshsu ahh, great thanks cbreak_work + yrlnry14:12
yrlnry Glad to help.14:13
cbreak_work I think there was a special way but I don't remember14:13
yrlnry Yeah, me neither.14:13
← hohoho left14:13
cbreak_work I resolve all conflicts in normal view and a text editor14:13
yrlnry I resolve conflicts with an ax.14:13
← gebi left14:14
minver cbreak_work: how do I merge the conflicts with my own files? what command?14:14
← p3rg2z left14:14
cbreak_work that's not solving the conflict, that's just killing it14:14
minver: merge a conflict?14:14
yrlnry Potato, potaahto.14:14
cbreak_work once you're done with resolving, just git add the file14:15
jshsu i like to solve conflicts with neck punching14:15
minver cbreak_work: I wanna see the conflicts in my files so I can edit them14:15
← herdingcat left14:15
cbreak_work they are in your files14:15
git diff should show you where14:15
yrlnry minver: After a failed merge, the working tree will have a version of the file that shows the conflicts.14:15
minver: search in the file for "<<<<<<"14:15
← munichlinux left14:16
minver yrlnry: so I must call the "git merge" command first to get the versions?14:16
yrlnry minver: I'm not clear on what you want to do exactly. Could you give us more detail?14:16
← nimrod10 left14:16
→ bradallen137 joined14:17
minver yrlnry: I have a repo on github, my friend changed som files and now I wanna uplaod my changes but I can't because of the versions. So I wanna see all the changes that conflict with mine in my files so I can choose which version to use and then push it all up to the github repo.14:17
← penguin left14:17
→ Theravadan joined14:17
→ nimrod10 joined14:18
yrlnry ahh! Yes, you want git merge github/branchname.14:18
→ drako joined14:18
yrlnry And it will say that it completed the merge, or that there were conflicts. Then 'git status' will tell you what files have conflicts, and the <<<<< >>>>> markers will show you where.14:18
cbreak_work usually you'd do git pull or similar14:18
yrlnry Then for each file, you edit the file to remove the <<<>>> markers and resolve the conflicts, then git add file when you are finished editing.14:18
cbreak_work if you want to use merge directly, do a git fetch before14:19
yrlnry (git pull is nothing but git fetch plus git merge.)14:19
(You did the fetch already, so now do the merge.)14:19
→ JenniferB joined14:19
← bcardarella left14:20
→ Helloers joined14:20
JenniferB hey folks... I logged into our company server to create a new git repository ... cd /home/git mkdir new-repo ... cd ... git init --bare ... when I do a clone on my local computer I get a fatal: The remote end hung up unexpectedly14:21
← dwmw2_ left14:21
minver yrlnry: >> git merge master => "Already up-to-date." :O14:22
JenniferB when I create the directory and run all the commands on the server I used sudo .. because I didn't have the permissions otherwise14:22
I trierd to chmod -R +rw on the whole server git directorr14:22
but didn't help14:22
→ gebi joined14:22
JenniferB helooooo14:25
→ redbaritone joined14:26
minver yrlnry: Why does it says it's already up-to-date? I still can't push it14:26
← JonathanT left14:27
← opalka left14:27
codejunky JenniferB: you should look at the --shared option in the git-init manual page14:27
→ jrmuizel joined14:28
→ spearce joined14:28
yrlnry minver: master is your local branch. Your friend's changes are on a remote branch, probably something like github/master.14:28
minver: So what I imagine you are asking it to do with "git merge master" is to merge the local master branch with itself, and of course there is nothing it needs to do in that case.14:29
minver yrlnry: okay :] How do I check the name of the remote branch?14:30
yrlnry minver: how did you fetch it?14:30
minver yrlnry: git fetch14:30
PerlJam minver: git branch -r # will show you the remote branches14:30
yrlnry minver: it's probably origin/master . Try 'git branch -a' to list all branches, including remote ones.14:30
← kukks left14:31
yrlnry git branch -r, yes. Not -a.14:31
← mietek left14:31
minver okay, the name is v14:31
→ shiba_yu36 joined14:31
minver origin/master*14:31
yrlnry Try 'git merge origin/master'14:31
or you can git diff master origin/master to see what the differences are that it will try to merge.14:32
minver yrlnry: okay, but now I got the conflicts, that's nice14:32
← shad left14:33
→ alex__c2022 joined14:34
← Schmallon left14:34
→ Schmallon joined14:34
PerlJam minver: since you're using github, you (or your friend) could have forked the repo, made changes in the fork, and then looked at the fork queue to see which patches are likely to cleanly apply or not (and selected them individually or looked at the individual patch, etc)14:34
→ GarethAdams|Yarr joined14:35
← simplechat left14:35
minver PerlJam: yeah okay but this time it was just some very small changes14:35
→ dwmw2_gone joined14:35
← GarethAdams|Work left14:36
GarethAdams|Yarr → GarethAdams|Work14:36
← rajeshsr left14:37
← coppro left14:37
← der_ewig1_sieg left14:37
← Theravadan left14:38
PerlJam minver: even if you don't use the fork queue, forking is good because you can make changes in separate repos and add each other as additional remotes to your own fork and then use all the nifty git fetch/diff/merge/etc. tools locally.14:38
→ DrAk0 joined14:38
← drako left14:38
PerlJam anyway ... just thought I'd mention it.14:38
← DrAk0 left14:38
minver PerlJam: thanks14:38
cbreak_work everything that forking allows can be done with just one remote14:38
← Schmallon left14:39
cbreak_work well, the local stuff at least14:39
→ roop joined14:40
PerlJam cbreak_work: sure, assuming both people can commit to the same repo. I'm just mentioning options. TMTOWTDI and all that :)14:40
→ tpiep joined14:41
→ shad joined14:41
← lamont left14:41
← Helloers left14:41
→ lamont joined14:43
← gebi left14:43
→ thwart joined14:45
→ znake joined14:46
→ gebi joined14:47
→ jaql joined14:47
→ hagabaka joined14:49
← hagabaka left14:49
→ hagabaka joined14:49
→ ajpiano joined14:49
← alex__c2022 left14:50
→ Ryback_ joined14:50
Unode → _Unode14:50
← aresnick left14:51
coldboot Is there a way to automatically resolve conflicts by saying "just clobber the older code completely with the newer code". So, in the context of applying a stash, you could just say "just apply the stash over whatever it conflicts with".14:53
→ sshc joined14:53
JenniferB I keep getting a error: failed to push some refs to14:54
...14:54
→ WebDragon joined14:54
ToxicFrog coldboot: you could write a custom mergetool script and use that, but I think there should be a better way somewhere. (I just don't know what it is offhand.)14:55
JenniferB: to what?14:55
→ Theravadan joined14:55
→ alex__c2022 joined14:55
JenniferB when I pushed the first time.. a website though says that I need to pull first time though.. ( I've already added files to my local repo, is that fine ? ) ... when I do a git pull ... I get a message that I need to specify what branch i want to use... master.remote = <nickname> ....14:56
what should I do so the pull works ?14:57
→ Alagar joined14:58
JenniferB I did a clone earlier.. my the server git repo was empty.. should I have done a pull ? :D ... this is the first time I set up a git repo... really confused14:58
Alagar hi14:58
is any good windows git client14:58
JenniferB tortoise ?14:58
Alagar for need to download the codebase from githut server14:58
← context left14:58
JenniferB Alagar: i think tortoise git exists14:59
← thwart left14:59
ToxicFrog JenniferB: so, to get this straight - you did a git clone of an existing (empty) remote repo; then you committed some stuff to your local copy; then you did git push, and it failed?14:59
What was the actual error message?14:59
JenniferB yes14:59
fatal: The remote end hung up unexpectedly14:59
error: failed to push some refs to 'ssh://ctisn@192.168.0.189/home/git/targets-located'14:59
ToxicFrog Alagar: if you have Cygwin, you already have git. Otherwise, there's msysgit, which comes with gitk and git-gui, and tortoisegit, which is a nicer interface on top of msysgit.14:59
→ hipe joined14:59
JenniferB before that I had specified git config push.default matching14:59
ToxicFrog That's the entire output?15:00
JenniferB Perhaps you should specify a branch such as 'master'15:00
sorry..15:00
→ lightcap joined15:00
JenniferB how do I specify a branch ?15:00
ToxicFrog git push <remote> <branches>15:00
Eg, git push origin master15:00
← petercoulton left15:01
JenniferB yeaaah... it's working... 95%15:01
ooh... damn..15:01
Compressing objects: 100% (378/378), done.15:01
fatal: Unable to create temporary file: Permission denied15:01
error: pack-objects died with strange error15:01
error: failed to push some refs to 'ssh://ctisn@192.168.0.189/home/git/targets-located'15:01
ToxicFrog Whoopsies. Make sure you have write access to the remote repo.15:02
JenniferB chmod -r +rw targets-located ?15:02
ToxicFrog Also, the reason it was failing with push.default=matching is that there were no matching branches - local repo had branch 'master', but remote repo had no branches at all.15:02
→ Joeconyers joined15:02
← BlindOracle left15:03
← minver left15:03
ToxicFrog That should do it. Why/how did you create it read-only in the first place?15:03
JenniferB i did a sudo mkdir targets-located ... i couldn't do it without the sudo15:03
how do I change from push.default to a more suiting value ?15:03
ToxicFrog So you were trying to create it in a dir you didn't have write access to15:03
So you did it as root, creating a dir that only root can modify15:04
...hang on15:04
You put it in /home/git?15:04
JenniferB yes15:04
ToxicFrog Are you trying to set up gitorious or gitosis?15:04
If so, you should be logging in as 'git' rather than 'ctisn' for clone/fetch/push; if not, why not just put the git repo in your home directory?15:05
JenniferB no idea... I haven't set this up.. i got the login information from a guy here and he told me that I could create it in home/git ... he has done it once before... and he is not helping me alot15:05
→ brntbeer joined15:05
← bradallen137 left15:05
JenniferB su git >> unknow id: git15:05
I am going to try to follow this guide : http://toolmantim.com/thoughts/setting_up_a_new_remote_git_repository15:06
← Joeconyers left15:06
JenniferB although I will need to use the sudo commands15:06
ToxicFrog Hang on.15:07
What is your use case here?15:07
JenniferB because I can't create a repo or a directory on the server otherwise15:07
ToxicFrog Are you trying to make your code publically available?15:07
→ koruptid_ joined15:07
ToxicFrog Are you trying to collaborate with others?15:07
Alagar JenniferB: thanks15:07
JenniferB a project already exists.. and I want to add them to a repo so that we can collaborate, yes15:07
ToxicFrog Do you just want to have a master repo on your server that only you use?15:07
Alagar ToxicFrog: thanks15:07
ToxicFrog Ok.15:07
(Also, what do yu mean by "you can't create a repo or directory on the server otherwise"? It's your server, right?)15:08
So, first of all, consider github.15:08
It saves you a lot of setup hassle - register, create a repo through the web interface, add the other people on the project as collaborators.15:08
JenniferB as I understand with git.. is that you can first commit to your own local repo.. and then you can push those changes to the main repository wich everyone shares..15:08
ToxicFrog Yes. What I'm questioning is why/how you're setting up that central repo.15:08
AIUI, you have a bunch of people working on this project, and you need them all to be able to access the central repo.15:09
Yes?15:09
JenniferB yes15:09
→ winterweaver joined15:09
→ BlindOracle joined15:09
ToxicFrog Ok. In that case, the guide you linked will not help you.15:09
It's for setting up a remote repo for personal use, not one that multiple people can access.15:10
← vu3rdd left15:10
ToxicFrog If you don't mind using a public hosting service, I can vouch for github being excellent. It's easier than setting up your own shared repo. If you don't mind your code being publically viewable it's an excellent choice.15:11
JenniferB if you wanted to set up a repo ( like me ) ... how would you do it ? cd /home/git ... mkdir newproject... cd newproject ... git init --bare15:11
and then ...15:11
→ alexisabril joined15:11
koruptid_ → koruptid15:11
ToxicFrog JenniferB: if I wanted to set up a shared repo, like you, I would use github.15:12
JenniferB ToxicFrog: I don't think that would be popular here... plus we have slow internet connection which breaks occasionally so having it on the local server is what I think is desired15:12
→ Sjors joined15:12
Sjors Hi all15:12
ToxicFrog If for some reason I couldn't use github, I would use gitolite (http://wiki.github.com/sitaramc/gitolite/) or gitosis (http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way)15:12
→ ju2wheels joined15:12
cbreak_work JenniferB: I always call my bare repositories Project.git15:12
← Belna left15:12
ToxicFrog As a last resort, I would set up a repo on a server that everyone has read-write access to, with something like:15:12
cbreak_work not sure if that's required though.15:13
it probably is not.15:13
ToxicFrog cd /var/git; sudo mkdir project.git; sudo chmod -r a+rw project.git15:13
cbreak_work we use bare repositories on an SMB share :/15:13
ToxicFrog And then everyone can clone ssh://username@server/var/git/project.git15:13
But that's messy and breaks down as soon as you need any sort of access control.15:13
Sjors Suppose I have a bare git repository; is there some easy way to get the current version of a file in refs/master/HEAD or do I really need to create a clone?15:13
← xc left15:13
ToxicFrog Sjors: what do you mean by "the current version of a file"?15:14
cbreak_work Sjors: try man git-cat-file15:14
Gitbot Sjors: the git-cat-file manpage can be found at http://git.or.cz/man/git-cat-file15:14
ToxicFrog The file contents? The ID of the last changelist that modified it?15:14
cbreak_work if you manage to convince it to give it to you, you should have access to any version of any file15:14
Alagar hi what is githut15:14
Sjors ToxicFrog: the file contents, yep, referenced by the master/HEAD15:14
Alagar sorry what is github15:14
Sjors thanks cbreak_work!15:14
cbreak_work it's a web page Alagar15:14
Alagar i know svn but iam confused git15:14
ToxicFrog Alagar: google it up. It's a public git hosting service.15:14
cbreak_work a bit like... sourceforge?15:15
ToxicFrog You can create a project there and they provide a central repository with configurable access for you to use.15:15
← galderz left15:15
Alagar ToxicFrog: could you please explain.15:15
ToxicFrog Alagar: what in my explanation was unclear to you?15:15
→ galderz joined15:15
← galderz left15:15
→ galderz joined15:15
← galderz left15:16
→ pigdude joined15:16
→ geoaxis joined15:16
geoaxis hello, is there a way to change the author of last commit15:16
ToxicFrog geoaxis: commit --amend?15:17
← koruptid left15:17
→ raichoo joined15:17
Alagar ToxicFrog: may i create a github in my intranet15:17
cbreak_work geoaxis: with --author15:17
ToxicFrog Alagar: it is a public git hosting website, not a software package15:17
← cbreak_work left15:17
ToxicFrog If you want a private git repo with access control, you should use gitolite, as I've said repeatedly.15:17
Alagar ToxicFrog: is possible to configure in my local environment?15:18
ToxicFrog Alagar: your questions are nonsensical.15:18
← rgr left15:18
Sjors cbreak: I don't completely understand git-cat-file; can I use it if I only know the filename of the file I need and not its SHA1 hash?15:18
Alagar ToxicFrog: sorry15:19
→ frooh_ joined15:19
geoaxis well15:19
ToxicFrog Alagar: you can translate the revision+name into a sha1 using git ls-tree15:20
geoaxis the problem is that this has escaped into remote15:20
frooh_ how can I tell git *not* to show the '^M's for a single project?15:20
geoaxis i have a bad email address in remote15:20
→ g0bl1n joined15:20
ToxicFrog Er15:20
Sjors: you can translate the revision+name into a sha1 using git ls-tree15:20
→ thwart joined15:20
ToxicFrog frooh_: "show the ^Ms"? Do you perhaps have a few files with CRLF line endings?15:20
← roop left15:21
frooh_ ToxicFrog: yeah, it's a project with win32 devs15:21
ToxicFrog: I mean when I do git diff btw15:21
← ralf_e left15:21
→ Guest1100101 joined15:22
→ der_ewige_sieg joined15:22
→ sammcd joined15:23
ToxicFrog frooh_: yeah, the problem there is not per se, it's that they're using broken editors that are inserting CRLF newlines.15:23
frooh_ looks like core.whitespace might be what I want15:23
→ opalka joined15:23
frooh_ ToxicFrog: I know, but trying to change that isn't worth it15:23
ToxicFrog Git has a core.autocrlf setting you can use to automatically perform conversion, and you can configure the diff engine to ignore line-ending/whitespace endings somehow.15:23
→ rene- joined15:24
ToxicFrog But neither of these are substitutes for fixing the underlying problem.15:24
→ munichlinux joined15:24
Sjors ToxicFrog: I see! Thanks.15:24
← g0bl1n left15:25
← monokrome left15:25
frooh_ hm hm15:25
← rene- left15:25
→ yaotti_aw joined15:25
frooh_ I figured taking cr-at-eol out of core.whitespace would do the trick, but it doesn't15:26
← skoop left15:26
frooh_ oh well, thanks anyway :-)15:28
MattDiPasquale what is .dotest directory?15:29
← thwart left15:30
← lightcap left15:30
← tizbac left15:31
17SAA5YVU → ilteris__15:31
← brntbeer left15:31
← kpreid left15:31
← Mpenz left15:32
→ mkramer1 joined15:32
charon MattDiPasquale: old versions of git-am and git-rebase used it as an area to save things across conflict resolutions15:32
← rvalue left15:32
charon (newer ones do this under .git somewhere)15:32
← henkboom left15:34
IslandUsurper → IslandUsurperAFK15:34
→ Mpenz joined15:34
→ asmega joined15:35
← Guest1100101 left15:35
← mkramer left15:35
→ henkboom joined15:36
← JenniferB left15:36
→ endpoint_david joined15:36
← raichoo left15:37
→ Mathieu joined15:37
← endpoint_david left15:37
← Tuomas left15:39
← frooh_ left15:39
→ Tuomas joined15:40
→ adamv joined15:40
→ cilly joined15:40
← Nickeeh left15:41
→ srcerer joined15:42
← TheUni left15:44
→ brntbeer joined15:45
→ tjholowaychuk joined15:45
← winterweaver left15:45
→ abourget joined15:47
← der_ewige_sieg left15:47
← WebDragon left15:47
abourget It's been years now and I haven't found any "git-hg" to do bi-directional sync... am I blind ?!?15:47
Was it there all the time, or has absolutely no one coded something such ?15:47
← Tuomas left15:48
→ Tuomas joined15:48
← mtkd left15:49
→ rajeshsr joined15:50
→ kukks joined15:50
→ Templarian joined15:50
→ rvalue joined15:51
→ kipras joined15:51
→ coppro joined15:51
← tildeequals left15:52
← gemmes left15:52
rudi_s abourget: There is hg-git which works quite well to convert between hg and git.15:52
→ tedoc2000 joined15:52
→ altrux joined15:53
abourget yeah, but doesn't that mean no git tools anymore ? and that I have to start using Hg all the time ?15:53
→ rajeshsr_ joined15:54
← steffkes left15:54
← Templarian left15:54
← jpieper left15:55
→ webus joined15:56
← tgunr left15:56
rudi_s abourget: No, it means you have to clone the tool using hg, then convert it to git, and if you want to push data to a hg repo, you first must push it to your local hg repository and then push that to the remote one. Sounds more difficult than it is.15:57
s/the tool/the repo/15:57
→ fr0ggie joined15:57
rudi_s s/convert it to git/convert it using hg-git to git/15:57
← rajeshsr left15:57
fr0ggie is there a known breakage in 1.7.2 with repos with a + in them?15:57
→ tgunr joined15:57
rudi_s Check the README in the hg-git repo, it explains how to convert to git.15:57
→ TheUni joined15:57
ajpiano when you clone a repo, must it be the case that the date-modified time on all the files will be set to the time when you cloned it?15:58
fr0ggie confirmed with several others that it doesnt work in 1.7.2 but does in 1.7.2 and 1.6.5.7 --- git://git.gnome.org/gtk+ gives Remote hung up15:58
rudi_s ajpiano: Yes. Same is true for checkouts. Check the FAQ why this is done.15:58
→ jpieper joined15:59
→ WebDragon joined15:59
→ bentob0x joined15:59
→ lightcap_ joined16:00
→ jensn joined16:00
← lightcap_ left16:00
← jmspeex left16:00
ajpiano hm, i've read that a time or two, not 100% clear why it can't leave things at their original modified date and then go from there16:00
fr0ggie No ideas?16:00
→ sitaram joined16:01
← sitaram left16:01
→ sitaram joined16:01
rudi_s ajpiano: Because build tools won't work.16:01
← fr0ggie left16:01
← bburhans left16:02
→ bburhans joined16:02
← optixx left16:02
← brntbeer left16:03
← trivol left16:03
← Will| left16:03
← Adriannom left16:03
→ Will| joined16:04
← shiba_yu36 left16:04
← sven^ left16:04
← tpiep left16:04
→ optixx joined16:05
→ sven^ joined16:05
← tgunr left16:05
← asmega left16:05
← stuffcorpse left16:05
← second3 left16:06
← dajero left16:06
→ stuffcorpse joined16:06
← mithro left16:07
← floppyears left16:09
→ mtkd joined16:10
→ second3 joined16:11
← ilteris__ left16:11
← mastroDani left16:12
← nevyn^_ left16:12
← tedoc2000 left16:13
← mtkd left16:15
→ ilteris___ joined16:16
← rayners left16:17
→ fr0ggie joined16:17
→ raichoo joined16:17
fr0ggie charon: thanks for the follow-up :)16:18
Its difficult to manage so many channels in irssi16:18
← yngress left16:18
← EricInBNE left16:18
charon so we were at <fr0ggie> is there a way in git to pull a single file? <charon> no, due to git's model of a commit16:18
fr0ggie: the best you can do is manually apply the changes to only that file with some diff|apply tricks16:18
→ rayners joined16:19
Sjors if I want to do a git ls-tree on a remote git repository, to which I only have a URL, how would I do that?16:19
charon there are other ways to get the same, but it boils down to: pull merges, and you cannot make a "real" and nice merge of only a part16:19
Sjors can I give git a flag "don't use the local directory, use this URL" ?16:20
← jobor left16:20
→ Jferro joined16:20
← jamesmacleod left16:20
charon Sjors: no, you have to clone it16:20
Sjors :/16:22
← WaltzingAlong left16:22
Sjors okay, thanks16:22
fr0ggie ah16:22
So we're likely best to put the config files into svn and use git-svn? :)16:22
→ paul0 joined16:22
paul0 hi16:22
charon fr0ggie: config for what? deployment on several different setups?16:23
paul0 I've commited and sent to the remote repository my .htaccess, but it doesn't seem to go when i clone it16:23
← alexisabril left16:23
→ roop joined16:23
paul0 is this common?16:23
→ kenichi joined16:24
charon fr0ggie: you could read this: http://thomasrast.ch/git/local-config.html16:24
ping me if you have questions about it16:24
fr0ggie yea a lot of machines, theres common then machine specific configs ( ${machine}/System/Config/ -> /System/Config on the machine)16:24
thanks16:24
→ tildeequals joined16:26
→ amerine joined16:26
→ tedoc2000 joined16:26
→ jon_ joined16:26
→ Yuuhi joined16:28
→ terinjokes joined16:28
→ lightcap joined16:28
→ floppyears joined16:28
jon_ i've just started to use egit (git for eclipse). i created a git repository at the root of my project and selected all the files and comitted them. now, does anyone know why all files are marked as "modified"? when using svn that mark disappears when the files have been comitted16:28
terinjokes hey, is it possible to remove a file from the repo, without having it delete in other people's sandbox when they clone?16:28
jon_ → jonkri_16:29
← jonkri_ left16:29
→ jonkri_ joined16:29
← rajeshsr_ left16:30
→ amerine_ joined16:31
fr0ggie btw, tig seems neat16:31
→ chrowe joined16:31
← Tuomas left16:31
charon terinjokes: umm. those requirements seem to be contradictory. unless you mean deleting it *locally* from *your* clone of the repo (i.e., not the one other people clone from)16:32
→ tizbac joined16:33
→ Tuomas joined16:34
← amerine left16:34
amerine_ → amerine16:34
terinjokes charon: a file that needs to be in every clone (for the product to work), that the user is supposed to setup per server, incorrectly got checked in, means that it will override (or, at least, cause a merge)... if i delete the file then commit, it will remove the file when they update, the file will be deleted16:36
→ krawek joined16:36
→ hobodave joined16:36
fr0ggie teleports away for a bit16:37
← fr0ggie left16:37
← Aikawa left16:37
← adymitruk left16:37
IslandUsurperAFK → IslandUsurper16:37
→ adymitruk joined16:38
→ Aikawa joined16:38
→ bambule joined16:38
← HG` left16:38
→ rajeshsr joined16:40
jonkri_ the repository i was asking about above looks like this in the repository explorer: http://hem.passagen.se/efectrix/gitrepo.png ... any idea how i can mark the files as non-modified?16:40
← tstclair left16:40
jonkri_ should i move the files to master or something?16:41
abourget wow! that hg-git really does solve the problem! thanks !!16:41
← marc_kdab_ left16:41
rudi_s You're welcome.16:41
← hipe left16:41
abourget rudi_s, but with only 3 or 4 tiny scripts (10 lines) we could have the reverse, based on hg-git, just to simplify the task, and not fool everyone into thinking the reverse is not possible16:42
rudi_s abourget: Go ahead, I'm sure patches are welcome ;-)16:42
← Alagar left16:42
→ kpreid joined16:43
→ Yuffster joined16:43
← gebi left16:44
← fmardini left16:44
→ mtkd joined16:45
← rvalue left16:45
← Yuffster left16:46
→ Yuffster joined16:46
← terinjokes left16:47
→ ptor joined16:48
→ G__81 joined16:50
G__81 i have downloaded a patch which is saved in a .patch file but when i use git am it says format not recognized but git apply works, so just want to know whats the format that git am expects16:50
→ brian joined16:51
→ Yuffster_ joined16:51
G__81 any thoughts on this ?16:51
← Yuffster left16:52
→ Yuffster joined16:52
→ tweakism joined16:52
tango_ G__81: git am stands for 'apply mailbox' : it assumes an email with an inline patch inserted16:52
(not exactly an email, actually, but something very similar, i.e. the output of git format-patch16:53
→ xaxes joined16:53
G__81 oh ok so in gmail, i click on show original option when i get a patch using git format-patch so instead of saving it as a patch file, i could save it as mbox format and try it out with git am right?16:54
→ tgunr joined16:54
← amerine left16:55
← kpreid left16:55
← Yuffster_ left16:55
← aspotashev left16:56
← hyperair left16:57
← jim0203 left16:57
G__81 tango_, would that work ?16:58
→ hyperair joined16:58
G__81 tango_, i just have one patch so can i give git am <filename>.mbox ?16:58
→ rvalue joined16:58
tango_ yes16:58
→ rubydiam_ joined16:59
tango_ (the actual file extension is unimportant, of course)16:59
G__81 i still get patch format detection failed16:59
→ bambule___ joined16:59
→ WebDragon|laptop joined16:59
→ justin-george joined16:59
G__81 i am using gmail and i have got the patch from the sender using git format-patch and i clicked on show original and saved it as mypatch.mbox16:59
← WebDragon left16:59
G__81 and i tried it, it does not work16:59
WebDragon|laptop → WebDragon16:59
→ hipe joined16:59
← bambule left17:00
→ jamesmacleod joined17:01
→ bbell joined17:02
G__81 can i use git apply and still get signed of by ?17:03
because i am not able to use git am with gmail files17:03
→ kpreid joined17:03
← znake left17:04
← bluenovember left17:04
→ Heimidal_ joined17:04
cpg|away → cpg17:05
← rvalue left17:07
→ sylr joined17:07
→ dpino joined17:07
Snow-Man_ → Snow-Man17:07
→ amerine joined17:09
→ dreiss joined17:09
→ alexisabril joined17:12
→ Adriannom joined17:13
← Yuffster left17:13
← amerine left17:13
→ Yuffster joined17:14
→ Nickeeh joined17:14
→ jim0203 joined17:15
→ rvalue joined17:17
← lightcap left17:18
FauxFaux I work with Javaaaa, which means git status prints filepaths that are about 200 characters long, but only about four of said characters are necessary to identify that file. Can I pass anything to git diff, for example, apart from the full path?17:19
← jonkri_ left17:19
← portablejim left17:19
selckin if you have a good shell stuff like **/Main* works :/17:20
→ AAABeef joined17:24
→ JenniferB joined17:24
→ m104 joined17:24
← rubydiam_ left17:25
→ rubydiam_ joined17:25
rubydiam_ → rubydiamond_17:26
rubydiamond_ → rubydiamond17:26
← MattDiPasquale left17:27
← Jferro left17:27
G__81 i have applied a patch and when i do git diff it shows me the diff but i would like to view the entire file and see the differences is that possible ?17:27
yrlnry FauxFaux: If you're on Unix, I might be able to make some Unixy suggestions.17:27
G__81 something like a cleardiff done by clearcase17:27
JenniferB how do ignore a directory using git ? i have the .gitignore file ... but I can't get the syntax for directory correct ( also.. how do I remove already committed files/directories that are now in the .gitignore ? ) thanks :)17:27
← sh1mmer left17:28
ToxicFrog Remove already comitted stuff: git rm --cached17:28
yrlnry That will remove stuff from the index, but not from the commit.17:28
JenniferB that are now on the gitignore ( i don't want to remove everything that's committed )17:28
→ bcardarella joined17:29
ToxicFrog yrlnry: I'm assuming that either it's already been comitted and the desire is to generate a new commit that removes it, or that it's been staged and it wasn't meant to17:29
yrlnry Yes, I was mistaken.17:29
ToxicFrog JenniferB: what is your actual goal? You've comitted things that are now ignored and want to remove them in the next commit? You want to remove them from history entirely? You've added but not comitted them, and want to un-add them?17:30
Also, ignoring directories is simple, just put the directory name in .gitignore17:30
G__81 yrlnry, i have applied a patch but have not commited it but before i commit and push it in i want to see the difference in a Graphical way rather than the differences alone i want to see the entire file so that i could go to specific differences and see the changes17:30
is that possible ?17:30
ToxicFrog Adding a trailing slash will ignore -only- directories of that name - eg, 'foo/' ignores directory foo, 'foo' ignores directory foo and file foo.17:31
yrlnry G__81: So you want to see the parts of the file that haven't changed?17:31
→ marc_kdab_ joined17:31
← rpg left17:31
JenniferB ToxicFrog: I just want to avoid next person checking them out ( they are large and unnessary ) .. also.. i have somet other files that I want to add to .ignore .. but they are not bitin17:31
G__81 yes i want to see the complete file like how vimdiff shows so that i could go to the differences manually and see the changes17:31
ToxicFrog G__81: --ext-diff?17:32
JenniferB: "they are not bitin"? And that doesn't really answer the question - you want to remove the files from history entirely?17:32
JenniferB no.. just avoid next person to check them out... if I delete them from mine.. and commit I guess that'll accomplish it...17:33
yrlnry got maybe git diff-tool -x vimdiff or something?17:33
← brian left17:33
JenniferB if I want to ignore all files inside a directory ... is it just to type that directory name in .gitignore ?17:33
→ brosner joined17:33
→ hohoho joined17:34
→ sh1mmer joined17:34
← mtkd left17:34
→ mtkd joined17:34
← CoinOpeBoy left17:34
yrlnry If you ignore the directory, it will ignore everything in the directory too.17:34
ToxicFrog JenniferB: check them out, or pull/clone them?17:37
→ drizzd joined17:37
ToxicFrog You can accomplish the former by making a commit that removes them (with rm --cached), but they'll still be in history.17:37
← hohoho left17:38
← pigdude left17:38
yrlnry So in particular anyone who fetches the repository will get copies of the deleted files, even if they don't appear in the working tree, because a person with the repository has the option to check out a version of the repository that was current before you deleted those files.17:39
← sitaram left17:39
← mtkd left17:39
adamholt → adamholt_away17:40
adamholt_away → adamholt17:40
→ hadees joined17:40
→ WebDragon|laptop joined17:41
hadees is there anyway to do a git reset but on just a specific file?17:41
teuf git checkout -- filename17:41
crab git checkout -- specific/file17:41
← WebDragon left17:41
WebDragon|laptop → WebDragon17:41
yrlnry I have often wondered why one must use checkout for that rather than reset.17:41
I always reach for reset first, then I have to stop and realize it's not what I want.17:42
cbreak you can use reset if you want.17:42
yrlnry Oh.17:42
Thnks!17:42
cbreak checkout is the command to get commits into the working dir. in file mode, you can get files17:42
→ programble joined17:42
← G__81 left17:42
cbreak reset is the command to rewrite your branch head.17:42
and index/working dir17:43
→ v0lksman joined17:43
yrlnry reset also copies files from the index to the working tree.17:43
cbreak in file mode, you can get individual files. might need --hard if you want to get them into the working dir17:43
only if you make it --hard17:43
yrlnry yes.17:43
cbreak and only if you use the index as source17:43
crab is this something reset learned to do recently?17:44
cbreak I remember it being able to do that years ago17:44
← Mathieu left17:44
crab you're right, it seems i just overlooked it.17:44
yrlnry Has git always been able to record symlinks?17:45
selckin symlinks are just files17:45
yrlnry No; they're files with a particular mode bit set.17:46
← henkboom left17:46
crab Date: Thu May 5 14:38:25 2005 +020017:46
Allow to store and track symlink in the repository. A symlink is stored17:46
the same way as a regular file, only with the appropriate mode bits set.17:46
yrlnry Thanks.17:46
← hyperair left17:47
→ Joeconyers joined17:47
→ mrico joined17:47
→ henkboom joined17:49
→ jfkw joined17:49
← jlogsdon_ left17:49
→ jlogsdon joined17:50
→ tstclair joined17:50
→ HG` joined17:51
→ jon_ joined17:51
→ Quevin joined17:52
mackstann a merge commit contains no changes of its own. how do i see what was changed in that merge?17:52
← Joeconyers left17:53
parasti compare its parents17:53
git diff commit^1 commit^217:53
→ Joeconyers joined17:53
cbreak merge commits can contain changes like any other commit17:53
lericson can you have as many parents as you wish in a commit?17:54
mackstann those are in the "Merge:" line, right?17:54
the thing is, diffing its parents includes other changes that have since been made in one branch but not the other17:54
parasti actually, listen to cbreak :P17:54
yrlnry lericson: yes. S17:54
mackstann that are totally unrelated to the merge17:54
well i'm glad they can contain changes but i don't see any17:55
yrlnry lericson: You can git merge c1 c2 c3 c4 c5 c6 c7 c8; it will use strategy "octopus" by default.17:55
cbreak you can make evil merges that do not contain all changes of the parents17:55
parasti "git diff commit^1 commit" will show both merged changes as well as the conflict resolution17:55
cbreak or that do contain more than the changes of the parents17:55
← JenniferB left17:55
mackstann parasti: ah perfect, thanks17:55
parasti I might have got it wrong, though, can't think at the moment :P17:56
→ aspotashev joined17:56
lericson yrlnry: aha17:56
parasti oh, I see, I was confused by commit^117:57
I don't know why I typed it that way, commit^ is the more common usage17:57
yrlnry in this context it makes a lot of sense, for contrast with commit^2.17:58
I thought it was a good choice on your part.17:58
→ jmspeex joined17:58
← jmspeex left17:59
→ Schmallon joined17:59
→ jmspeex joined17:59
lericson so commit^2 is a reference to the second parent of commit17:59
while commit~2 is a reference to the first parent's first parent17:59
← tatsuya left17:59
yrlnry Yes.18:00
← bentob0x left18:01
← rajeshsr left18:01
← alexisabril left18:02
→ airborn joined18:03
→ Alagar joined18:05
← alex__c2022 left18:06
leo2007 what does the comparison between git and hg stand today?18:06
← jtaby left18:06
→ jtaby joined18:06
→ pantsman joined18:06
crab hg is still one letter shorter than git.18:06
jjuran http://whygitisbetterthanx.com/18:06
leo2007 "today" I mean > 2010 June18:07
yrlnry Even after 2010 June, hg is still one letter shorter.18:07
coppro I like this site, because I keep thinking "git and X are two totally different... wait... X is a variable"18:08
leo2007 but not mercurial18:08
→ toabctl joined18:08
jjuran Git > X1118:08
← toabctl left18:08
leo2007 you can't win on that, yrlnry.18:08
← roop left18:09
← jmspeex left18:09
→ jlagrone joined18:09
lericson I think git, hg, bzr, cvs and svn all suck because: every one of them is right-hand-only on dvorak.18:09
→ cizra joined18:09
→ jmspeex joined18:09
jjuran coppro: I tend to parse it as "Why Git is better -- thanx!"18:09
← jtaby left18:09
lericson wait no, git isn't! YES AN ARGUMENT THAT STANDS!18:09
← jmspeex left18:10
← munichlinux left18:10
yrlnry but git is working on it. Soon they will change the name to "gi┐", which is only 2½ letters.18:10
→ jtaby joined18:10
→ eighty4 joined18:10
yrlnry The switch it "it" is coming in 2013.18:10
cizra Hi. Suppose I want to get rid of a bunch of useless files in my repo. How could I rewrite the history (yeah, I know the caveats)? Checkout each commit successively in detached HEAD mode, git rm; git commit --amend?18:10
lericson tbh I have an alias for git called g18:10
non-issue :p18:10
jjuran cizra: man git-filter-branch18:11
Gitbot cizra: the git-filter-branch manpage can be found at http://git.or.cz/man/git-filter-branch18:11
cizra Thanks!18:11
← spaceonline left18:11
cizra jjuran: OK, but would my way also work? (not that I'd want to use it, but it'd be good to know)18:11
← mrico left18:12
jjuran cizra: No, commit --amend on other than the last commit would break the chain. You'd have to fix the parents of subsequent commits.18:12
cizra jjuran: Okay, thanks.18:13
jast cizra: you could also use git rebase -i (on all commits except the very first) and use "edit" on all of them18:13
then you can use commit --amend in each step18:13
← apsysoev left18:13
cizra jast: Okay18:14
Will this stuff handle branches and merges?18:14
← jlagrone left18:15
→ apsysoev joined18:15
← apsysoev left18:16
jast rebase -i linearizes merges away. branches... well, it only changes the current branch. filter-branch can change all branches, though.18:16
← tango_ left18:16
→ vals_ joined18:16
adymitruk what's the proper URL for setting up a remote that's on a share?18:17
← Adriannom left18:17
← kenichi left18:17
adymitruk ie, there is no server running there so no ssh:18:17
→ dreinull joined18:17
← resmo_ left18:17
jast that's windows then, I assume?18:17
adymitruk yes :(18:17
→ Eaven joined18:18
jast you can mount shares to drive letters in windows... somewhere18:18
← barismetin left18:18
jast I don't think you can use a share path directly18:18
patrikf adymitruk: did you try an unc path?18:18
adymitruk like //server/share/gitrepo.git?18:18
cizra jast: Thanks!18:18
You can smbmount the share18:19
patrikf adymitruk: nah, backslashes...18:19
cizra patrikf: samba accepts forward slashes18:19
I don't think Linux resolvers would survive //server/whatever18:19
← Heimidal_ left18:19
cizra I would take smbmount as the first approximation.18:19
adymitruk ok.. I'll try it.. I believe the backslash is what I had working years ago18:20
one sec18:20
cizra Can you do ls //server/share? I bet not. I also bet git doesn't handle those.18:20
← jtaby left18:20
→ jtaby joined18:20
← Joeconyers left18:21
→ MattDiPasquale joined18:21
→ marsilainen joined18:22
→ yngress joined18:23
→ jtauber joined18:24
← jtauber left18:24
adymitruk msysgit is doing weird stuff with the '\'s18:25
almost there18:25
cizra owait, you're on Windwoes?18:26
"net help use" should tell you how to mount shares as drives.18:26
→ jtauber joined18:27
← jtauber left18:27
← ptor left18:27
adymitruk I'm guessing that mapping a drive would solve this the fastest18:27
then I could do /driveletterfortheshare/gitrepo.git18:28
→ resmo_ joined18:28
adymitruk one sec18:28
→ spaceonline joined18:29
→ oriba joined18:29
← tjholowaychuk left18:31
→ gebi joined18:31
→ WebDragon|laptop joined18:31
geoaxis is away: dinner time18:33
← redondos left18:33
→ redondos joined18:33
→ zenazn joined18:33
→ slonopotamus joined18:33
adymitruk now getting "fatal: 'r:/../gitrepo.git' is outside repository18:34
← WebDragon left18:34
WebDragon|laptop → WebDragon18:34
adymitruk mapped share to drive R18:34
← beni- left18:34
adymitruk tried 'git remote add origin /r/../gitrepo.git'18:34
← [Po]lentino left18:35
→ Paraselene_ joined18:36
→ mrico joined18:37
← hipe left18:37
→ hipe joined18:37
← hipe left18:37
→ hipe joined18:37
→ Titosemi_ joined18:38
← Titosemi left18:40
Titosemi_ → Titosemi18:40
← spaceonline left18:40
→ jobor joined18:40
adymitruk solved it. For remotes on a share you need 'git remote add origin file:///\\compname/sharename/../gitrepo.git'18:41
damn windows :)18:41
thanks for all your help guys18:41
← sagsousuke left18:42
← KL-7 left18:42
→ mrevd joined18:44
← mrevd left18:44
→ mrevd joined18:46
mrevd hello18:46
→ rpg joined18:46
← drubies left18:47
← tchan left18:47
→ tchan joined18:49
jast wow, that works? interesting18:49
mrevd what's that?18:49
← mrevd left18:51
yrlnry How do I record a commit that has more than one parent? I thought there would be an option to git-commit, but I don't see it.18:51
← coppro left18:51
leo2007 some svn people are really idiots.18:52
crab git-merge. :-) or you have to git-commit-tree by hand.18:52
leo2007 "One of the main features that I love about Subversion, is the ease of branching."18:52
yrlnry Have you seen that talk that Linux gave in which he asked "Who cares if branching is cheap, if merging is impossible?"18:52
s/x/s/18:53
leo2007 yrlnry: yeah, and svn is worse than that.18:53
→ coppro joined18:53
← tvw left18:53
→ asmega joined18:54
← justin-george left18:54
slonopotamus svn ppl say with svn >=1.5 merging became possible18:54
jast mrtazz: something that was discussed before you joined :)18:55
leo2007 who cares, it is too late and they do that because of git.18:55
bdrewery possible, useful no18:55
jast argh, wrong nick, sorry18:56
bdrewery merging in svn is still a big joke :)18:56
svn:mergeinfo is a nightmare18:56
jast at least it's now technically possible to implement :)18:56
slonopotamus svn is just locked in linear history (which is obviously not the case with merging)18:57
← binjured left18:58
→ binjured joined18:58
yrlnry How can you be worse than "impossible"?18:59
leo2007 slonopotamus: I have to agree with linus that svn's devel team is rather stupid.18:59
yrlnry crab: thanks, git-commit-tree was what I was looking for.18:59
leo2007 yrlnry: when it is svn.19:00
esc what would be a short way to extract all authors that have made a commit in a repo?19:00
leo2007 esc log --author=19:00
← ehabkost left19:00
crab esc: git log --format=%an|sort -u or thereabouts.19:01
esc ah yes19:01
charon esc: git shortlog -sn19:01
or git shortlog -n to sort by name instead of commits19:01
→ The_Tick joined19:01
esc can shortlog take --before and --after?19:02
charon wait, that's wrong. it's actually 'git shortlog -s' to summarize, and -n to sort by number of commits19:02
charon sights19:02
charon esc: yes, and if ever you hit an option that shortlog can't take, you can always pipe git-log through it19:02
esc wicked!19:02
yrlnry Hmm. I made a commit in repo "remote" that has no refs pointing to it and that is not the ancestor of any commit that has a ref. Then in a different repo I did git-fetch remote. It did not fetch the secret commit.19:03
→ ehabkost joined19:03
crab did you expect it to?19:03
jast yrlnry: fetch can only transmit things that have a ref name19:03
crab git-fetch just follows the refs configured in .git/config19:03
jast (fwiw, "ref" just means "reference to a commit", which includes the SHA1 name)19:04
slonopotamus yrlnry: that's a feature.19:04
charon esc: that's one of the not-so-well-documented things but you can pass most git-log arguments to commands that do history walking (shortlog, gitk, format-patch, ...) and you can pass most git-diff arguments to commands that show diffs (log, show, format-patch, ...)19:04
bah, s/arguments/options/g19:04
→ mrevd joined19:04
esc charon: its awesome!19:04
yrlnry I'm not sure which I expected.19:05
slonopotamus yrlnry: git transmits only referenced objects.19:05
yrlnry Yes, I just said that.19:05
esc i now also need to generate a summary statistic, (no of lines changed etc..) but based on a before and after date..19:05
yrlnry esc: I once used git-blame piped through a Perl script to do that.19:05
jast git log --stat --before= --after=? :)19:06
esc like diff --stat19:06
jast oh19:06
← jensn left19:06
jast I think that needs a bit more trickery19:06
esc jast: yeah, diff, not log19:06
i will probably find the commits with log and tag them temporarily19:06
jast git diff --stat $(git log --after=... -1) $(git log --before=... -1)19:07
not tested19:07
charon thinks you will have to script around --numstat19:07
charon or just google for one of the (probably 50 by now) git-statistics programs19:08
jast and I didn't actually mean "log", I meant "rev-list"19:08
hmm, rev-list doesn't do before/after, does it?19:08
yes it does19:09
← AAA_awright left19:09
jast git diff --stat $(git log --after=... -1 HEAD) $(git log --before=... -1 HEAD)19:09
wrong again :(19:09
oh well19:09
I'll just go do something else19:09
→ AAA_awright joined19:10
esc basically i need to generate some statistics from a coding-sprint we had19:10
though i am not yet sure what kind of statistics this would involve19:10
→ RORgasm joined19:11
esc if anyone can recommend a good summary tool i'd be delighted to try it19:11
→ lanthan joined19:12
esc (i'll patch it too, if i should manage to break it :)))19:12
charon git log -1000 --format="%an" --numstat | perl -ne 'chomp; if (/^(\d+)\t(\d+)\t/) {$c{$n} += $1>$2?$1:$2;} elsif (!/^$/) {$n=$_;}; END{ for (sort keys %c) { print "$_\t$c{$_}\n"; } }'esc: this seems to work:19:12
→ tjholowaychuk joined19:12
charon bah19:12
← tjholowaychuk left19:12
charon why do i always paste in the front :(19:12
→ tjholowaychuk joined19:13
charon anyway, just cut off the end, and adjust -1000 to whatever limiter you want19:13
note that it's fairly arbitrary in counting max(deleted_lines, added_lines) as the contribution19:13
but thanks to perl's readability, you should have no problems adjusting that19:13
→ brntbeer joined19:13
charon coughs19:13
adamholt → adamholt_away19:14
adamholt_away → adamholt19:14
← jjcm left19:14
esc charon: rofl19:14
yrlnry I just had a failed rebase; git-status reports UU perl-lib/Sift/DeliveryLog/TopAddrs.pm. But when I looked at the file, there were no conflict markers.19:14
What's the conflict?19:15
→ beni- joined19:15
esc charon: did you write that just now, or dig it out from somewhere?19:15
charon esc: oh wait, you'll need an exception for binaries: git log -1000 --format="%an" --numstat | perl -ne 'chomp; if (/-\t-\t/) {} elsif (/^(\d+)\t(\d+)\t/) {$c{$n} += $1>$2?$1:$2;} elsif (!/^$/) {$n=$_;}; END{ for (sort keys %c) { print "$_\t$c{$_}\n"; } }'19:15
esc: i just made that up19:15
esc ;)19:15
charon since your requirements didn't fit my count-lines-in-$(git blame ...) that i could have actually dug up from old irc logs.19:15
yrlnry (Then I added the file as it was in the working tree, and when I tried to git-rebase --continue it said there were no changes, so I did --skip.)19:15
So what just happened?19:15
← adamv left19:16
← rvalue left19:17
charon yrlnry: what kind of conflict was it? e.g. the patch-to-be-applied could have deleted that file but between its old and new base it was modified, resulting in a modify/delete conflict. for conflict resolution, git would have left the modified version in the WT and noted in the index that the other side (= the patch) wanted to delete. but if you decide to keep the modified version, then the patch doesn't do anything and is superfluous and should be skipped19:17
vinse charon: did you just make that up, too?19:18
charon vinse: :)19:18
yrlnry charon: I don't think I ever deleted that file. git-status reported "Both modified".19:19
jast what did rebase report?19:19
yrlnry CONFLICT (content): Merge conflict in perl-lib/Sift/DeliveryLog/TopAddrs.pm19:20
Resolved 'perl-lib/Sift/DeliveryLog/TopAddrs.pm' using previous resolution.19:20
Failed to merge in the changes.19:20
charon ah well, much simpler explanation there19:20
yrlnry Oh, "previous resolution" is referring to rerere here?19:20
charon exactly19:20
yrlnry Aha.19:20
charon and the "don't you want to --skip" indicates that the previous resolution decided in favour of not doing anything19:20
ju2wheels is anyone in here using gitolite 1.5.4-0 with repo wildcards enabled by any chance?19:21
yrlnry It didn't say anything like "don't you want to --skip".19:21
→ rvalue joined19:22
charon i thought that was the advice it gives19:22
(when you say --continue and there's nothing to commit)19:22
→ Heimidal_ joined19:23
← Heimidal_ left19:24
yrlnry It does't give that advice precisely. But I know that if I get the "No changes - did you forget to use 'git add'?" meesage and I didn't forget to use git-add, it means I need to skip.19:24
But okay, I understand you now. Thanks a lot.19:24
→ WebDragon|laptop joined19:25
← Nemurenai left19:25
charon yrlnry: then you don't have 05bdcfe yet :)19:26
Gitbot [git 05bdcfe]: http://tinyurl.com/2whp9ja -- git-am: suggest what to do with superfluous patches19:26
charon ah well, that's only in 1.7.2, not so surprising19:26
→ justin-george joined19:26
yrlnry I have a ticket into our sysadmin to 1.7.2 us.19:27
→ alex__c2022 joined19:28
← WebDragon left19:29
← _Vi left19:29
→ forkmantis joined19:29
forkmantis I've read most of the chapters of progit.org/book, but I'm having difficulty understanding remote branching19:31
would someone mind explaining when and how I should be using git pull vs git fetch?19:31
mackstann is all ears too19:32
charon pull = fetch+merge19:32
ergo, pull when you actually want to merge what the other guy did into your own branch19:32
forkmantis OK19:33
so my boss just added some changes to origin/develop19:33
and I have local commits to my develop, which tracks origin/develop19:33
esc charon: --numstat looks good19:33
WebDragon|laptop → WebDragon19:34
forkmantis so I should pull, and not fetch, right?19:34
charon forkmantis: assuming you want to update the origin's develop branch, yes, since you will want to update it with a combination (= merge) of both of your changes19:34
uau forkmantis: i'd usually avoid using pull for merges; in most cases you want to see what you're going to merge first before creating merge commits19:35
esc .oO(if only knew sed and awk...)19:35
leo2007 any idea why bzr website mentions no git or mercurial while git and mercurial mentions bzr.19:35
jast rule of thumb: unless something is horribly misconfigured, fetch will never update your local branch19:36
← mrevd left19:36
leo2007 I think bzr is with a much lower profile than the other two.19:36
jast leo2007: well, launchpad uses it exclusively, for instance19:36
forkmantis jast: Yeah, fetch doesn't seem to do much of anything. I'm curious to know what of a scenario where fetching is the right thing to do19:36
leo2007 jast: use what?19:36
jast leo2007: bzr19:36
← jtaby left19:36
uau forkmantis: the basic functionality is that git has "local" branches (that you change directly), and "remote" branches19:37
that terminology can be somewhat misleading19:37
jast forkmantis: to review the changes on both sides before merging, for example. fetch stores copies of the remote branches in refs/remotes/origin/foobar.19:37
uau there are branches on remote machines19:37
← Dave^| left19:37
leo2007 jast: that doesn't seem to be my question.19:37
jast we usually simply call those "remote branches"19:37
uau and then there's the cached state of those branches kept on your local machine19:37
'git fetch' updates that19:37
forkmantis charon and uau: Maybe I'm making too many assumptions about how to interact with local and remote branches19:37
jast leo2007: you said that bzr was low-profile. I'm not so sure, hence I mentioned a prominent example of it being used19:37
leo2007 jast: I am aware of launchpad. they are from the same company. so no wonder.19:38
← bcardarella left19:39
forkmantis uau: my assumption was that my boss and I could each have repos that track origin/master as master, and origin/develop as develop19:39
and that we could each make changes in our local develop branches, and push to origin/develop19:39
uau forkmantis: i think you're using mixed terminology there19:39
forkmantis and that the other person could fetch or pull those changes periodically19:39
uau: my understanding of this is fuzzy so far, so I probably am19:40
charon forkmantis: actually, for someone who asks about pull/fetch your terminology is spot on19:40
forkmantis git made perfect sense to me when all I was doing was working locally19:40
yrlnry forkmantis: your idea is okay, but your terminology is mixed up. origin/master is a local branch, but it's a copy of the master branch in the origin repository.19:40
→ ramlev joined19:40
uau forkmantis: suppose you have a central repo that clients clone from19:40
← ramlev left19:40
yrlnry I'm gonna shut up now and let one person explain it.19:40
forkmantis :)19:40
← coppro left19:41
uau when you write something like 'git log origin/master' on a client machine then that shows the state of the LOCAL origin/master branch19:41
leo2007 what I am trying to raise is while the other big projects kindly link bzr in their website, bzr does nothing to reciprocate.19:41
uau it does not contact the remote machine19:41
forkmantis uau: OK19:41
uau what 'git fetch' does it contact the remote machine and update the local copy of 'origin/master' to match the master branch in the cloned-from repo19:41
jast leo2007: I don't know, and I don't really care either. :)19:41
charon leo2007: raise that in #bzr? ;)19:42
(or whatever their irc might be)19:42
leo2007 I am hoping bzr never exists that way emacs won't be using it.19:42
→ coppro joined19:42
uau forkmantis: and running 'git pull' while on the local "master" branch would probably do something similar to the two commands "git fetch; git merge origin/master"19:43
forkmantis that's starting to make more sense19:43
charon uau: forkmantis: trap there btw, 'git pull origin master' does *not* update origin/master, whereas 'git pull' in a branch tracking origin/master *does* update it19:43
← raichoo left19:44
→ aziz_ joined19:44
← brntbeer left19:45
→ workmad3 joined19:45
forkmantis charon: uau: so when I do "git checkout -b develop origin/develop", I have a red/write develop branch that tracks origin/master, but origin/master is local?19:46
← The_Tick left19:46
forkmantis but it tracks the remote branch from the location I originally cloned from19:46
git fetch, while I'm on develop, will update my local origin/develop, but not my local copy of develop?19:47
← resmo_ left19:47
charon no it tracks origin/develop, since that's what you branched it from (and you branched from a remote branch; you have to manually enable tracking for local branches)19:47
uau forkmantis: 'git fetch' by itself updates _all_ remote branches19:47
doesn't depend on what branch you're currently on19:47
forkmantis OK19:48
uau it changes no local branches19:48
forkmantis OK19:48
and I'd have to do a merge to make that happen19:48
so I could type git fetch19:48
← rvalue left19:48
forkmantis then, from my develop branch, type "git merge origin/develop"19:48
→ jensn joined19:49
← tgunr left19:49
← intripoon left19:49
forkmantis and git pull is a shortcut to do all of that in one step?19:49
→ koruptid_ joined19:50
← koruptid_ left19:50
adymitruk use git pull --rebase19:50
charon argh, don't confuse him19:50
adymitruk it will keep your history linear19:50
lol ok :)19:50
charon forkmantis: correct.19:51
dfr|work charon, sometimes cats do need to be confused!19:52
← rubydiamond left19:52
← jim0203 left19:53
→ Nemurenai joined19:53
← HG` left19:53
kukks is there a local cmd which displays the tracking info19:54
wereHamster branch -vv ?19:54
charon forkmantis: and instead of trying to keep your history linear with rebase, i'd suggest you just read e.g. http://nvie.com/git-model and make good use of nonlinearity19:54
(every time i hear someone say "we develop on a branch called X" it makes me cringe)19:54
→ LongBeach joined19:54
forkmantis charon: I've been following that model successfully for weeks now as a solo developer19:55
charon: I am just trying to come to terms w/ handling this in a multi-developer environment19:55
I'm trying to convert my boss from svn to git in the process19:55
← hasen left19:57
charon oh well, at least bookmark the link19:57
forkmantis it looks like what we're trying to do currently is the "centralized workflow" described here: http://progit.org/book/ch5-1.html19:57
← henkboom left19:58
← jensn left19:58
charon the one-branch workflow falls short when you have to stop in the middle of task A to do task B (e.g. stop a long-running feature development to write a fix for something)19:58
forkmantis charon: http://delicious.com/forkmantis/git :)19:58
charon forkmantis: that description is good but only concerned with how repos interact, not with how you branch things. (well, i only looked at the pictures)19:59
→ rvalue joined19:59
→ henkboom joined19:59
forkmantis charon: something similar to that nvie tutorial, that showed some common multi-user workflows would help me tons right now20:01
→ brntbeer joined20:01
← workmad3 left20:01
→ CarlFK joined20:01
← koollman left20:01
← dbolser left20:02
← impulze left20:02
→ impulze joined20:02
→ alester joined20:03
← dj_tjerk left20:03
forkmantis charon: uau: thanks for taking some time to help me out with such a basic question20:04
charon forkmantis: http://progit.org/book/ch5-2.html has diagrams looking like an overview20:04
→ apsysoev joined20:04
forkmantis charon: I'll read it now20:05
→ Carl_ joined20:05
← divVerent left20:05
→ dj_tjerk joined20:06
← Sjors left20:06
charon forkmantis: anyway, the idea is more or less: split the tasks from the nvie blog post at the obvious places20:06
if you have only one integrator, you'll have to give him the individual feature branches for merging, by making them available in a public repo. if everyone can integrate, then well, you may also merge directly into the main branches and then push that out without ever publishing the feature first20:07
(if code review policy allows)20:07
→ koollman joined20:07
→ hasen joined20:10
forkmantis charon: I work in a very informal mom & pop shop. They did not do backups or use revision control before I came20:11
I pushed a while to get my boss to use svn20:11
and now I'm pushing him to git20:11
→ divVerent joined20:11
forkmantis I just need to understand it well enough so that I can make it easy for him, so I don't get any resistance20:11
→ BP{k}_ joined20:11
← fahadsadah left20:11
← brntbeer left20:12
← oriba left20:12
← BP{k} left20:12
charon forkmantis: you can easily set up three repositories locally to test these interactions20:13
← dfr|work left20:13
→ engla joined20:13
charon if you want to play around with it without interfering with work20:13
← opalka left20:13
← engla left20:13
→ engla joined20:13
charon (or if you have latent schizophrenia)20:13
forkmantis charon: excellent idea. Yeah, I need to build some confidence in my understanding of this.20:13
← Bucciarati left20:14
← AlexanderS left20:14
← up_the_irons left20:14
← ryanakca left20:14
← meuh left20:14
← frsk left20:14
→ impulze_ joined20:14
forkmantis charon: your name is remarkably similar to "chacon" :)20:14
← impulze left20:14
→ ryanakca joined20:14
charon there's been some confusion about that20:14
CarlFK how do I setup a box so I can push my local repo to it?20:16
→ jargan joined20:16
CarlFK it has linux, ssh, git.20:16
→ Heimidal_ joined20:16
PerlJam CarlFK: if you're not sharing the repo, it's easy-ish. Just make a clone and add it as a remote20:16
→ meuh joined20:17
impulze_ → impulze20:17
CarlFK so ssh to the remote, git clone, then.. um.. edit the local something20:17
charon but his nick is schacon20:17
BP{k}_ → BP{k}20:17
→ AlexanderS joined20:17
→ frsk joined20:17
→ dfr|work joined20:17
← jast left20:17
→ ScottO_ joined20:17
← xaxes left20:17
← mrico left20:17
ScottO_ how can i retroactively ignore a file?20:18
← EvanCarroll left20:18
→ EvanCarroll joined20:18
→ xaxes joined20:18
← koki left20:18
→ koki joined20:19
→ Bucciarati joined20:19
wereHamster sure, remove it and add it to .gitignore20:20
bbell Our company is looking at switching 1500-2000 developers to git. I'm an advocate of in-house support, but some people really want to have someone to call when something breaks. That might not mean just git, but whatever we add around it (msysgit, gitorious/gitolite/etc., ...). Anyone know of good support offering for git, or general consulting for git + add-ons?20:20
ScottO_ i thought there was a way to make it so that it was never added20:20
wereHamster ScottO_: filter-branch20:20
← alex__c2022 left20:21
← __name__ left20:21
← ScottO_ left20:23
← vals_ left20:23
← dreiss left20:23
← bambule___ left20:23
← frakturfreak left20:23
← Sieben left20:23
← stamina_ left20:23
← Oxf13 left20:23
← MetaCosm left20:23
← chkpnt left20:23
← d1zzy left20:23
← walf443 left20:23
← termie left20:23
← tmz left20:23
← divVerent left20:23
← forkmantis left20:23
← marsilainen left20:23
← tstclair left20:23
← tizbac left20:23
← kipras left20:23
← GarethAdams|Work left20:23
← hugoxrosa left20:23
← dbatbold left20:23
← alin-gym left20:23
← kristian42 left20:23
← Snow-Man left20:23
← DrNick left20:23
← niko left20:23
← chuck left20:23
← NuubiRuby_ left20:23
← ehabkost left20:23
← binjured left20:23
← jobor left20:23
← Titosemi left20:23
← slonopotamus left20:23
← eighty4 left20:23
← jlogsdon left20:23
← programble left20:23
← Yuffster left20:23
← jamesmacleod left20:23
← tedoc2000 left20:23
← paul0 left20:23
← webus left20:23
← kukks left20:23
← jaql left20:23
← thiago left20:23
← leo2007 left20:23
← d0k left20:23
← lhz left20:23
← dr_win left20:23
← Goneri left20:23
← jamuraa left20:23
← nionith left20:23
← kadoban left20:23
← emmanueloga left20:23
← vinse left20:23
← knittl left20:23
← charon left20:23
← jkp left20:23
← madewokherd left20:23
← jjuran left20:23
← sylr left20:23
← Gitbot left20:23
← curtana left20:23
← pielgrzym left20:23
← chitragupt left20:23
← candybar left20:23
← SRabbelier left20:23
← traviscline left20:23
← stymo left20:23
← jones- left20:23
← agile left20:23
← ricky left20:23
← mackstann left20:23
← ebneter left20:23
← Ramblurr left20:23
← ericdc left20:23
← manjunaths left20:23
← chrizz left20:23
← eldragon left20:23
← elb0w left20:23
← buu left20:23
← Khisanth left20:23
← Rhonda left20:23
← hachi left20:23
← rduplain left20:23
← Juri_Agarin left20:23
← Nemurenai left20:23
← Theravadan left20:23
← sshc left20:23
← yrlnry left20:23
← mbroeker left20:23
← lericson left20:23
← mindworx left20:23
← slakmagik left20:23
← BeerSerc left20:23
← jksz left20:23
← jason237 left20:23
← drry left20:23
← sejo left20:23
← dionoea left20:23
← ska-fan left20:23
← peper left20:23
← trash left20:23
← __ed left20:23
← adxp-2`` left20:23
← bartek left20:23
← Caelum left20:23
← doki_pen left20:23
← elliottcable left20:23
← Bartman007 left20:23
← tahorg left20:23
← joevano left20:23
← diofeher left20:23
← xaxes left20:23
← BP{k} left20:23
← coppro left20:23
← justin-george left20:23
← MattDiPasquale left20:23
← adymitruk left20:23
← bburhans left20:23
← jpieper left20:23
← ntoll left20:23
← ExtraSpice left20:23
← dirker left20:23
← StuckMojo left20:23
← robinsmidsrod left20:23
← cYmen left20:23
← esc left20:23
← Leemp left20:23
← squentin left20:23
← wolog left20:23
← bball__ left20:23
← stockholm left20:23
← hyperboreean left20:23
← merlin83 left20:23
← avar left20:23
← tro left20:23
← Grum left20:23
← sobersabre left20:23
← fualo left20:23
← eMBee left20:23
← jham left20:23
← defn left20:23
← LotR left20:23
← bnovc left20:23
← zchydem left20:23
← teuf left20:23
← alester left20:23
← rvalue left20:23
← henkboom left20:23
← drizzd left20:23
← Yuuhi left20:23
← stuffcorpse left20:23
← Will| left20:23
← RobertLaptop left20:23
← masterkorp left20:23
← kbingham left20:23
← junebugreport left20:23
← ribasushi left20:23
← johnjay left20:23
← Heimidal left20:23
← Bombe left20:23
← steveire left20:23
← eletuchy left20:23
← yann left20:23
← biz left20:23
← patrikf left20:23
← stepnem left20:23
← Zeelot3k left20:23
← adam[pac] left20:23
← tomaw left20:23
← unixtippse left20:23
← jarh left20:23
← Reticenti left20:23
← grumpytoad left20:23
← cbreak left20:23
← thomas_b left20:23
← przemoc left20:24
← selckin left20:24
← tg left20:24
← ijuma left20:24
← injekt left20:24
← guerrilla left20:24
← Hadaka left20:24
← majoh left20:24
← zomg left20:24
← StyleWarz left20:24
← tghw left20:24
← agib left20:24
← crab left20:24
← JonasF left20:24
← jacobat left20:24
← felipe left20:24
← yacc left20:24
← AlexP left20:24
← bs left20:24
← EgS left20:24
← comcor left20:24
← pcc1 left20:24
← tjholowaychuk left20:24
← Paraselene_ left20:24
← sh1mmer left20:24
← redbaritone left20:24
← s0ber left20:24
← parasti left20:24
← molokai left20:24
← mstormo left20:24
← makubi left20:24
← kloeri left20:24
← rettub_ left20:24
← tye_ left20:24
← luis left20:24
← Chaser_ left20:24
← w00tz left20:24
← topi left20:24
← adrien left20:24
← nobody left20:24
← Risar left20:24
← vpilo left20:24
← issyl0 left20:24
← crazed left20:24
← jasom left20:24
← fauxhawk left20:24
← twmi left20:24
← odin_ left20:24
← baccenfutter left20:24
← wanders left20:24
← spb left20:24
← kmap left20:24
← ozzloy left20:24
← alip left20:24
← crankharder left20:24
← sbob left20:24
← davr left20:24
← wagle left20:24
← teknotus left20:24
← electrogeek left20:24
← frsk left20:24
← AlexanderS left20:24
← dj_tjerk left20:24
← beni- left20:24
← Alagar left20:24
← dpino left20:24
← tildeequals left20:24
← sven^ left20:24
← cilly left20:24
← lamont left20:24
← dwmw2_gone left20:24
← Amorphous left20:24
← unreal left20:24
← elijahbal left20:24
← mquin left20:24
← yashi left20:24
← daethorian left20:24
← shade\ left20:24
← jeffszusz left20:24
← JamesA left20:24
← jspiros left20:24
← sunn left20:24
← Gullik left20:24
← uau left20:24
← NfNitLoop left20:24
← no_maam left20:24
← cwillu_at_work left20:24
← jayne left20:24
← ndim left20:24
← joelpet left20:24
← Ratler left20:24
← stoove left20:24
← gonzojive left20:24
← hegge left20:24
← dfr|work left20:24
← Tuomas left20:24
← mkramer1 left20:24
← spearce left20:24
← TeckniX left20:24
← ruskie left20:24
← multi_io left20:24
← David-T left20:24
← SvenDowideit left20:24
← lu_zero left20:24
← Ingmar left20:24
← xou left20:24
← crazy2k left20:24
← nadim left20:24
← darnold left20:24
← muep left20:24
← karihre left20:24
← reaVer left20:24
← Veinor left20:24
← FauxFaux left20:24
← MacGyverNL left20:24
← madduck left20:24
← septic left20:24
← picasso left20:24
← niki left20:24
← mmattice left20:24
← Carneus left20:24
← ke4qqq left20:24
← avtobiff left20:24
← homa_rano left20:24
← scottz_ left20:24
← tonyj left20:24
← arkx left20:24
← jailbox left20:24
← codejunky left20:24
← sgronblo left20:24
← sjn left20:24
← vlt left20:24
← jakob left20:24
← coopsh left20:24
← metze_away left20:24
← solatis left20:24
← Ferris left20:24
← ayaka_t left20:24
← siprbaum left20:24
← housetier left20:24
← blueshift left20:24
← pom left20:24
← s0enke left20:24
← dennda left20:24
← chrowe left20:24
ilteris___ → ilteris20:24
← koki left20:24
← logankoester left20:24
← Sigma left20:25
ilteris → 31NAA7EMJ20:25
← Fissure left20:26
→ xaxes joined20:26
→ ScottO_ joined20:26
→ dfr|work joined20:26
→ frsk joined20:26
→ AlexanderS joined20:26
→ BP{k} joined20:26
→ divVerent joined20:26
→ dj_tjerk joined20:26
→ alester joined20:26
→ henkboom joined20:26
→ rvalue joined20:26
→ Nemurenai joined20:26
→ coppro joined20:26
→ forkmantis joined20:26
→ justin-george joined20:26
→ beni- joined20:26
→ tjholowaychuk joined20:26
→ ehabkost joined20:26
→ binjured joined20:26
→ jobor joined20:26
→ Titosemi joined20:26
→ Paraselene_ joined20:26
→ slonopotamus joined20:26
→ marsilainen joined20:26
→ MattDiPasquale joined20:26
→ vals_ joined20:26
→ eighty4 joined20:26
→ Alagar joined20:26
→ tstclair joined20:26
→ jlogsdon joined20:26
→ programble joined20:26
→ drizzd joined20:26
→ sh1mmer joined20:26
→ Yuffster joined20:26
→ dreiss joined20:26
→ dpino joined20:26
→ sylr joined20:26
→ jamesmacleod joined20:26
→ bambule___ joined20:26
→ adymitruk joined20:26
→ Tuomas joined20:26
→ tizbac joined20:26
→ Yuuhi joined20:26
→ tedoc2000 joined20:26
→ tildeequals joined20:26
→ paul0 joined20:26
→ stuffcorpse joined20:26
→ sven^ joined20:26
→ Will| joined20:26
→ bburhans joined20:26
→ jpieper joined20:26
→ webus joined20:26
→ kipras joined20:26
→ kukks joined20:26
→ cilly joined20:26
→ mkramer1 joined20:26
→ Theravadan joined20:26
→ sshc joined20:26
→ jaql joined20:26
→ lamont joined20:26
→ dwmw2_gone joined20:26
→ GarethAdams|Work joined20:26
→ spearce joined20:26
→ redbaritone joined20:26
→ hugoxrosa joined20:26
→ Sieben joined20:26
→ yrlnry joined20:26
→ dbatbold joined20:26
→ TeckniX joined20:26
→ s0ber joined20:26
→ RobertLaptop joined20:26
→ frakturfreak joined20:26
→ lericson joined20:26
→ thiago joined20:26
→ parasti joined20:26
→ leo2007 joined20:26
→ mbroeker joined20:26
→ alin-gym joined20:26
→ kristian42 joined20:26
→ d0k joined20:26
→ ExtraSpice joined20:26
→ ruskie joined20:26
→ masterkorp joined20:26
→ kbingham joined20:26
→ multi_io joined20:26
→ lhz joined20:26
→ dr_win joined20:26
→ junebugreport joined20:26
→ Amorphous joined20:26
→ mindworx joined20:26
→ molokai joined20:26
→ Goneri joined20:26
→ mstormo joined20:26
→ dirker joined20:26
→ makubi joined20:26
→ BAAVBOK joined20:26
→ kloeri joined20:26
→ jamuraa joined20:26
→ stamina_ joined20:26
→ David-T joined20:26
→ rettub_ joined20:26
→ tye_ joined20:26
→ Snow-Man joined20:26
→ nionith joined20:26
→ ribasushi joined20:26
→ StuckMojo joined20:26
→ SvenDowideit joined20:26
→ johnjay joined20:26
→ robinsmidsrod joined20:26
→ kadoban joined20:26
→ lu_zero joined20:26
→ luis joined20:26
→ unreal joined20:26
→ Heimidal joined20:26
→ Bombe joined20:26
→ Chaser_ joined20:26
→ steveire joined20:26
→ emmanueloga joined20:26
→ eletuchy joined20:26
→ vinse joined20:26
→ slakmagik joined20:26
→ squentin joined20:26
→ yann joined20:26
→ adxp-2`` joined20:26
→ biz joined20:26
→ patrikf joined20:26
→ knittl joined20:26
→ Ingmar joined20:26
→ BeerSerc joined20:26
→ charon joined20:26
→ cYmen joined20:26
→ pielgrzym joined20:26
→ crankharder joined20:26
→ xou joined20:26
→ jkp joined20:26
→ stymo joined20:26
→ crazy2k joined20:26
→ stepnem joined20:26
→ w00tz joined20:26
→ madewokherd joined20:26
→ jjuran joined20:26
→ DrNick joined20:26
→ Oxf13 joined20:26
→ jksz joined20:26
→ Gitbot joined20:26
→ curtana joined20:26
→ esc joined20:26
→ NuubiRuby_ joined20:26
→ daethorian joined20:26
→ Leemp joined20:26
→ Veinor joined20:26
→ topi joined20:26
→ chkpnt joined20:26
→ jason237 joined20:26
→ chitragupt joined20:26
→ candybar joined20:26
→ Zeelot3k joined20:26
→ SRabbelier joined20:26
→ traviscline joined20:26
→ adam[pac] joined20:26
→ adrien joined20:26
→ nobody joined20:26
→ wolog joined20:26
→ tomaw joined20:26
→ elijahbal joined20:26
→ drry joined20:26
→ sejo joined20:26
→ dionoea joined20:26
→ niko joined20:26
→ mquin joined20:26
→ MetaCosm joined20:26
→ unixtippse joined20:26
→ bball__ joined20:26
→ yashi joined20:26
→ Risar joined20:26
→ ska-fan joined20:26
→ shade\ joined20:26
→ peper joined20:26
→ d1zzy joined20:26
→ vpilo joined20:26
→ trash joined20:26
→ stockholm joined20:26
→ __ed joined20:26
→ jones- joined20:26
→ hyperboreean joined20:26
→ bartek joined20:26
→ agile joined20:26
→ ricky joined20:26
→ mackstann joined20:26
→ termie joined20:26
→ nadim joined20:26
→ issyl0 joined20:26
→ agib joined20:26
→ diofeher joined20:26
→ Caelum joined20:26
→ jarh joined20:26
→ doki_pen joined20:26
→ merlin83 joined20:26
→ chuck joined20:26
→ crazed joined20:26
→ tmz joined20:26
→ walf443 joined20:26
→ odin_ joined20:26
→ elliottcable joined20:26
→ darnold joined20:26
→ Reticenti joined20:26
→ muep joined20:26
→ crab joined20:26
→ karihre joined20:26
→ grumpytoad joined20:26
→ reaVer joined20:26
→ jasom joined20:26
→ jeffszusz joined20:26
→ JamesA joined20:26
→ Bartman007 joined20:26
→ avar joined20:26
→ jspiros joined20:26
→ cbreak joined20:26
→ sunn joined20:26
→ tahorg joined20:26
→ thomas_b joined20:26
→ FauxFaux joined20:26
→ MacGyverNL joined20:26
→ ebneter joined20:26
→ sjn joined20:26
→ madduck joined20:26
→ septic joined20:26
→ Ramblurr joined20:26
→ ericdc joined20:26
→ Gullik joined20:26
→ fauxhawk joined20:26
→ manjunaths joined20:26
→ przemoc joined20:26
→ sobersabre joined20:26
→ uau joined20:26
→ gonzojive joined20:26
→ chrizz joined20:26
→ tro joined20:26
→ selckin joined20:26
→ picasso joined20:26
→ Juri_Agarin joined20:26
→ rduplain joined20:26
→ hachi joined20:26
→ Rhonda joined20:26
→ Khisanth joined20:26
→ elb0w joined20:26
→ buu joined20:26
→ eldragon joined20:26
→ joevano joined20:26
→ twmi joined20:26
→ tg joined20:26
→ niki joined20:26
→ mmattice joined20:26
→ NfNitLoop joined20:26
→ ijuma joined20:26
→ no_maam joined20:26
→ scottz_ joined20:26
→ injekt joined20:26
→ Carneus joined20:26
→ ke4qqq joined20:26
→ guerrilla joined20:26
→ baccenfutter joined20:26
→ Grum joined20:26
→ avtobiff joined20:26
→ Hadaka joined20:26
→ cwillu_at_work joined20:26
→ jayne joined20:26
→ homa_rano joined20:26
→ wanders joined20:26
→ tonyj joined20:26
→ ndim joined20:26
→ fualo joined20:26
→ spb joined20:26
→ kmap joined20:26
→ majoh joined20:26
→ zomg joined20:26
→ StyleWarz joined20:26
→ joelpet joined20:26
→ tghw joined20:26
→ arkx joined20:26
→ stoove joined20:26
→ teuf joined20:26
→ zchydem joined20:26
→ bnovc joined20:26
→ LotR joined20:26
→ defn joined20:26
→ jham joined20:26
→ eMBee joined20:26
→ jailbox joined20:26
→ ozzloy joined20:26
→ JonasF joined20:26
→ Ratler joined20:26
→ jacobat joined20:26
→ alip joined20:26
→ felipe joined20:26
→ pcc1 joined20:26
→ comcor joined20:26
→ EgS joined20:26
→ bs joined20:26
→ AlexP joined20:26
→ yacc joined20:26
→ sbob joined20:26
→ electrogeek joined20:26
→ teknotus joined20:26
→ wagle joined20:26
→ davr joined20:26
→ hegge joined20:26
→ codejunky joined20:26
→ blueshift joined20:26
→ sgronblo joined20:26
→ vlt joined20:26
→ jakob joined20:26
→ coopsh joined20:26
→ housetier joined20:26
→ metze_away joined20:26
→ solatis joined20:26
→ Ferris joined20:26
→ ayaka_t joined20:26
→ siprbaum joined20:26
→ dennda joined20:26
→ s0enke joined20:26
→ pom joined20:26
← dreinull left20:26
→ koki joined20:26
→ Sigma joined20:26
← RORgasm left20:26
← leo2007 left20:26
← tar- left20:27
← ScottO_ left20:27
← vals_ left20:27
← dreiss left20:27
← bambule___ left20:27
← frakturfreak left20:27
← Sieben left20:27
← stamina_ left20:27
← Oxf13 left20:27
← MetaCosm left20:27
← chkpnt left20:27
← d1zzy left20:27
← walf443 left20:27
← termie left20:27
← tmz left20:27
← divVerent left20:27
← forkmantis left20:27
← marsilainen left20:27
← tstclair left20:27
← tizbac left20:27
← kipras left20:27
← GarethAdams|Work left20:27
← hugoxrosa left20:27
← dbatbold left20:27
← alin-gym left20:27
← kristian42 left20:27
← Snow-Man left20:27
← DrNick left20:27
← niko left20:27
← chuck left20:27
← NuubiRuby_ left20:27
← ehabkost left20:27
← binjured left20:27
← jobor left20:27
← Titosemi left20:27
← slonopotamus left20:27
← eighty4 left20:27
← jlogsdon left20:27
← programble left20:27
← Yuffster left20:27
← jamesmacleod left20:27
← tedoc2000 left20:27
← paul0 left20:27
← webus left20:27
← kukks left20:27
← jaql left20:27
← thiago left20:27
← d0k left20:27
← lhz left20:27
← dr_win left20:27
← Goneri left20:27
← jamuraa left20:27
← nionith left20:27
← kadoban left20:27
← emmanueloga left20:27
← vinse left20:27
← knittl left20:27
← charon left20:27
← jkp left20:27
← madewokherd left20:27
← jjuran left20:27
← sylr left20:27
← Gitbot left20:27
← curtana left20:27
← pielgrzym left20:27
← chitragupt left20:27
← candybar left20:27
← SRabbelier left20:27
← traviscline left20:27
← stymo left20:27
← jones- left20:27
← agile left20:27
← ricky left20:27
← mackstann left20:27
← ebneter left20:27
← Ramblurr left20:27
← ericdc left20:27
← manjunaths left20:27
← chrizz left20:27
← eldragon left20:27
← elb0w left20:27
← buu left20:27
← Khisanth left20:27
← Rhonda left20:27
← hachi left20:27
← rduplain left20:27
← Juri_Agarin left20:27
← Nemurenai left20:27
← Theravadan left20:27
← sshc left20:27
← yrlnry left20:27
← mbroeker left20:27
← lericson left20:27
← mindworx left20:27
← slakmagik left20:27
← BeerSerc left20:27
← jksz left20:27
← jason237 left20:27
← drry left20:27
← sejo left20:27
← dionoea left20:27
← ska-fan left20:27
← peper left20:27
← trash left20:27
← __ed left20:27
← adxp-2`` left20:27
← bartek left20:27
← Caelum left20:27
← doki_pen left20:27
← elliottcable left20:27
← Bartman007 left20:27
← tahorg left20:27
← joevano left20:27
← diofeher left20:27
← xaxes left20:27
← BP{k} left20:27
← coppro left20:27
← justin-george left20:27
← MattDiPasquale left20:27
← adymitruk left20:27
← bburhans left20:27
← jpieper left20:27
← ExtraSpice left20:27
← dirker left20:27
← StuckMojo left20:27
← robinsmidsrod left20:27
← cYmen left20:27
← esc left20:27
← Leemp left20:27
← squentin left20:27
← wolog left20:27
← bball__ left20:27
← stockholm left20:27
← hyperboreean left20:27
← merlin83 left20:27
← avar left20:27
← tro left20:27
← Grum left20:27
← sobersabre left20:27
← fualo left20:27
← eMBee left20:27
← jham left20:27
← defn left20:27
← LotR left20:27
← bnovc left20:27
← zchydem left20:27
← teuf left20:27
← alester left20:27
← rvalue left20:27
← henkboom left20:27
← drizzd left20:27
← Yuuhi left20:27
← stuffcorpse left20:27
← Will| left20:27
← RobertLaptop left20:27
← masterkorp left20:27
← kbingham left20:27
← junebugreport left20:27
← ribasushi left20:27
← johnjay left20:27
← Heimidal left20:27
← Bombe left20:27
← steveire left20:27
← eletuchy left20:27
← yann left20:27
← biz left20:27
← patrikf left20:27
← stepnem left20:27
← Zeelot3k left20:27
← adam[pac] left20:27
← tomaw left20:27
← unixtippse left20:27
← jarh left20:27
← Reticenti left20:27
← grumpytoad left20:27
← cbreak left20:27
← thomas_b left20:27
← przemoc left20:27
← selckin left20:27
← tg left20:27
← ijuma left20:27
← injekt left20:27
← guerrilla left20:27
← Hadaka left20:27
← majoh left20:27
← zomg left20:27
← StyleWarz left20:27
← tghw left20:27
← agib left20:27
← crab left20:27
← JonasF left20:27
← jacobat left20:27
← felipe left20:27
← yacc left20:27
← AlexP left20:27
← bs left20:27
← EgS left20:27
← comcor left20:27
← pcc1 left20:27
← tjholowaychuk left20:27
← Paraselene_ left20:27
← sh1mmer left20:27
← redbaritone left20:27
← s0ber left20:27
← parasti left20:27
← molokai left20:27
← mstormo left20:27
← makubi left20:27
← kloeri left20:27
← rettub_ left20:27
← tye_ left20:27
← luis left20:27
← Chaser_ left20:27
← w00tz left20:27
← topi left20:27
← adrien left20:27
← nobody left20:27
← Risar left20:27
← vpilo left20:27
← issyl0 left20:27
← crazed left20:27
← jasom left20:27
← fauxhawk left20:27
← twmi left20:27
← odin_ left20:27
← baccenfutter left20:27
← wanders left20:27
← spb left20:27
← kmap left20:27
← ozzloy left20:27
← alip left20:27
← crankharder left20:27
← sbob left20:27
← davr left20:27
← wagle left20:27
← teknotus left20:27
← electrogeek left20:27
← frsk left20:27
← AlexanderS left20:27
← dj_tjerk left20:27
← beni- left20:27
← Alagar left20:27
← dpino left20:27
← tildeequals left20:27
← sven^ left20:27
← cilly left20:27
← lamont left20:27
← dwmw2_gone left20:27
← Amorphous left20:27
← unreal left20:27
← elijahbal left20:27
← mquin left20:27
← yashi left20:27
← daethorian left20:27
← shade\ left20:27
← jeffszusz left20:27
← JamesA left20:27
← jspiros left20:27
← sunn left20:27
← Gullik left20:27
← uau left20:27
← NfNitLoop left20:27
← no_maam left20:27
← cwillu_at_work left20:27
← jayne left20:27
← ndim left20:27
← joelpet left20:27
← Ratler left20:27
← stoove left20:27
← gonzojive left20:27
← hegge left20:27
← Sigma left20:27
← dfr|work left20:27
← Tuomas left20:27
← mkramer1 left20:27
← spearce left20:27
← TeckniX left20:27
← ruskie left20:27
← multi_io left20:27
← David-T left20:27
← SvenDowideit left20:27
← lu_zero left20:27
← Ingmar left20:27
← xou left20:27
← crazy2k left20:27
← nadim left20:27
← darnold left20:27
← muep left20:27
← karihre left20:27
← reaVer left20:27
← Veinor left20:27
← FauxFaux left20:27
← MacGyverNL left20:27
← madduck left20:27
← septic left20:27
← picasso left20:27
← niki left20:27
← mmattice left20:27
← Carneus left20:27
← ke4qqq left20:27
← avtobiff left20:27
← homa_rano left20:27
← scottz_ left20:27
← tonyj left20:27
← arkx left20:27
← jailbox left20:27
← codejunky left20:27
← sgronblo left20:27
← sjn left20:27
← vlt left20:27
← jakob left20:27
← coopsh left20:27
← metze_away left20:27
← solatis left20:27
← Ferris left20:27
← ayaka_t left20:27
← siprbaum left20:27
← housetier left20:27
← blueshift left20:27
← pom left20:27
← s0enke left20:27
← dennda left20:27
← jargan left20:28
→ neutrino joined20:28
→ Sigma joined20:28
→ xaxes joined20:28
→ ScottO_ joined20:28
→ dfr|work joined20:28
→ frsk joined20:28
→ AlexanderS joined20:28
→ BP{k} joined20:28
→ divVerent joined20:28
→ dj_tjerk joined20:28
→ alester joined20:28
→ henkboom joined20:28
→ rvalue joined20:28
→ Nemurenai joined20:28
→ coppro joined20:28
→ forkmantis joined20:28
→ justin-george joined20:28
→ beni- joined20:28
→ tjholowaychuk joined20:28
→ ehabkost joined20:28
→ binjured joined20:28
→ jobor joined20:28
→ Titosemi joined20:28
→ Paraselene_ joined20:28
→ slonopotamus joined20:28
→ marsilainen joined20:28
→ MattDiPasquale joined20:28
→ vals_ joined20:28
→ eighty4 joined20:28
→ Alagar joined20:28
→ tstclair joined20:28
→ jlogsdon joined20:28
→ programble joined20:28
→ drizzd joined20:28
→ sh1mmer joined20:28
→ Yuffster joined20:28
→ dreiss joined20:28
→ dpino joined20:28
→ sylr joined20:28
→ jamesmacleod joined20:28
→ bambule___ joined20:28
→ adymitruk joined20:28
→ Tuomas joined20:28
→ tizbac joined20:28
→ Yuuhi joined20:28
→ tedoc2000 joined20:28
→ tildeequals joined20:28
→ paul0 joined20:28
→ stuffcorpse joined20:28
→ sven^ joined20:28
→ Will| joined20:28
→ bburhans joined20:28
→ jpieper joined20:28
→ webus joined20:28
→ kipras joined20:28
→ kukks joined20:28
→ cilly joined20:28
→ mkramer1 joined20:28
→ Theravadan joined20:28
→ sshc joined20:28
→ jaql joined20:28
→ lamont joined20:28
→ dwmw2_gone joined20:28
→ GarethAdams|Work joined20:28
→ spearce joined20:28
→ redbaritone joined20:28
→ hugoxrosa joined20:28
→ Sieben joined20:28
→ yrlnry joined20:28
→ dbatbold joined20:28
→ TeckniX joined20:28
→ s0ber joined20:28
→ RobertLaptop joined20:28
→ frakturfreak joined20:28
→ lericson joined20:28
→ thiago joined20:28
→ parasti joined20:28
→ mbroeker joined20:28
→ alin-gym joined20:28
→ kristian42 joined20:28
→ d0k joined20:28
→ ExtraSpice joined20:28
→ ruskie joined20:28
→ masterkorp joined20:28
→ kbingham joined20:28
→ multi_io joined20:28
→ lhz joined20:28
→ dr_win joined20:28
→ junebugreport joined20:28
→ Amorphous joined20:28
→ mindworx joined20:28
→ molokai joined20:28
→ Goneri joined20:28
→ mstormo joined20:28
→ dirker joined20:28
→ makubi joined20:28
→ BAAVBOK joined20:28
→ kloeri joined20:28
→ jamuraa joined20:28
→ stamina_ joined20:28
→ David-T joined20:28
→ rettub_ joined20:28
→ tye_ joined20:28
→ Snow-Man joined20:28
→ nionith joined20:28
→ ribasushi joined20:28
→ StuckMojo joined20:28
→ SvenDowideit joined20:28
→ johnjay joined20:28
→ robinsmidsrod joined20:28
→ kadoban joined20:28
→ lu_zero joined20:28
→ luis joined20:28
→ unreal joined20:28
→ Heimidal joined20:28
→ Bombe joined20:28
→ Chaser_ joined20:28
→ steveire joined20:28
→ emmanueloga joined20:28
→ eletuchy joined20:28
→ vinse joined20:28
→ slakmagik joined20:28
→ squentin joined20:28
→ yann joined20:28
→ adxp-2`` joined20:28
→ biz joined20:28
→ patrikf joined20:28
→ knittl joined20:28
→ Ingmar joined20:28
→ BeerSerc joined20:28
→ charon joined20:28
→ cYmen joined20:28
→ pielgrzym joined20:28
→ crankharder joined20:28
→ xou joined20:28
→ jkp joined20:28
→ stymo joined20:28
→ crazy2k joined20:28
→ stepnem joined20:28
→ w00tz joined20:28
→ madewokherd joined20:28
→ jjuran joined20:28
→ DrNick joined20:28
→ Oxf13 joined20:28
→ jksz joined20:28
→ Gitbot joined20:28
→ curtana joined20:28
→ esc joined20:28
→ NuubiRuby_ joined20:28
→ daethorian joined20:28
→ Leemp joined20:28
→ Veinor joined20:28
→ topi joined20:28
→ chkpnt joined20:28
→ jason237 joined20:28
→ chitragupt joined20:28
→ candybar joined20:28
→ Zeelot3k joined20:28
→ SRabbelier joined20:28
→ traviscline joined20:28
→ adam[pac] joined20:28
→ adrien joined20:28
→ nobody joined20:28
→ wolog joined20:28
→ tomaw joined20:28
→ elijahbal joined20:28
→ drry joined20:28
→ sejo joined20:28
→ dionoea joined20:28
→ niko joined20:28
→ mquin joined20:28
→ MetaCosm joined20:28
→ unixtippse joined20:28
→ bball__ joined20:28
→ yashi joined20:28
→ Risar joined20:28
→ ska-fan joined20:28
→ shade\ joined20:28
→ peper joined20:28
→ d1zzy joined20:28
→ vpilo joined20:28
→ trash joined20:28
→ stockholm joined20:28
→ __ed joined20:28
→ jones- joined20:28
→ hyperboreean joined20:28
→ bartek joined20:28
→ agile joined20:28
→ ricky joined20:28
→ mackstann joined20:28
→ termie joined20:28
→ nadim joined20:28
→ issyl0 joined20:28
→ agib joined20:28
→ diofeher joined20:28
→ Caelum joined20:28
→ jarh joined20:28
→ doki_pen joined20:28
→ merlin83 joined20:28
→ chuck joined20:28
→ crazed joined20:28
→ tmz joined20:28
→ walf443 joined20:28
→ odin_ joined20:28
→ elliottcable joined20:28
→ darnold joined20:28
→ Reticenti joined20:28
→ muep joined20:28
→ crab joined20:28
→ karihre joined20:28
→ grumpytoad joined20:28
→ reaVer joined20:28
→ jasom joined20:28
→ jeffszusz joined20:28
→ JamesA joined20:28
→ Bartman007 joined20:28
→ avar joined20:28
→ jspiros joined20:28
→ cbreak joined20:28
→ sunn joined20:28
→ tahorg joined20:28
→ thomas_b joined20:28
→ FauxFaux joined20:28
→ MacGyverNL joined20:28
→ ebneter joined20:28
→ sjn joined20:28
→ madduck joined20:28
→ septic joined20:28
→ Ramblurr joined20:28
→ ericdc joined20:28
→ Gullik joined20:28
→ fauxhawk joined20:28
→ manjunaths joined20:28
→ przemoc joined20:28
→ sobersabre joined20:28
→ uau joined20:28
→ gonzojive joined20:28
→ chrizz joined20:28
→ tro joined20:28
→ selckin joined20:28
→ picasso joined20:28
→ Juri_Agarin joined20:28
→ rduplain joined20:28
→ hachi joined20:28
→ Rhonda joined20:28
→ Khisanth joined20:28
→ elb0w joined20:28
→ buu joined20:28
→ eldragon joined20:28
→ joevano joined20:28
→ twmi joined20:28
→ tg joined20:28
→ niki joined20:28
→ mmattice joined20:28
→ NfNitLoop joined20:28
→ ijuma joined20:28
→ no_maam joined20:28
→ scottz_ joined20:28
→ injekt joined20:28
→ Carneus joined20:28
→ ke4qqq joined20:28
→ guerrilla joined20:28
→ baccenfutter joined20:28
→ Grum joined20:28
→ avtobiff joined20:28
→ Hadaka joined20:28
→ cwillu_at_work joined20:28
→ jayne joined20:28
→ homa_rano joined20:28
→ wanders joined20:28
→ tonyj joined20:28
→ ndim joined20:28
→ fualo joined20:28
→ spb joined20:28
→ kmap joined20:28
→ majoh joined20:28
→ zomg joined20:28
→ StyleWarz joined20:28
→ joelpet joined20:28
→ tghw joined20:28
→ arkx joined20:28
→ stoove joined20:28
→ teuf joined20:28
→ zchydem joined20:28
→ bnovc joined20:28
→ LotR joined20:28
→ defn joined20:28
→ jham joined20:28
→ eMBee joined20:28
→ jailbox joined20:28
→ ozzloy joined20:28
→ JonasF joined20:28
→ Ratler joined20:28
→ jacobat joined20:28
→ alip joined20:28
→ felipe joined20:28
→ pom joined20:28
→ s0enke joined20:28
→ dennda joined20:28
→ siprbaum joined20:28
→ ayaka_t joined20:28
→ Ferris joined20:28
→ solatis joined20:28
→ metze_away joined20:28
→ housetier joined20:28
→ coopsh joined20:28
→ jakob joined20:28
→ vlt joined20:28
→ sgronblo joined20:28
→ blueshift joined20:28
→ codejunky joined20:28
→ hegge joined20:28
→ davr joined20:28
→ wagle joined20:28
→ teknotus joined20:28
→ electrogeek joined20:28
→ sbob joined20:28
→ yacc joined20:28
→ AlexP joined20:28
→ bs joined20:28
→ EgS joined20:28
→ comcor joined20:28
→ pcc1 joined20:28
← m104 left20:28
← ianmcorvidae left20:28
→ ianmcorvidae|alt joined20:28
← jamesmacleod left20:28
← ianmcorvidae|alt left20:28
→ ianmcorvidae|alt joined20:28
← Alagar left20:28
← unreal left20:28
→ jast joined20:28
← ScottO_ left20:29
← vals_ left20:29
← dreiss left20:29
← bambule___ left20:29
← frakturfreak left20:29
← Sieben left20:29
← stamina_ left20:29
← Oxf13 left20:29
← MetaCosm left20:29
← chkpnt left20:29
← d1zzy left20:29
← walf443 left20:29
← termie left20:29
← tmz left20:29
← divVerent left20:29
← forkmantis left20:29
← marsilainen left20:29
← tstclair left20:29
← tizbac left20:29
← kipras left20:29
← GarethAdams|Work left20:29
← hugoxrosa left20:29
← dbatbold left20:29
← alin-gym left20:29
← kristian42 left20:29
← Snow-Man left20:29
← DrNick left20:29
← niko left20:29
← chuck left20:29
← NuubiRuby_ left20:29
← ehabkost left20:29
← binjured left20:29
← jobor left20:29
← Titosemi left20:29
← slonopotamus left20:29
← eighty4 left20:29
← jlogsdon left20:29
← programble left20:29
← Yuffster left20:29
← tedoc2000 left20:29
← paul0 left20:29
← webus left20:29
← kukks left20:29
← jaql left20:29
← thiago left20:29
← d0k left20:29
← lhz left20:29
← dr_win left20:29
← Goneri left20:29
← jamuraa left20:29
← nionith left20:29
← kadoban left20:29
← emmanueloga left20:29
← vinse left20:29
← knittl left20:29
← charon left20:29
← jkp left20:29
← madewokherd left20:29
← jjuran left20:29
← sylr left20:29
← Gitbot left20:29
← curtana left20:29
← pielgrzym left20:29
← chitragupt left20:29
← candybar left20:29
← SRabbelier left20:29
← traviscline left20:29
← stymo left20:29
← jones- left20:29
← agile left20:29
← ricky left20:29
← mackstann left20:29
← ebneter left20:29
← Ramblurr left20:29
← ericdc left20:29
← manjunaths left20:29
← chrizz left20:29
← eldragon left20:29
← elb0w left20:29
← buu left20:29
← Khisanth left20:29
← Rhonda left20:29
← hachi left20:29
← rduplain left20:29
← Juri_Agarin left20:29
← Nemurenai left20:29
← Theravadan left20:29
← sshc left20:29
← yrlnry left20:29
← mbroeker left20:29
← lericson left20:29
← mindworx left20:29
← slakmagik left20:29
← BeerSerc left20:29
← jksz left20:29
← jason237 left20:29
← drry left20:29
← sejo left20:29
← dionoea left20:29
← ska-fan left20:29
← peper left20:29
← trash left20:29
← __ed left20:29
← adxp-2`` left20:29
← bartek left20:29
← Caelum left20:29
← doki_pen left20:29
← elliottcable left20:29
← Bartman007 left20:29
← tahorg left20:29
← joevano left20:29
← diofeher left20:29
← ianmcorvidae|alt left20:29
← neutrino left20:29
← xaxes left20:29
← BP{k} left20:29
← coppro left20:29
← justin-george left20:29
← MattDiPasquale left20:29
← adymitruk left20:29
← bburhans left20:29
← jpieper left20:29
← ExtraSpice left20:29
← dirker left20:29
← StuckMojo left20:29
← robinsmidsrod left20:29
← cYmen left20:29
← esc left20:29
← Leemp left20:29
← squentin left20:29
← wolog left20:29
← bball__ left20:29
← stockholm left20:29
← hyperboreean left20:29
← merlin83 left20:29
← avar left20:29
← tro left20:29
← Grum left20:29
← sobersabre left20:29
← fualo left20:29
← eMBee left20:29
← jham left20:29
← defn left20:29
← LotR left20:29
← bnovc left20:29
← zchydem left20:29
← teuf left20:29
← tjholowaychuk left20:29
← Paraselene_ left20:29
← sh1mmer left20:29
← redbaritone left20:29
← s0ber left20:29
← parasti left20:29
← molokai left20:29
← mstormo left20:29
← makubi left20:29
← kloeri left20:29
← rettub_ left20:29
← tye_ left20:29
← luis left20:29
← Chaser_ left20:29
← w00tz left20:29
← topi left20:29
← adrien left20:29
← nobody left20:29
← Risar left20:29
← vpilo left20:29
← issyl0 left20:29
← crazed left20:29
← jasom left20:29
← fauxhawk left20:29
← twmi left20:29
← odin_ left20:29
← baccenfutter left20:29
← wanders left20:29
← spb left20:29
← kmap left20:29
← ozzloy left20:29
← alip left20:29
← crankharder left20:29
← sbob left20:29
← davr left20:29
← wagle left20:29
← teknotus left20:29
← electrogeek left20:29
← frsk left20:29
← AlexanderS left20:29
← dj_tjerk left20:29
← beni- left20:29
← dpino left20:29
← tildeequals left20:29
← sven^ left20:29
← cilly left20:29
← lamont left20:29
← dwmw2_gone left20:29
← Amorphous left20:29
← elijahbal left20:29
← mquin left20:29
← yashi left20:29
← daethorian left20:29
← shade\ left20:29
← jeffszusz left20:29
← JamesA left20:29
← jspiros left20:29
← sunn left20:29
← Gullik left20:29
← uau left20:29
← NfNitLoop left20:29
← no_maam left20:29
← cwillu_at_work left20:29
← jayne left20:29
← ndim left20:29
← joelpet left20:29
← Ratler left20:29
← stoove left20:29
← gonzojive left20:29
← hegge left20:29
← Sigma left20:29
← dfr|work left20:29
← Tuomas left20:29
← mkramer1 left20:29
← spearce left20:29
← TeckniX left20:29
← ruskie left20:29
← multi_io left20:29
← David-T left20:29
← SvenDowideit left20:29
← lu_zero left20:29
← Ingmar left20:29
← xou left20:29
← crazy2k left20:29
← nadim left20:29
← darnold left20:29
← muep left20:29
← karihre left20:29
← reaVer left20:29
← Veinor left20:29
← FauxFaux left20:29
← MacGyverNL left20:29
← madduck left20:29
← septic left20:29
← picasso left20:29
← niki left20:29
← mmattice left20:29
← Carneus left20:29
← ke4qqq left20:29
← avtobiff left20:29
← homa_rano left20:29
← scottz_ left20:29
← tonyj left20:29
← arkx left20:29
← jailbox left20:29
← codejunky left20:29
← sgronblo left20:29
← sjn left20:29
← vlt left20:29
← jakob left20:29
← coopsh left20:29
← metze_away left20:29
← solatis left20:29
← Ferris left20:29
← ayaka_t left20:29
← siprbaum left20:29
← housetier left20:29
← blueshift left20:29
← pom left20:29
← s0enke left20:29
← dennda left20:29
→ logankoester joined20:29
→ Paraselene__ joined20:30
→ ianmcorvidae|alt joined20:30
→ neutrino joined20:30
→ Sigma joined20:30
→ xaxes joined20:30
→ ScottO_ joined20:30
→ dfr|work joined20:30
→ frsk joined20:30
→ AlexanderS joined20:30
→ BP{k} joined20:30
→ divVerent joined20:30
→ dj_tjerk joined20:30
→ Nemurenai joined20:30
→ coppro joined20:30
→ forkmantis joined20:30
→ justin-george joined20:30
→ beni- joined20:30
→ tjholowaychuk joined20:30
→ ehabkost joined20:30
→ binjured joined20:30
→ jobor joined20:30
→ Titosemi joined20:30
→ Paraselene_ joined20:30
→ slonopotamus joined20:30
→ marsilainen joined20:30
→ MattDiPasquale joined20:30
→ vals_ joined20:30
→ eighty4 joined20:30
→ tstclair joined20:30
→ jlogsdon joined20:30
→ programble joined20:30
→ sh1mmer joined20:30
→ Yuffster joined20:30
→ dreiss joined20:30
→ dpino joined20:30
→ sylr joined20:30
→ bambule___ joined20:30
→ adymitruk joined20:30
→ Tuomas joined20:30
→ tizbac joined20:30
→ tedoc2000 joined20:30
→ tildeequals joined20:30
→ paul0 joined20:30
→ sven^ joined20:30
→ bburhans joined20:30
→ jpieper joined20:30
→ webus joined20:30
→ kipras joined20:30
→ kukks joined20:30
→ cilly joined20:30
→ mkramer1 joined20:30
→ Theravadan joined20:30
→ sshc joined20:30
→ jaql joined20:30
→ lamont joined20:30
→ dwmw2_gone joined20:30
→ GarethAdams|Work joined20:30
→ spearce joined20:30
→ redbaritone joined20:30
→ hugoxrosa joined20:30
→ Sieben joined20:30
→ yrlnry joined20:30
→ dbatbold joined20:30
→ TeckniX joined20:30
→ s0ber joined20:30
→ frakturfreak joined20:30
→ lericson joined20:30
→ thiago joined20:30
→ parasti joined20:30
→ mbroeker joined20:30
→ alin-gym joined20:30
→ kristian42 joined20:30
→ d0k joined20:30
→ ExtraSpice joined20:30
→ ruskie joined20:30
→ multi_io joined20:30
→ lhz joined20:30
→ dr_win joined20:30
→ Amorphous joined20:30
→ mindworx joined20:30
→ molokai joined20:30
→ Goneri joined20:30
→ mstormo joined20:30
→ dirker joined20:30
→ makubi joined20:30
→ BAAVBOK joined20:30
→ kloeri joined20:30
→ jamuraa joined20:30
→ stamina_ joined20:30
→ David-T joined20:30
→ rettub_ joined20:30
→ tye_ joined20:30
→ Snow-Man joined20:30
→ nionith joined20:30
→ StuckMojo joined20:30
→ SvenDowideit joined20:30
→ robinsmidsrod joined20:30
→ kadoban joined20:30
→ lu_zero joined20:30
→ luis joined20:30
→ Chaser_ joined20:30
→ emmanueloga joined20:30
→ vinse joined20:30
→ slakmagik joined20:30
→ squentin joined20:30
→ adxp-2`` joined20:30
→ knittl joined20:30
→ Ingmar joined20:30
→ BeerSerc joined20:30
→ charon joined20:30
→ cYmen joined20:30
→ pielgrzym joined20:30
→ crankharder joined20:30
→ xou joined20:30
→ jkp joined20:30
→ stymo joined20:30
→ crazy2k joined20:30
→ w00tz joined20:30
→ madewokherd joined20:30
→ jjuran joined20:30
→ DrNick joined20:30
→ Oxf13 joined20:30
→ jksz joined20:30
→ Gitbot joined20:30
→ curtana joined20:30
→ esc joined20:30
→ NuubiRuby_ joined20:30
→ daethorian joined20:30
→ Leemp joined20:30
→ Veinor joined20:30
→ topi joined20:30
→ chkpnt joined20:30
→ jason237 joined20:30
→ chitragupt joined20:30
→ candybar joined20:30
→ SRabbelier joined20:30
→ traviscline joined20:30
→ adrien joined20:30
→ nobody joined20:30
→ wolog joined20:30
→ elijahbal joined20:30
→ drry joined20:30
→ sejo joined20:30
→ dionoea joined20:30
→ niko joined20:30
→ mquin joined20:30
→ MetaCosm joined20:30
→ bball__ joined20:30
→ yashi joined20:30
→ Risar joined20:30
→ ska-fan joined20:30
→ shade\ joined20:30
→ peper joined20:30
→ d1zzy joined20:30
→ vpilo joined20:30
→ trash joined20:30
→ stockholm joined20:30
→ __ed joined20:30
→ jones- joined20:30
→ hyperboreean joined20:30
→ bartek joined20:30
→ agile joined20:30
→ ricky joined20:30
→ mackstann joined20:30
→ termie joined20:30
→ nadim joined20:30
→ issyl0 joined20:30
→ diofeher joined20:30
→ Caelum joined20:30
→ doki_pen joined20:30
→ merlin83 joined20:30
→ chuck joined20:30
→ crazed joined20:30
→ tmz joined20:30
→ walf443 joined20:30
→ odin_ joined20:30
→ elliottcable joined20:30
→ darnold joined20:30
→ muep joined20:30
→ karihre joined20:30
→ reaVer joined20:30
→ jasom joined20:30
→ jeffszusz joined20:30
→ JamesA joined20:30
→ Bartman007 joined20:30
→ avar joined20:30
→ jspiros joined20:30
→ sunn joined20:30
→ tahorg joined20:30
→ FauxFaux joined20:30
→ MacGyverNL joined20:30
→ ebneter joined20:30
→ sjn joined20:30
→ madduck joined20:30
→ septic joined20:30
→ Ramblurr joined20:30
→ ericdc joined20:30
→ Gullik joined20:30
→ fauxhawk joined20:30
→ manjunaths joined20:30
→ sobersabre joined20:30
→ uau joined20:30
→ gonzojive joined20:30
→ chrizz joined20:30
→ tro joined20:30
→ picasso joined20:30
→ Juri_Agarin joined20:30
→ rduplain joined20:30
→ hachi joined20:30
→ Rhonda joined20:30
→ Khisanth joined20:30
→ elb0w joined20:30
→ buu joined20:30
→ eldragon joined20:30
→ joevano joined20:30
→ twmi joined20:30
→ niki joined20:30
→ mmattice joined20:30
→ NfNitLoop joined20:30
→ no_maam joined20:30
→ scottz_ joined20:30
→ Carneus joined20:30
→ ke4qqq joined20:30
→ baccenfutter joined20:30
→ Grum joined20:30
→ avtobiff joined20:30
→ cwillu_at_work joined20:30
→ jayne joined20:30
→ homa_rano joined20:30
→ wanders joined20:30
→ tonyj joined20:30
→ ndim joined20:30
→ fualo joined20:30
→ spb joined20:30
→ kmap joined20:30
→ joelpet joined20:30
→ arkx joined20:30
→ stoove joined20:30
→ teuf joined20:30
→ zchydem joined20:30
→ bnovc joined20:30
→ LotR joined20:30
→ defn joined20:30
→ jham joined20:30
→ eMBee joined20:30
→ jailbox joined20:30
→ ozzloy joined20:30
→ Ratler joined20:30
→ alip joined20:30
→ sbob joined20:30
→ electrogeek joined20:30
→ teknotus joined20:30
→ wagle joined20:30
→ davr joined20:30
→ hegge joined20:30
→ codejunky joined20:30
→ blueshift joined20:30
→ sgronblo joined20:30
→ vlt joined20:30
→ jakob joined20:30
→ coopsh joined20:30
→ housetier joined20:30
→ metze_away joined20:30
→ solatis joined20:30
→ Ferris joined20:30
→ ayaka_t joined20:30
→ siprbaum joined20:30
→ dennda joined20:30
→ s0enke joined20:30
→ pom joined20:30
← srcerer left20:30
← sivy left20:30
← Paraselene_ left20:30
→ kvanderw joined20:30
→ xenoterracide_ joined20:30
← justin-george left20:30
Paraselene__ → Paraselene_20:30
→ asmega_ joined20:30
→ justin_george joined20:30
← shade\ left20:31
← ryanakca left20:31
← meuh left20:31
← marc_kdab_ left20:31
→ meuh joined20:31
← chrisgibson left20:31
← Rearden left20:31
→ RORgasm joined20:31
← dermoth left20:31
→ jexmex joined20:32
→ neutrino_ joined20:32
← vmiklos left20:32
→ vmiklos joined20:32
→ sivy_ joined20:32
→ fahadsadah_ joined20:32
← mstormo left20:32
→ marc_kdab_ joined20:32
← neutrino left20:32
sivy_ → sivy20:32
→ workmad3 joined20:33
← WebDragon left20:33
Sigma → Guest9804720:33
→ shade_ joined20:33
← jexmex_ left20:33
← bbell left20:33
← asmega left20:33
← xenoterracide left20:33
← apsysoev left20:33
← LongBeach left20:33
→ dermoth joined20:35
← dermoth left20:35
→ WebDragon joined20:35
neutrino_ → tar-20:35
→ dermoth joined20:35
→ apsysoev joined20:35
→ hebz0rl joined20:36
← beni- left20:36
→ beni- joined20:36
→ bbell joined20:36
ju2wheels im working with the gitolite source and did a git checkout v1.5.3, but when i do cat conf/VERSION is still says 1.5.4 so I dont think its updating my working files20:37
← workmad3 left20:37
ju2wheels is there something else i need to do?20:37
→ ryanakca joined20:37
← niko left20:38
← hagabaka left20:38
→ niko joined20:39
← crazy2k left20:39
→ sagsousuke joined20:40
→ hasen_ joined20:40
← hasen left20:40
→ xiong joined20:40
← jayne left20:41
esc charon: i finally foobared something together http://gist.github.com/49281520:41
→ jayne joined20:41
sshc → sshc_20:41
jon_ i created a git repository at the root of my project and selected all the files and comitted them (using egit). now, does anyone know why all files are marked as "modified"? when using svn that mark disappears when the files have been comitted. here is a screenshot of my repo: http://hem.passagen.se/efectrix/gitrepo.png ... should i move the files to master or something?20:41
sshc_ → sshc20:41
esc charon: thanks for the tips about shortlog and --numstat20:42
→ mstormo joined20:42
← Heimidal_ left20:43
→ _Vi joined20:43
→ andy_ joined20:44
andy_ → andyj20:44
← jobor left20:44
→ tvw joined20:45
→ znake joined20:47
→ Fissure joined20:47
→ unreal_ joined20:47
← znake left20:48
→ up_the_irons joined20:48
← hadees left20:48
← Quevin left20:49
jon_ "git diff" returns nothing, but my egit workspace shows that all files have changed. is that a bug or something i'm missing?20:50
selckin welcome to windows20:50
forkmantis jon_: Are the files staged? if so, type "git diff --cached"20:50
jon_ selckin: what are you talking about? i'm using linux20:50
davr also try 'git status'20:51
selckin described what is usually a autocrlf issue20:51
jon_ forkmantis: i can see the files when i did git diff --cached. what does that mean?20:51
selckin but it's not20:51
jon_ git status says modified20:51
forkmantis jon_: "git diff" will show you what's changed in files that are not yet staged. "git diff --cached" shows you what's changed on files that are staged.20:52
← coppro left20:52
← jaql left20:52
patrikf jon_: and git diff HEAD is like a combination of both.20:53
jon_ forkmantis: i see. i added all the files through the egit interface and then committed20:53
if i select the root of my project and try to commit again again it says no changed items were selected20:54
and asks if i want to amend the last commit20:54
← SvenDowideit left20:55
← zrbecker left20:55
← paul0 left20:55
→ pantsman- joined20:55
→ SvenDowideit joined20:56
→ brntbeer joined20:56
→ znake joined20:58
→ Heimidal_ joined20:58
→ ixti joined20:59
← Chaser_ left20:59
← pantsman left20:59
← cannonball left20:59
→ PezHead joined20:59
← AlexP left21:00
→ AlexP joined21:00
← aspotashev left21:01
→ akahn joined21:01
akahn Is it possible to get git to put a diff on the commit screen when i'm in my editor about to write the commit message?21:01
→ aspotashev joined21:01
→ azol joined21:01
← azol left21:02
teuf akahn: git commit -v does that21:02
← aspotashev left21:02
← Heimidal_ left21:02
→ ev3878 joined21:03
→ lightcap joined21:03
akahn teuf: awesome, thanks21:03
→ aspotashev joined21:03
jon_ what does "staged" mean? i don't find anything about that in the git faq21:03
← lightcap left21:03
akahn jon_: it means you are getting ready to commit a file (or part of one)21:03
teuf jon_: it means the changes are in the index ready to go in the next commit21:04
pjackson jon_: Anything in the 'staged' area will be commited when you next run 'git commit'21:04
jon_: git commit with -a will add every change to the staging area.21:04
→ mrevd joined21:04
pjackson jon_: Go for tutorial and then the FAQ.21:05
← mrevd left21:05
→ mrevd joined21:05
← mrevd left21:05
← cilly left21:06
← PezHead left21:06
jon_ does -a stand for amend? :P21:06
→ bambule joined21:07
← eighty4 left21:07
jon_ ok, i'll read a tutorial (i've already read one, but it was for egit)21:07
wereHamster no, --amend stands for amend21:07
→ eighty4 joined21:07
← bambule___ left21:07
← WebDragon left21:09
→ workmad3 joined21:09
second3 → second21:10
← second left21:10
→ second joined21:10
← second left21:10
→ second joined21:10
→ mrevd joined21:10
← mrevd left21:10
→ b636bc7ca joined21:10
← forkmantis left21:11
→ hrushikesh joined21:11
hrushikesh Suppose my .git is located in /a/ and I've forgotten this fact, is there any way to find out where the .git is if I'm in directory /a/b/c/d/?21:12
→ javaJake joined21:12
← stringoO left21:12
parasti e.g., git rev-parse --show-toplevel21:13
hrushikesh parasti: thanks, that works.21:13
parasti for .git itself, --git-dir21:13
← hasen_ left21:13
→ lilylnx joined21:14
javaJake Git failed to merge on a binary. I know I want the "theirs" version. How do I pick that version?21:14
→ mrevd joined21:15
b636bc7ca I'd like to have a post-update hook that modifies the commit to add some stuff to it. Is it considered a "Bad Thing (TM)", or perhaps impossible to do? My desire here is to have a script that connects to the database and captures the DDL, adding it to the commit every time someone pushes into my tree.21:15
← mrevd left21:15
← sivy left21:15
patrikf b636bc7ca: your plans do sound evil. but what's the DDL?21:16
→ jtbandes joined21:16
→ sivy joined21:16
jtbandes Can I see what a merge will do without actually running it?21:16
← marsilainen left21:16
b636bc7ca patrikf: 'CREATE TABLE', etc.21:16
jtbandes Like, see if there will be conflicts so I can fix them ahead of time...21:17
→ jtauber joined21:17
parasti javaJake: git checkout --theirs (plus git add to accept of course)21:17
← jtauber left21:17
javaJake parasti: excellent, thanks21:17
→ jtauber joined21:17
parasti javaJake: I mean git checkout --theirs $path21:17
← jtauber left21:17
← ajpiano left21:17
b636bc7ca patrikf: So if someone, say, adds a column to the database that their particular commit relies on, the 'CREATE TABLE' statement that contains that new column will be silently attached to the commit.21:18
← lilylnx left21:18
patrikf b636bc7ca: sounds like a useful thing for a pre-commit hook21:18
b636bc7ca: I'd put a warning, but not actually commit it automagically21:18
(if the db layout changed=21:18
→ telemachus joined21:19
← andrewl left21:20
unreal_ → unreal21:20
hachi hello all, is there a way I can dump a repo into a dir that isn't a working dir?21:20
b636bc7ca patrikf: I had that in mind as my fall-back option, is there a reason you'd do it that way other than "it's easier to do"? :)21:20
hachi similar to svn export21:20
akahn teuf: is there a way to make that a default option for git commit?21:21
teuf akahn: no idea21:21
→ WebDragon joined21:21
← WebDragon left21:21
hachi ahh, archive21:21
b636bc7ca hachi: http://stackoverflow.com/questions/160608/how-to-do-a-git-export-like-svn-export21:22
← flazz_ left21:22
← javaJake left21:22
→ bl8n8r joined21:22
← Aikawa left21:22
→ toabctl joined21:22
patrikf b636bc7ca: I don't like the idea of git commit committing more than what I intended to.21:22
← znake left21:23
← toabctl left21:23
← Schmallon left21:23
b636bc7ca patrikf: What about some kind of interactive thing? At "git commit", prompt you "Do you want me to check the database for changes?"21:23
bl8n8r is there a way to add a file to git which is on a different filesystem? eg: not in the current directory path?21:23
← tjholowaychuk left21:25
→ tjholowaychuk_ joined21:25
← workmad3 left21:25
patrikf b636bc7ca: if the check is fast, I'd always do the check, and if the db layout differs from the committed one, put a warning (or prompt whether to auto-update the layout in the working tree)21:25
→ hagabaka joined21:25
← IslandUsurper left21:25
b636bc7ca I'm not sure how fast it will be, but I'll profile it. Thanks for the input.21:26
→ hasen_ joined21:26
← ehabkost left21:26
← asmega_ left21:26
→ mrevd joined21:26
patrikf b636bc7ca: of course, you can also do that check in post-update. my advice is just not to auto-commit anything21:26
→ jtdowney joined21:28
← jtdowney left21:28
→ jtdowney joined21:28
→ marsilainen joined21:28
← mrevd left21:29
→ phantomcircuit joined21:30
← hrushikesh left21:30
→ karptonite joined21:30
← phantomcircuit left21:31
→ phantomcircuit joined21:31
jtbandes HA21:31
HAHAHA I'm so proud of myself. http://cl.ly/4e727ab72a7c6a5895b221:32
← lhz left21:32
→ hasen joined21:33
← bl8n8r left21:33
karptonite My origin is a bare repository shared with another programmer. He created and pushed to our shared origin a branch that had the same name as another branch, differing only in capitalization. Now there are two branches, 'foo' and 'FOO', neither of which we need, and we can't seem to get rid of them. Every time I pull, I get a message related to one (or the other) of them. (my own repository is on a system that is not case-sensit21:33
How can we get rid of foo and FOO?21:33
git branch -r -d (or -d) has not worked.21:33
-D21:34
my pulls update between the following messages: 3d420ce..1dc4870 VGG -> origin/VGG and 1dc4870...3d420ce vgg -> origin/vgg (forced update)21:34
← Theravadan left21:35
← tvw left21:36
→ Fangorn_ joined21:36
← hasen_ left21:36
jjuran karptonite: Create new branches to mark those heads, and then `git push origin :vgg :VGG`?21:36
← Fangorn_ left21:36
→ Fangorn_ joined21:36
← TML left21:37
Fangorn_ Is there a way to use git log to get a list of changes affects a given fileglob in a particular branch?21:37
→ amstan__ joined21:37
karptonite jjuran: Thanks, that worked, even though i'm not entirely sure why. :)21:39
Fangorn_ git checkout <branch>; git log -p -- *.c seems to work fine21:39
← corni left21:40
← marsilainen left21:41
→ mrevd joined21:41
amstan__ → amstan_21:41
→ Yuuhi` joined21:42
← mrevd left21:42
jjuran karptonite: git branch -d deletes branches in your repo; git push origin :branch deletes a branch upstream.21:42
karptonite ah...21:42
so what did git branch -r -d do?21:42
→ Blackguard joined21:43
jjuran origin/foo is a branch in your repo which tracks an upstream branch.21:43
It might have temporarily deleted your tracking branch.21:43
← Yuuhi left21:44
← mbroeker left21:44
→ alex__c2022 joined21:44
karptonite ahhh...21:44
Thank you!21:44
jjuran :-)21:44
← sylr left21:45
→ hasen_ joined21:46
← gebi left21:46
← ExtraSpice left21:47
← hasen left21:49
→ dreinull joined21:50
← dreinull left21:50
b636bc7ca patrikf: Got it - I'm just trying to make it as low-impact as possible, otherwise I'll get pushback from the team lead21:51
→ dreinull joined21:51
b636bc7ca patrikf: He's not as enamoured as I am of the idea of storing the DDL alongside the code. "The database will never crash."21:51
← Tuomas left21:52
← CarlFK left21:52
→ Tuomas joined21:53
← hipe left21:54
→ hipe joined21:55
→ amerine joined21:56
← hasen_ left21:57
← rvalue left21:58
← Nemurenai left21:58
← hipe left21:59
← loincloth left22:01
← AlexP left22:02
→ AlexP joined22:02
→ secoif joined22:03
← karptonite left22:03
← sword left22:04
→ pokeir joined22:06
→ toddr joined22:07
toddr Is there somewhere I can go to see a summary list of differences between git 1.6 and current?22:08
← masterkorp left22:08
← amstan_ left22:09
→ CoinOpeBoy joined22:09
← CoinOpeBoy left22:09
toddr nm. http://www.kernel.org/pub/software/scm/git/docs/22:09
→ CoinOpeBoy joined22:09
→ hasen_ joined22:10
→ rvalue joined22:10
→ aresnick joined22:10
wereHamster toddr: the changelog22:10
toddr wereHamster: "the changelog"?22:11
→ EricInBNE joined22:12
wereHamster toddr: release notes, whatever you call it. <HEAD:Documentation/RelNotes-1.7.0.txt>22:12
Gitbot [git RelNotes-1.7.0.txt]: http://tinyurl.com/yfo4hfy [blob]22:12
toddr ok maybe I should re-phrase. What are the risks of using git 1.6.0 and git 1.7.1 against a single git repo22:13
thiago why would you keep two git installed?22:14
use only the latest22:14
toddr multiple machines. accessing via ssh22:14
← niko left22:14
→ niko joined22:14
adamholt → adamholt_away22:15
thiago no, same machine22:15
adamholt_away → adamholt22:15
thiago one repository only exists in one machine22:15
are you sharing it via NFS?22:15
→ rubyruy joined22:15
→ Heimidal_ joined22:16
toddr so in my example, I have 3 machines. 1 with 1.60. one with 1.71, and then a central one we push/pull to via ssh22:16
sneakret_ → sneakret22:16
thiago and there's only one git installed on the central machine?22:16
← rubyruy left22:16
← akahn left22:16
toddr the one installed on the central machine is 1.7122:16
thiago then it should be no problem22:17
← frakturfreak left22:17
thiago the protocol of the transfers is quite well-established and hasn't changed22:17
→ Chaser_ joined22:17
toddr what I'm unclear on is how the central one is interacted with from the 1.60 client22:17
ok22:17
thiago please note that the extra dot is important22:17
1.1.0 is not the same as 1.1022:17
← kelvie left22:18
toddr sorry yes 1.60 in my example is 1.6.022:18
← sammcd left22:18
← RORgasm left22:20
toddr thiago: thanks22:20
← toddr left22:21
← Chaser_ left22:23
← dreinull left22:23
→ Chaser_ joined22:23
→ Jippi_mac joined22:24
← RobertLaptop left22:24
← Heimidal_ left22:24
→ RobertLaptop joined22:24
← ixti left22:24
→ rubyruy joined22:25
→ hasen joined22:26
← tstclair left22:27
← Carl_ left22:27
← telemachus left22:28
→ mtkd joined22:28
→ kelvie joined22:29
← hasen_ left22:29
← kelvie left22:29
← hobodave left22:29
→ sgh joined22:32
→ sammcd joined22:33
← rpg left22:36
← jshsu left22:36
→ frakturfreak joined22:36
→ robacarp joined22:36
← kipras left22:37
robacarp Hi all. I started to merge remote master into my local and tried to abandon it with `git reset --hard HEAD` and now git isn't tracking any of my files....git status lists everything in the repo as being untracked22:38
what'd I miss?22:38
→ hasen_ joined22:38
→ Heimidal_ joined22:39
← Nickeeh left22:40
← hasen left22:41
← eighty4 left22:42
→ dfas joined22:43
→ offby1 joined22:43
→ digitalhobbit joined22:44
← digitalhobbit left22:46
→ ajpiano joined22:47
← redbaritone left22:48
← MattDiPasquale left22:49
← Heimidal_ left22:49
← airborn left22:50
← mindworx left22:50
→ shiba_yu36 joined22:51
← alex__c2022 left22:51
→ JohnnyL joined22:52
← fr0sty left22:52
← nevyn left22:52
elliottcable → ajnewbold22:53
ajnewbold → elliottcable22:53
→ nevyn joined22:54
→ amerine_ joined22:54
← amerine left22:54
amerine_ → amerine22:54
→ zoo-zed joined22:57
→ shiba_yu_ joined22:57
← shiba_yu36 left22:57
← tizbac left22:58
← nevyn left22:58
← yann left22:58
← jtbandes left22:58
→ yann joined22:58
← pokeir left22:59
→ unknownbliss joined23:00
unknownbliss who here is patient and good with git?23:00
← thiago left23:01
→ thiago joined23:01
mapreduce I'm neither, ask the real question though. :)23:01
→ jtbandes joined23:02
← mtkd left23:02
→ mtkd joined23:03
← dfas left23:03
← Paraselene_ left23:03
→ jmspeex joined23:03
unknownbliss dm. found someone who could help23:04
→ nevyn joined23:04
← Jippi_mac left23:05
→ gravaera joined23:05
← gravaera left23:05
← RobertLaptop left23:07
← mtkd left23:07
← beni- left23:08
← TeckniX left23:08
← xiong left23:09
← d0k left23:09
→ fxn joined23:11
← amerine left23:12
→ MrWynand joined23:12
← pantsman- left23:12
→ jgoppert joined23:12
jgoppert how do i get reset hard a remote branch?23:13
wereHamster maybe you want push -f ?23:13
robacarp git reset --hard remote/branch ?23:13
fxn hey I am seeing a few duplicated commits in the Rails repo... could anybody help me understand why?23:13
robacarp if I git branch -d will it delete the local branch or the remote branch?23:13
wereHamster local23:13
robacarp what about with a -D ?23:14
→ Theravadan joined23:14
wereHamster fxn: someone probably rewrote history23:14
still local, robacarp23:14
jgoppert locally i'm resetting hard to xxx then i try to push but non fastforward error23:14
robacarp okay, just don't want to nuke the remote repo...thanks23:14
fxn wereHamster: is there a way to track that down?23:14
frogonwheels robacarp: you need to push the delete up explicitly23:14
jgoppert so push -f will do it then?23:14
wereHamster fxn: look in the history ;)23:14
jjuran jgoppert: Yes, push -f overrides non-ff23:15
fxn wereHamster: they appear in git log duplicated, what should I look for?23:15
robacarp okay. so how do I checkout a remote branch?23:16
← rubyruy left23:16
jjuran robacarp: Only git-fetch and git-push talk to the remote.23:16
jgoppert push -f doesn't work for me23:17
jjuran jgoppert: Try posting the full command and the error message.23:19
jgoppert oh, had denyNonFastForwards turned on by default I guess :-)23:19
← apsysoev left23:19
← jtbandes left23:19
robacarp jjuran: okay, so I can git fetch, but it doesn't create a branch to match the remote branch23:20
← unknownbliss left23:20
jjuran git fetch remote && git checkout -b branch remote/branch23:20
JohnnyL 1.7.2 is stable?23:21
→ apsysoev joined23:21
robacarp jjuran: thanks. holycrap I've been bashing this git repository for like an hour23:21
jjuran JohnnyL: It's a supported release, if that's what you mean.23:22
→ lightcap joined23:22
← PerlJam left23:24
← jgoppert left23:25
JohnnyL jjuran: of that i AM aware.23:25
jjuran Well, this isn't Debian, so I'm not sure what 'stable' means here. :-)23:26
→ PerlJam joined23:26
JohnnyL jjuran: What if I was to say to you, your application wasen't stable?23:27
← sgh left23:27
← jrmuizel left23:28
← jtdowney left23:28
jjuran JohnnyL: I'd ask you which application you were referring to. I certainly can't take credit for Git.23:28
Well, except for porting it to classic Mac OS, but I'm pretty sure you're not using that.23:29
← ndim left23:31
→ comawhite joined23:31
JohnnyL lol23:34
no threading support under cygwin it seems23:34
← justin_george left23:35
JohnnyL what if I'm using 1.6 in windows and 1.7.2 under cygwin, will there be corruption of data?23:35
(on the same project)23:35
Can't seem to find 1.7.2 for windows.23:35
bbl23:36
← ajpiano left23:37
→ amerine joined23:37
← sammcd left23:38
shade_ → shade\23:38
→ hipe joined23:38
robacarp is there a way to track all the revisions to a specific file?23:39
or, rather, to visualize23:39
← AAABeef left23:40
jjuran robacarp: man git-log23:40
Gitbot robacarp: the git-log manpage can be found at http://git.or.cz/man/git-log23:40
→ unknownbliss joined23:40
robacarp okay, thanks. Will that work for a file that is now deleted?23:42
→ fr0sty joined23:43
← hipe left23:44
→ hipe joined23:45
← zoo-zed left23:45
← _Vi left23:45
← lightcap left23:46
jjuran robacarp: git log -- /path/to/deleted/file23:47
→ scarabx joined23:47
→ TML joined23:47
jjuran Oops, that shouldn't be an absolute path.23:47
robacarp jjuran: thanks. I think its just a days work lost.23:48
→ Arrowmaster joined23:49
→ lightcap joined23:49
← hipe left23:49
← apsysoev left23:49
jjuran robacarp: If it's in the history, it's not lost, right?23:50
robacarp well, the log command produces nothing23:50
jjuran You might find one of the graphical visualizers useful. I've used gitk and GitX.23:50
robacarp and I poked around in git instaweb23:50
yea, I searched through the history in gitk and gitgui too, its just gone23:51
→ apsysoev joined23:51
jjuran Was it ever committed in the first place?23:51
robacarp yea, it was.23:51
→ Sr_X joined23:51
← rayners left23:51
robacarp but I'm starting to think that branch got deleted or something because the file only exists in the state it was before I went on vacation23:52
and changes were made and committed today23:52
eldragon → worldhlord23:53
→ Joeconyers joined23:53
jjuran robacarp: `git log -g` to view the HEAD reflog.23:53
→ coppro joined23:53
jon_ → jonkri_23:54
robacarp stackoverflow seems to indicate that I should be able to recover the deleted branch...but I haven't yet found out how to do that23:54
← shiba_yu_ left23:54
← brosner left23:54
coppro man git-fsck23:55
Gitbot coppro: the git-fsck manpage can be found at http://git.or.cz/man/git-fsck23:55
jjuran Find the SHA-1 hash of the branch head and you can resurrect it if it hasn't been garbage-collected.23:55
→ shiba_yu36 joined23:55
← hugoxrosa left23:55
← tjholowaychuk_ left23:55
← dpino left23:55
→ tongueroo joined23:55
← uau left23:56
robacarp jjuran: thats what I was just thinking... checkout the sha then branch from there?23:57
← Ryback_ left23:58
→ hearit joined23:58
hearit → Iahc23:59
robacarp jjuran: yea, that did it. okay, thanks for the pointer to the reflog command23:59
I'm out, its an hour past quittin time!23:59
robacarp → robacarp|home23:59

Logs Search ←Prev date Next date→ Channels Documentation