IRCloggy #git 2011-06-12

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.

2011-06-12

← rendar left00:01
← mikeyutley left00:01
→ preflex joined00:02
← blorbx left00:02
→ blorbx joined00:02
← Somelauw left00:03
← p3rror left00:06
→ Makoryu joined00:17
← Titosemi left00:18
→ micrypt joined00:19
micrypt How does one replace remote history after doing a rebase?00:20
→ Bass10 joined00:20
EugeneKay Very carefully.00:20
micrypt Haha. :)00:21
← Bass10 left00:21
→ Bass10 joined00:22
FauxFaux man git push --force is an option, but you should be more careful than EugeneKay suggested.00:22
jast *automatic message* the 'git-push' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-push.html00:22
← __sorin__ left00:23
→ dmojoryder joined00:23
→ gavin_huang joined00:27
← tcurdt left00:31
RealKillaz anyone here using Jenkins in combination with Git?00:32
FauxFaux RealKillaz: RealQuestion please.00:33
Makoryu Anyone using git while they drink Gatorade?00:33
EugeneKay gitorade?00:34
Makoryu （ °‿‿°）00:34
RealKillaz FauxFaux, well the thing is I'm new in this channel and not sure what is allowed to ask. Some channels are very strict about this.00:34
FauxFaux Stricter than about asking useless questions? I doubt it (as someone who enforces these kinds of policies in these kind channels).00:35
RealKillaz But ok, Im looking into using Git with our Continuos Integration tool of choice Jenkins00:35
but I'm having problems with the maven release plugin with Jenkins00:36
FauxFaux a) #jenkins exists. b) stop pressing return before you've asked an actual question.00:36
RealKillaz Everything looks ok.... but I dont see the pom.xml being change in the remote repository00:36
← rgr left00:36
jason237 is there any way to check whether the stat() information for a file matches the index without actually looking at the file contents?00:36
Makoryu FauxFaux: Hey relax. IRC has a line length cap. Though in the event that he has to type that much maybe he should find a terser way to say it...00:37
FauxFaux Why would you want to do that? What's wrong with git status?00:37
Makoryu: I use:00:37
Makoryu: Arrrrgh! Your question is entirely useless. Fill in the blanks: "I tried [X] in [Y]. I got [A] but I was expecting [B]. The simplest way I can think to reproduce this is [C]." Reply on one line. If it doesn't fit, use a pastebin. Do not even think of speaking before fully filling in the question.00:37
← Dave^| left00:38
Makoryu FauxFaux: I might save that somewhere and use it without your express permission in blatant defiance of copyright law00:38
Is this okay with you00:38
FauxFaux Yes.00:38
Makoryu OK00:38
FauxFaux RealKillaz: You need someone who knows how maven-release is supposed to work with git in jenkins; afaik maven-release knows how to push so should be pushing to wherever it was cloned from (as apposed to to it's temporary terrible clone), but I don't know if jenkins interferes with this. We don't use it 'cos it was too broken when we set things up.00:39
→ ap3mantus joined00:41
← gui_user left00:42
RealKillaz FauxFaux, let me rephrase. I have in a repository nothing to commit (git status) and Everything up-to-date (git push). When I pull (git pull) it from another repository with the same remote I get Already up-to-date. How is this possible?00:42
and some of the files are different?00:43
FauxFaux Different branches? Different remotes? git branch -vv / git remote -v00:43
← d3vic3 left00:46
← gozoner left00:46
→ mando joined00:46
← Fudge left00:47
→ jeffery joined00:47
→ cakehero joined00:48
RealKillaz FauxFaux, Aha I see that on machine B the branch being used is * (no branch)00:48
→ SimonP86 joined00:50
→ rettub joined00:50
← weaselville left00:52
canton7 you've got a detached head. read up on it, and be careful or you'll lose work00:53
EugeneKay Detaching your head is one of those things I learned not to do at a very young age.00:54
It just doesn't sound like fun.00:54
← SimonP86 left00:54
canton7 it does seem we get altogether far too many people accidentally detaching their heads, despite a bloody great warning when it happens. anything we can do?00:54
maybe patch checkout so it will only detach the head it a flag is present (overridable by config value)?00:54
→ linusoleander joined00:56
RealKillaz canton7, I'm using the CI called Jenkins which is detaching the head. Just trying to figure out why now. If it is maven or the plugin messing things up.00:57
← briang_ left00:57
→ briang joined00:57
RealKillaz canton7, which command or action can be causing this?00:58
← brian_g left00:58
← briang left00:58
canton7 checkout <something that isn't a local branch> seems to be the most common cause00:58
RealKillaz canton7, which command or action of Git I mean00:58
→ briang joined00:58
canton7 git checkout <something that isn't a local branch>00:58
← mando left00:59
canton7 ^^ might well be the only way to detach the head, not entirely sure on that one00:59
RealKillaz canton7, OK let me see.00:59
→ Corren joined00:59
→ gerard0 joined01:00
RealKillaz canton7, seems to me that this start too happening when I upgraded to the newest Git version 1.7.5.4, before that I didn't noticed this behavior.01:00
FauxFaux git update-ref HEAD PENISPENISPENIS is, I guess, cheating.01:01
← logik-bomb left01:01
canton7 i don't recall anything that would have caused more detached heads being introduced01:01
FauxFaux, if someone does that it's their own damned fault :P01:02
← gavin_huang left01:02
FauxFaux echo detached > .git/HEAD?!!!?01:02
← uau left01:03
→ gavin_huang joined01:03
canton7 now that *is* cheating. what does update-ref do, other than change the ref and update the reflog?01:03
FauxFaux Nothing, afaik. It does some sanity checking and repo locking, though.01:04
← Corren left01:05
← canton7 left01:05
→ normanrichards joined01:05
frogonwheels FauxFaux: and refloging01:06
→ Corren joined01:06
FauxFaux frogonwheels: The Hero mentioned that.01:06
frogonwheels FauxFaux: so he did :)01:06
→ lunks joined01:07
→ __sorin__ joined01:07
← alberto56 left01:07
FauxFaux http://www.youtube.com/watch?v=fgX-7ebLOdw#t=12s for anyone too cheap to have bought the Firefly extras dvd. ;)01:07
← __sorin__ left01:08
→ __sorin__ joined01:08
RealKillaz FauxFaux, found it using reflog01:08
→ g0bl1n joined01:09
RealKillaz they're are moving from master to bb1c2907f24192c5eb85a6ab1397268872f4baaf01:09
← __sorin__ left01:11
RealKillaz They clone and after the clone they move the master to the revision mentioned above01:11
← dmojoryder left01:12
← ph^ left01:15
← Corren left01:16
← sechrist left01:19
→ Maletor joined01:19
← airborn left01:19
jeffery anyone know why I get the following error: "fatal: Unable to create .git/refs/heads/stable.lock': Permission denied"? DO I need to set file-system permissions for the user trying to push?01:19
EugeneKay In a word, yes.01:19
← micrypt left01:20
jeffery EugeneKay: on the stable.lock file I assume?01:20
EugeneKay On the whole repo, generally.01:20
jeffery ok thanks01:20
EugeneKay If you're trying to give somebody permissions-based access to a git repo, you should probably use something like gitolite01:21
jeffery cool, checking gitolite01:21
← peterhil left01:23
→ ph^ joined01:23
→ uau joined01:23
jason237 FauxFaux: git status is too slow for synchronous use in vc-git for a large codebase; if the repository isn't in cache, when I save a file emacs hangs for several seconds waiting for git diff-index to finish. I tried changing it to use git status --porcelain instead, but I still get the hang.01:24
→ alberto56 joined01:26
← replore_ left01:28
← alberto56 left01:31
sitaram jason237: try 'git config core.preloadindex true' - not sure if it will help but worth a try01:32
← nullvariable left01:33
← dreiss left01:33
← linusoleander left01:34
← aspotashev| left01:37
→ aspotashev joined01:37
← cakehero left01:39
→ gozoner joined01:40
→ Vampire0_ joined01:40
→ Yannick-Gagnon joined01:40
← Vampire0 left01:43
← Yannick-Gagnon left01:50
← __name__ left01:51
← brainbox1100_ left01:51
→ AdRem joined01:55
← AdRem left01:55
jason237 sitaram: thanks, I'll give that a try01:56
← bitkiller left01:57
magcius oops01:58
I accidentally touched modes on my files... can git restore modes, but nothing else?01:58
→ erguolinge joined02:02
← Badababuba left02:02
→ zhengyang joined02:02
← erguolinge left02:04
→ bindaas joined02:04
rns if I have modified a file, haven't commited it, but now want to switch branches without keeping track of the change I made, how do I do that?02:07
EugeneKay stash02:07
← acts_as left02:08
← aspotashev left02:10
← mcdebugger left02:13
→ ramusara joined02:13
← Makoryu left02:20
→ Makoryu joined02:20
→ dmojoryder joined02:21
→ Badababuba joined02:22
→ Evanescence joined02:22
← Evanescence left02:22
→ Evanescence joined02:23
← Chillance left02:25
← dim_ left02:26
← rzec left02:43
→ rzec joined02:43
rzec lets say I commits A, C, E, G in the master branch and I commits B, D, F in the task-a branch (which was branched when master only had commit A). when I merge task-a into master I get a log that is A, B, C, D, E, F, G instead what I would except which is A, C, E, G, B, D, F. Is git automatically reordering my history based on commit date/time?02:44
or is it just reordering the log to match date/time?02:44
→ wilhelmtell joined02:45
← ph^ left02:45
EugeneKay It displays them in chronological order. If you look at the tree you will see them in two chains as they were commited02:46
kerrick How do I get a diff of a given commit and the previous commit, without having to specify the previous commit?02:46
EugeneKay You need to specify something to compare something to :-p02:47
rzec EugeneKay:: ah, so if I add --topo-order, that shows me the true order of how the commits where added, thanks02:47
EugeneKay rzec - I was gonna suggest something with --graph, but yeah.02:48
→ intripoon_ joined02:49
EugeneKay I personally use SmartGit(it's free for "non-commercial" usage), it has a nice log view02:49
→ da1l6_ joined02:49
← da1l6 left02:49
kerrick EugeneKay, I mean, is there a shorthand for this? I would rather type "git diff --someflag 334aef5" than "git diff fea998 334aef5", but I can't figure out what --someflag is supposed to be.02:49
EugeneKay kerrick - standard shortcuts like HEAD^ work02:50
← krz left02:50
← intripoon left02:52
→ palam joined02:54
← bonhoffer left02:55
kerrick EugeneKay, where are these shortcuts documented?02:57
← alnewkirk left02:58
→ whaley joined02:58
→ _psychic_ joined02:59
→ sechrist joined02:59
→ rchavik joined03:00
← rchavik left03:00
→ rchavik joined03:00
EugeneKay This will get you started. http://book.git-scm.com/4_git_treeishes.html03:00
→ herdingcat joined03:01
← wilhelmtell left03:03
kerrick EugeneKay, thanks03:08
← Ownatik left03:09
← Will123456 left03:09
→ thirdtruck joined03:09
jeffery anyone uses gitolite with Jenkins CI ?03:09
← herdingcat left03:09
→ herdingcat joined03:12
→ envi_laptop joined03:13
→ JoeCoolDesk joined03:16
← JoeCoolDesk left03:16
→ dl9pf_ joined03:17
← rchavik left03:17
← dl9pf left03:17
kerrick EugeneKay, the page you mentioned does not describe the full syntax. However, I found that "git diff a19629^!" does what I need; git rev-parse --help has this information buried somewhere03:20
EugeneKay But you learned a good bit, and that's what matters ;-)03:20
→ rchavik joined03:20
kerrick EugeneKay, indeed; thanks :)03:21
→ ph^ joined03:22
khaije|minder is there a quick simply way to denote the first commit in a branch (besides just looking up the sha?)03:22
← rchavik left03:24
← dmojoryder left03:26
← whaley left03:30
← anderson left03:30
← sechrist left03:32
→ bgerber joined03:34
← aef left03:34
→ Fudge joined03:34
→ eletuchy joined03:34
kerrick khaije|minder, there does not appear to be any treeish that represents the first commit in a branch03:35
khaije|minder, there is an exhaustive list at http://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html#_specifying_revisions03:35
khaije|minder, you can press Shift+G when viewing the output of git log to go to the bottom03:37
→ angelsl joined03:37
→ aef joined03:38
← zhengyang left03:39
← kukks left03:40
→ DrDogwelder joined03:41
khaije|minder kerrick: thanks, ya i guess it's hard because branches may have more than one parentless commit03:42
→ ymasory joined03:49
← g0bl1n left03:50
→ gnufied joined03:51
kerrick The index, the cache, and the staging area are all the same thing, correct?03:52
Makoryu How do I do "svn checkout" in git03:53
Why is everything different03:53
¯\O_o/¯03:53
Seriously don't answer that I'm joking03:54
← gnufied left03:54
kerrick Makoryu, git deliberately does things differently than svn03:54
← eletuchy left03:55
kerrick "if in doubt, do (and name) things differently than svn/cvs does" was a rule when they developed git03:55
→ eletuchy joined03:55
kerrick so a lot of git commands don't do the same thing that similarly-named commands do in svn03:55
Makoryu I know :p03:55
→ Ownatik joined03:55
Makoryu "SVN's design goal was to do CVS right. There is *no way* to do CVS right."03:56
Didn't Linus say something like that03:56
kerrick yeah03:56
EugeneKay Yes.03:57
Look up the wikipedia article on git, history section03:57
Makoryu Don't worry, I will get much better at trolling the lot of you once I actually know my way around git03:58
← palam left04:01
← OOPMan left04:03
→ Alien_Freak joined04:05
← cytrinox left04:05
← csgeek left04:05
→ gnufied joined04:06
→ cytrinox joined04:07
← lut4rp left04:07
→ zhengyang joined04:08
← caseymcg left04:10
→ revberaldo joined04:12
→ dreiss joined04:12
← budsondixon left04:12
revberaldo hello, could anybody tell me how do I get git's manual (http://www.kernel.org/pub/software/scm/git/docs/user-manual.html) source? I'd like to study the xml.04:13
kerrick revberaldo, press Ctrl+U04:14
revberaldo, the page was probably automatically generated from some other source, though. But you can still read the HTML04:16
← ymasory left04:16
← bolt left04:17
← herdingcat left04:17
← thirdtruck left04:18
revberaldo kerrick, yes, I can read the HTML, but I was wondering whether I can read the XML. The HTML is generated by DocBook, which I'm trying to learn. Usually, open source projects place their documentation under a doc directory. I downloaded the source code of git, but couldn't find it.04:18
← idoru left04:18
→ bolt joined04:19
kerrick Hmm, IDK then, sorry04:19
revberaldo kerrick, thank you, I'll keep looking.04:21
← redGoat left04:21
Makoryu revberaldo: http://git.kernel.org/?p=git/git.git;a=blob_plain;f=user-manual.txt;hb=refs/heads/html04:21
This doesn't look like XML to me04:21
→ maleknet joined04:21
revberaldo Makoryu, that's markup!04:22
Makoryu You asked for XML04:22
→ palam joined04:22
Makoryu There doesn't seem to be any04:22
revberaldo I thought it would be XML.04:22
→ OOPMan joined04:22
revberaldo Maybe they convert it to XML and then HTML.04:22
→ aspotashev joined04:23
revberaldo Oh, I've found the source... It's in the source, but under the Documentation directory. I had just typed d<tab><tab> and assumed it wasn't there! My bad.04:23
Makoryu （ ≖‿≖）04:23
← blorbx left04:23
Makoryu revberaldo: http://git.kernel.org/?p=git/git.git;a=blob_plain;f=Documentation/Makefile;hb=2cbd969bcfef26b32c78bfbe475ce0ad9646ea0604:24
There's the makefile for the documentation04:24
revberaldo Makoryu, that's a huge makefile! It's my first time really trying to read source code. Thank you!04:26
Makoryu Good luck04:26
revberaldo I've found some mentions to docbook, I'm gonna try to figure out what's happening.04:26
→ Chillax joined04:28
Chillax what's the best way to start a new repo as a copy of an existing repo but without the history. Is there a real git way to do it other than removing the .git file from the repo after loading it up?04:28
→ dfr|mac joined04:28
→ herdingcat joined04:32
← ap3mantus left04:36
kerrick git rebase will tell me if I need to manually intervene in the rebasing process, correct?04:39
jason237 yes04:41
it will prompt you to fix conflicts, git add the affected files, and then git rebase --continue04:42
← german__ left04:42
kerrick jason237, ah, good04:42
thanks04:43
← gozoner left04:43
← DrDogwelder left04:43
← _psychic_ left04:43
← Bass10 left04:45
→ ap3mantus joined04:45
← dfr|mac left04:46
→ BirdofthehermeS joined04:50
← BirdofthehermeS left04:51
→ hermes369 joined04:51
hermes369 Hello.04:51
← Chillax left04:51
← SavoSuperCool left04:51
→ SavoSuperCool joined04:52
← Modius left04:53
← k-man left04:54
← akent left04:54
kerrick I forgot to sign HEAD^, so I would like to reset HEAD, keeping its changes in the working directory, so that I can then git-stash these changes, fix HEAD^, and use git-stash-apply to reapply HEAD. In order to reset HEAD, I should use git reset --keep, correct?04:55
← DoctorDarren left04:55
→ akent joined04:56
→ k-man joined04:56
hermes369 Noob here, whoop tee doo04:57
← dragoonis left04:57
→ cytrinox_ joined04:59
hermes369 I've got a gitolite question… How can I set up a public/private keypair to work for a user on the same box as git? I've looked all over and I found an answer on sitepoint; but, the answer assumes one knows how to set this up.04:59
kerrick It turned out that that didn't work. I just ended up diffing HEAD and HEAD^, saving that to a patch, running git reset --hard HEAD^, applying the patch, and doing git-stash05:00
← EugeneKay left05:00
sitaram hermes369: do it the same way as you do for a user on a different box -- why would being on the same box make a difference?05:00
hermes369 Well, I thought that would work; but, I'm being passworded to death.05:01
← cytrinox left05:02
cytrinox_ → cytrinox05:02
hermes369 I've added the public key in gitolite-admin, committed, and pushed and everything seems happy; until I try to push with git push [email@hidden.address]05:02
I should add that I did that from a clone on a separate box.05:03
← jeffery left05:04
sitaram hermes369: ssh is very simple or very complicated. Read the ssh documents that can be found in http://sitaramc.github.com/gitolite05:06
← madewokherd left05:06
hermes369 Gotcha. I'm hitting the books!05:06
→ ExtraSpice joined05:07
hermes369 ah, read the logs…novel idea05:07
sitaram hermes369: the ssh trouble shooting doc may help; see http://sitaramc.github.com/gitolite/doc/ssh-troubleshooting.html05:07
← palam left05:09
→ gozoner joined05:09
hermes369 Thank you. I have found this page; but, it looks like I need to go back here: http://sitaramc.github.com/gitolite/doc/gitolite-and-ssh.html05:10
Whomever wrote this deserves kudos; its actually pleasant to read.05:12
sitaram thanks :)05:14
any similarity between my nick and the first part of the hostname in that URL is purely intentional :)05:15
← jfkw left05:15
← jargon- left05:17
→ dr0id joined05:17
hermes369 lol05:18
I just read this, "It is also why I often ignore emails and IRC messages that seem like just ssh issues if I am too busy." I thank you for being kind with me.05:18
← rzec left05:19
→ toabctl joined05:22
→ budsondixon joined05:22
sitaram well it's a lazy sunday morning :)05:23
→ xxjthxx joined05:23
← varioust left05:23
sitaram there used to be a time -- before I wrote gitolite, and was still a gitosis user -- when I used to spend hours, often on /query, helping to debug ssh issues. But not anymore...05:24
→ varioust joined05:24
sitaram anyway the basic drill is (1) client side, try 'ssh -vvv' to see what keys are being offered. If the right ones are being offered then (2) check server side logs to see why the key was being rejected05:25
there's also the program sshkeys-lint that comes with gitolite; run it without arguments to see how to use it; it often helps when you think you have the key in the serverside authkeys file but you really dont (or you have it twice!)05:25
→ bencc joined05:29
→ hermes369_ joined05:30
← hermes369 left05:30
→ lut4rp joined05:31
← lut4rp left05:31
→ lut4rp joined05:31
← varioust left05:32
hermes369_ I will try that.05:38
I'm still reading… the frustrating thing is that everything works as long as I'm ssh-ing from outside the server.05:39
It's when I try to ssh from within the server that I have the trouble.05:40
[email@hidden.address] ssh [email@hidden.address] info … password hell.05:41
[email@hidden.address] ssh [email@hidden.address] info … no problem.05:41
I know I'm missing something. I'm keeping reading and will try the command you sent when I'm finished.05:42
→ Murr joined05:43
→ colazero joined05:47
→ accel joined05:49
accel i'm on a linux machine; is there anyway to attach meta data to my files, ... and have git also store them?05:49
← Evanescence left05:54
← accel left05:58
Rhonda Yes, there is, but you'll never know if you don't wait for the answer.05:59
→ caseymcg joined05:59
→ namemon joined06:00
→ palam joined06:00
← palam left06:00
→ boombatower joined06:01
← boombatower left06:01
→ boombatower joined06:01
→ aminpy joined06:01
← DrNick left06:01
→ Evanescence joined06:01
← Evanescence left06:02
→ Evanescence joined06:03
← gozoner left06:03
← Badababuba left06:05
← budsondixon left06:07
→ Corren joined06:07
→ chrisshattuck joined06:08
→ jjido joined06:09
← zhengyang left06:10
← jjido left06:11
→ Badababuba joined06:11
→ zheng joined06:12
← chrisshattuck left06:12
→ chrisshattuck joined06:12
→ LongBeach joined06:13
← ceej left06:18
← envi_laptop left06:21
← BiggFREE left06:21
← chrisshattuck left06:22
← f00li5h left06:26
→ Tac_Home joined06:27
← dreiss left06:27
← namemon left06:30
hermes369_ OK. After much wailing and gnashing of teeth, I see that for some reason, despite the correct key being offered, "…we did not send a packet, disable method…". ARGH!06:30
→ namemon joined06:31
→ envi_laptop joined06:31
→ hirohiro joined06:32
← namemon left06:33
→ DrNick joined06:35
→ amerine joined06:36
→ f00li5h joined06:36
← envi_laptop left06:36
← dnuke left06:36
← zheng left06:37
→ zheng joined06:37
karstensrage whats that gitmodule++ package?06:41
git submodule++06:42
← Yuffster left06:42
← aspotashev left06:42
→ TrineLocke joined06:44
→ namemon joined06:44
KindOne I got a GIT that was converted over from SVN, is their a way to remove the "GIT-svn-id: ..." that show up in the logs?06:44
← Corren left06:45
← namemon left06:46
→ namemon joined06:46
→ ThomasLocke joined06:49
→ redGoat joined06:53
← boombatower left06:57
← hirohiro left06:58
→ hirohiro joined06:59
← Murr left07:01
← redGoat left07:01
→ budsondixon joined07:02
→ Myth17 joined07:03
← Myth17 left07:03
→ Myth17 joined07:03
← caseymcg left07:04
→ dreiss joined07:05
cehteh KindOne: man git-filter-branch07:05
jast KindOne: *automatic message* the 'git-filter-branch' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-filter-branch.html07:05
cehteh but really consider if you want to do that, just keep them and dont care07:05
→ EugeneKay joined07:06
← budsondixon left07:07
← Ownatik left07:09
KindOne I want to remove all traces of SVN from it, so I'll do it07:09
← hirohiro left07:09
selckin you can convert from svn without them07:09
→ budsondixon joined07:10
→ saschagehlich joined07:12
→ ChUrP joined07:13
← ChUrP left07:14
← budsondixon left07:15
← saschagehlich left07:17
← Makoryu left07:18
→ budsondixon joined07:19
← eletuchy left07:21
← dr0id left07:22
→ eletuchy joined07:22
← herdingcat left07:22
KindOne yeah, ive already done it07:22
→ mikepack joined07:23
← zheng left07:23
← budsondixon left07:24
← arunce left07:25
→ saschagehlich joined07:26
← jrockway left07:38
→ ilogger2_ joined07:38
← Pathin left07:38
→ rue joined07:44
→ CareBear\ joined07:45
→ LotR joined07:45
→ JStoker joined07:45
→ dionoea joined07:45
→ bburhans joined07:45
→ hal1on joined07:45
→ teukka joined07:45
→ sejo joined07:45
→ ichilton joined07:45
→ ramsey joined07:45
→ phantomcircuit joined07:45
→ nimrod10 joined07:45
→ Bucciarati joined07:45
→ TTilus joined07:45
→ tango_ joined07:45
→ wanders joined07:45
→ Rhonda joined07:45
→ frerich2 joined07:45
→ jettero joined07:45
→ cbreak joined07:45
→ cm joined07:45
→ thiago joined07:45
→ FrostEyes joined07:45
→ Grum joined07:45
→ blop joined07:45
→ captainramen joined07:45
→ Merwin joined07:45
→ Anxi80 joined07:45
→ piti joined07:45
→ sgronblo joined07:45
→ RichardBronosky joined07:45
→ cantoma joined07:45
→ ericlee joined07:45
→ frogonwheels joined07:45
→ topi joined07:45
→ Delerius joined07:45
→ jdav_gone joined07:45
→ hyperair joined07:45
→ preflex joined07:45
→ gnufied joined07:45
→ stuffcorpse_ joined07:45
→ spb joined07:45
→ eMBee joined07:45
→ starcoder2 joined07:45
→ dotCOMmie joined07:45
→ Soliton joined07:45
→ kms joined07:45
→ Mizar-jp joined07:45
→ j4cbo joined07:45
→ dj_tjerk joined07:45
→ johnhill joined07:45
→ mulletron joined07:45
→ Kicer86 joined07:45
→ Martz joined07:45
→ BinGOs joined07:45
→ rtyler joined07:45
→ denysonique joined07:45
→ ShadesofGray_afk joined07:45
→ fluido joined07:45
→ thoolihan joined07:45
→ colazero joined07:45
→ dreiss joined07:45
→ nhOmega joined07:45
→ jtoy_ joined07:45
→ kinlo_ joined07:45
→ f0ster_ joined07:45
→ erichammond joined07:45
→ freaky[t]_ joined07:45
→ Pilif12p_ joined07:45
→ vdv joined07:45
→ BearPerson joined07:45
→ Adam joined07:45
→ UukGoblin joined07:45
→ tabakhase joined07:45
→ dbatbold joined07:45
→ sadmac joined07:45
→ kandinski joined07:45
→ felher joined07:45
→ zorzar joined07:45
→ meder joined07:45
→ karihre joined07:45
→ ciaranm joined07:45
→ skomorokh joined07:45
→ rjt joined07:45
→ rapha joined07:45
→ ahf joined07:45
→ vinc joined07:45
→ MaSch joined07:45
→ esc joined07:45
→ redheadphones joined07:45
→ janosch joined07:45
→ andyl joined07:45
→ adri joined07:45
→ pigeon joined07:45
adams.freenode.net set mode: +v07:45
→ gabiruh joined07:45
→ przemoc joined07:45
→ pasky joined07:45
→ flexd joined07:45
→ Bombe joined07:45
→ pahis__ joined07:45
→ avar joined07:45
→ jayne joined07:45
→ comawhite joined07:45
→ architekt joined07:45
→ jefferai joined07:45
→ Teo` joined07:45
→ wereHamster joined07:45
→ hyperboreean joined07:45
→ coopsh joined07:45
→ elliottcable joined07:45
→ MadCoder joined07:45
→ magcius joined07:45
→ nodestoo1 joined07:45
→ NorkNork joined07:45
→ silex joined07:45
→ mtkd joined07:45
→ jacobat joined07:45
→ andres joined07:45
→ jhford joined07:45
→ shabble joined07:45
→ ayust joined07:45
→ divVerent joined07:45
→ guide joined07:45
→ alexim joined07:45
→ Derander_ joined07:45
→ akheron joined07:45
→ schweizer joined07:45
→ a-atwood joined07:45
→ dhruvasagar joined07:45
→ binjured joined07:45
→ pastie joined07:45
→ jpalmer joined07:45
→ cYmen joined07:45
→ svip joined07:45
→ Exposure joined07:45
→ jonmasters joined07:45
→ MetaCosm joined07:45
→ offbyone joined07:45
→ johnnywengluu joined07:45
→ sven^ joined07:45
→ SJS joined07:45
adams.freenode.net set mode: +v07:45
→ rtward joined07:45
→ Phlogistique joined07:45
→ charon joined07:45
→ ioerror__ joined07:45
→ mediaslave joined07:45
→ koollman joined07:45
→ Ramblurr joined07:45
→ robinsmidsrod joined07:45
→ magnus_ joined07:45
→ tholl583xx joined07:45
→ stick joined07:45
→ tehbaut_ joined07:45
→ n8o joined07:45
→ tmz joined07:45
→ yrlnry joined07:45
→ c-spencer joined07:45
→ mmcgrath joined07:45
→ JamesA joined07:45
→ jast joined07:45
→ majoh joined07:45
→ arosen1 joined07:45
→ crass joined07:45
→ necromancer`zzz joined07:45
→ marchdown joined07:45
→ Nugget joined07:45
→ myme joined07:45
→ theoros joined07:45
→ jailbox joined07:45
→ OPK_ joined07:45
→ Weiss joined07:45
→ Mek joined07:45
→ trodrigues joined07:45
→ acidjazz joined07:45
→ Chib joined07:45
→ scrooloose joined07:45
→ Muz joined07:45
→ speakman joined07:45
→ lukeman joined07:45
→ fr joined07:45
→ hackeron joined07:45
→ lemonchicken joined07:45
→ karstensrage joined07:45
→ Linkadmin joined07:45
→ naquad joined07:45
→ _ikke_ joined07:45
→ CrazyGir joined07:45
→ Utkarsh joined07:45
→ Freeaqingme joined07:45
→ AlexP joined07:45
→ naderman joined07:45
→ Caius joined07:45
→ sneakret joined07:45
→ yogurt_truck joined07:45
→ amling_home joined07:45
→ chitragupt joined07:45
→ jspiros joined07:45
→ chuck joined07:45
→ markatto joined07:45
→ Tabmow joined07:45
→ unforgiven512 joined07:45
→ pax- joined07:45
→ Zol joined07:45
→ catsup joined07:45
→ monokrome joined07:45
→ d1b joined07:45
→ Haarg joined07:45
→ Cope joined07:45
→ Pacman_Home joined07:45
→ bremner joined07:45
→ Cyannide joined07:45
→ sitaram joined07:45
→ Xerrao joined07:45
→ balrok joined07:45
→ BooK joined07:45
→ tazle_ joined07:45
→ bremner` joined07:45
→ peper joined07:45
→ ivan joined07:45
→ mtx_init joined07:45
→ madsy joined07:45
→ neal joined07:45
→ coldboot joined07:45
→ kanzure joined07:45
→ asedeno_work joined07:45
→ Atlas joined07:45
→ Bonds joined07:45
→ yaotti_aw joined07:45
→ zizzfizzix joined07:45
→ pom joined07:45
→ sunny256 joined07:45
→ TLMonitor joined07:45
→ djh joined07:45
→ claar joined07:45
→ jlewis joined07:45
adams.freenode.net set mode: +v07:45
→ Caelum joined07:45
→ coffeejunk joined07:45
→ elb0w` joined07:45
→ fmilo joined07:45
→ c00kiemon5ter joined07:45
→ Ferris joined07:45
→ cmyers joined07:45
→ hiffy joined07:45
→ else- joined07:45
→ bwidmer joined07:45
→ Juri_Agarin joined07:45
→ cmn joined07:45
→ Stravy joined07:45
→ bartman` joined07:45
→ mirage335 joined07:45
→ jeppy joined07:45
→ Arrowmaster joined07:45
→ ijuma joined07:45
→ BlindOracle joined07:45
→ cworth joined07:45
→ jepler joined07:45
→ dermoth|home joined07:45
→ DarkHouse joined07:45
→ jamison joined07:45
→ m0 joined07:45
→ Chibby_ joined07:45
→ krosenvold joined07:45
→ fauxhawk joined07:45
→ NetHawk joined07:45
→ mika joined07:45
→ s0undt3ch joined07:45
→ whyking joined07:45
→ meuh joined07:45
→ crakdmirror joined07:45
→ jimbo-jones joined07:45
→ deqer joined07:45
→ Corey joined07:45
→ osfameron joined07:45
→ stamina joined07:45
→ stepnem joined07:45
→ ben225 joined07:45
→ nevyn joined07:45
→ cyphase joined07:45
→ muddo joined07:45
→ killfill joined07:45
→ warthog9 joined07:45
→ apassi joined07:45
→ vmiklos joined07:45
→ ew0 joined07:45
→ shadowmaster joined07:45
→ tfnico joined07:45
→ SebastianFlyte joined07:45
→ nellyb joined07:45
→ Tac joined07:45
→ svend joined07:45
→ juangiordana joined07:45
→ ilteris joined07:45
→ tonyj joined07:45
→ Zephyrus joined07:45
→ kst joined07:45
→ ping-pong joined07:45
→ d_roge joined07:45
→ halfl_ne_ joined07:45
→ Niedar joined07:45
→ eean joined07:45
→ jsjgruber joined07:45
→ Gunni joined07:45
→ joeytwiddle joined07:45
→ unreal_ joined07:45
→ ketas-av joined07:45
→ jamescarr__ joined07:45
→ Carraway joined07:45
→ akerl joined07:45
→ mmattice joined07:45
→ MissionCritical joined07:45
→ Spockz joined07:45
→ _iron joined07:45
→ Slush- joined07:45
→ squeakytoy joined07:45
→ Tommy[D] joined07:45
→ RealKillaz joined07:45
→ sraue joined07:45
→ iXeno joined07:45
→ jason237 joined07:45
→ sbell joined07:45
→ banghouse joined07:45
→ Buglouse joined07:45
→ Fretta joined07:45
→ Kismet010 joined07:45
→ thiago_home joined07:45
→ masterkorp joined07:45
→ devth_ joined07:45
→ jfelchner joined07:45
→ fr0stbyte joined07:45
→ workmad3 joined07:45
→ ijuma__ joined07:45
→ verto_ joined07:45
→ Morphous joined07:45
→ rettub joined07:45
→ briang joined07:45
→ Maletor joined07:45
→ Vampire0_ joined07:45
→ bindaas joined07:45
→ intripoon_ joined07:45
→ dl9pf_ joined07:45
→ Alien_Freak joined07:45
→ revberaldo joined07:45
→ bolt joined07:45
→ maleknet joined07:45
→ OOPMan joined07:45
→ cytrinox joined07:45
→ toabctl joined07:45
→ xxjthxx joined07:45
→ bencc joined07:45
→ LongBeach joined07:45
→ amerine joined07:45
→ ThomasLocke joined07:45
→ saschagehlich joined07:45
→ an0maly_ joined07:45
→ RJD22_alt joined07:45
→ mihar joined07:45
→ flazz_ joined07:45
→ saurik_ joined07:45
→ drl joined07:45
→ JonasF_ joined07:45
→ oele2 joined07:45
→ mjv_ joined07:45
→ _rane_ joined07:45
→ xrogaan_ joined07:45
→ ozzloy_ joined07:45
→ floppyea1s joined07:45
→ phlebas_ joined07:45
→ radarek joined07:45
→ dilfridge_ joined07:45
→ pyrony_ joined07:45
→ sordina joined07:45
→ optixx joined07:45
→ KindOne joined07:45
→ ArjenL joined07:45
→ kloeri joined07:45
→ Veejay joined07:45
→ FauxFaux joined07:45
→ dropdrive joined07:45
→ larva joined07:45
→ BBonifield joined07:45
→ ice799 joined07:45
→ teuf joined07:45
→ adamholt joined07:45
→ dcsobralWork joined07:45
→ sp3ctum joined07:45
→ jaakkos joined07:45
→ dcelix joined07:45
→ dogmatic69 joined07:45
→ localghost joined07:45
→ qknight joined07:45
→ eli joined07:45
→ shad joined07:45
→ jjore joined07:45
→ helgikrs joined07:45
→ bnovc joined07:45
→ Cap_J_L_Picard joined07:45
→ ericmuyser joined07:45
→ thomas_b joined07:45
→ candybar joined07:45
→ blast_hardcheese joined07:45
→ broonie joined07:45
→ bgy joined07:45
→ tokkee joined07:45
→ xaxxon__ joined07:45
→ hsb joined07:45
→ offby1 joined07:45
→ tchan joined07:45
→ cenuij joined07:45
→ Leemp joined07:45
→ s0ber joined07:45
→ jpmelos joined07:45
→ gkmngrgn joined07:45
→ EricInBNE joined07:45
→ ramusara joined07:45
→ bgerber joined07:45
→ hermes369_ joined07:45
→ mikepack joined07:45
→ js__ joined07:45
→ kerrick_ joined07:45
→ dok joined07:45
→ ezkl joined07:45
→ tychoish joined07:45
→ tty234 joined07:45
→ yzlin_ joined07:45
→ imarcusthis joined07:45
→ cehteh joined07:45
→ j0llyr0tten joined07:45
→ slakmagik joined07:45
→ cbz joined07:45
→ cxreg joined07:45
→ bball- joined07:45
→ JEEB joined07:45
→ werdan7 joined07:45
→ spatulasnout joined07:45
→ dibber joined07:45
→ joppe_ joined07:45
→ heinrich5991 joined07:45
→ nardev_ joined07:45
→ fcuk112 joined07:45
→ estan joined07:45
→ sirdancealot joined07:45
→ aef joined07:45
→ TrineLocke joined07:45
→ project2501b joined07:45
→ _main_ joined07:45
→ D-Roch joined07:45
→ kennethreitz joined07:45
→ tyteen4a03 joined07:45
→ patrikf joined07:45
→ freedrull joined07:45
→ awx joined07:45
→ wagle joined07:45
→ quuxman joined07:45
→ lu_zero joined07:45
→ infinity0 joined07:45
→ da5id joined07:45
→ Risar joined07:45
→ mapreduce joined07:45
→ gebi joined07:45
→ zivester__ joined07:45
→ batrick joined07:45
→ nazgul101 joined07:45
→ brandonw joined07:45
→ f0i joined07:45
→ smolyn joined07:45
→ rhizmoe joined07:45
→ Samual joined07:45
→ Zeelot joined07:45
→ Myth17 joined07:45
→ legumbre_ joined07:45
adams.freenode.net set mode: +vv07:45
→ wolog_ joined07:45
→ benjamin joined07:45
→ aperlstein joined07:45
→ mjt joined07:45
→ harv joined07:45
→ numbah joined07:45
→ bjornbjorn joined07:45
→ BeerSerc joined07:45
→ reuss joined07:45
→ Katibe joined07:45
→ SunilThaha joined07:45
→ ferrouswheel joined07:45
→ tro joined07:45
→ d-snp joined07:45
→ PerlJam joined07:45
→ tsaavik joined07:45
→ rlb joined07:45
→ Rovanion joined07:45
→ boaz joined07:45
→ Wooga joined07:45
→ GrowLinux joined07:45
→ Zenopus joined07:45
→ kpreid joined07:45
→ zodiak joined07:45
→ dr_win joined07:45
→ romel joined07:45
→ theoretical joined07:45
→ boazsender joined07:45
→ normanrichards joined07:45
→ ph^ joined07:45
→ EnTeQuAk joined07:45
→ kokx joined07:45
→ EgS joined07:45
→ envi_laptop joined07:45
→ biz joined07:45
→ angelsl` joined07:45
→ eagles_znc joined07:45
→ rudi_s_ joined07:45
→ RichiH_ joined07:45
→ Will|- joined07:45
→ _Blackshark joined07:45
→ deavid joined07:45
→ EugeneKay joined07:45
→ Tac_Home joined07:45
→ k-man joined07:45
→ SavoSuperCool joined07:45
→ Fudge joined07:45
→ da1l6_ joined07:45
→ uau joined07:45
→ gavin_huang joined07:45
→ gerard0 joined07:45
→ tlipcon joined07:45
→ joshsmith joined07:45
→ SimonNa joined07:45
→ lanthan joined07:45
→ metze joined07:45
→ LekeFly joined07:45
→ jonanin joined07:45
→ kelvie_ joined07:45
→ GodEater_ joined07:45
→ iElectric joined07:45
→ orospakr joined07:45
→ kingfishr joined07:45
→ Eko joined07:45
→ dec joined07:45
→ blueyed joined07:45
→ tomaw joined07:45
→ Drakevr joined07:45
→ bond` joined07:45
→ koki joined07:45
→ Kiall joined07:45
→ Putr joined07:45
→ durarara joined07:45
→ kanru joined07:45
→ hamb joined07:45
→ up_the_irons joined07:45
→ Pathin joined07:45
← vdv left07:45
← freaky[t]_ left07:45
← f0ster_ left07:45
← kinlo_ left07:45
← jtoy_ left07:45
← Pilif12p_ left07:45
← nhOmega left07:45
← erichammond left07:45
← dreiss left07:45
← colazero left07:45
← thoolihan left07:45
← ShadesofGray_afk left07:45
← denysonique left07:45
← rtyler left07:45
← BinGOs left07:45
← Kicer86 left07:45
← mulletron left07:45
← johnhill left07:45
← j4cbo left07:45
← dj_tjerk left07:45
← Mizar-jp left07:45
← kms left07:45
← Soliton left07:45
← dotCOMmie left07:45
← starcoder2 left07:45
← eMBee left07:45
← Martz left07:45
← fluido left07:45
← spb left07:45
→ jmcantrell_ joined07:45
← eagles_znc left07:45
→ eagles_znc joined07:45
← joshsmith left07:45
→ TML joined07:45
→ mino_ joined07:45
→ akent joined07:45
→ oc80z joined07:45
→ kassah joined07:45
→ shiba_yu36 joined07:45
→ jstemmer joined07:45
→ bterm joined07:45
→ sonnym joined07:45
→ alip joined07:45
→ shachaf joined07:45
→ _W_ joined07:45
→ dr_lepper joined07:45
→ RSchulz joined07:45
→ sephii joined07:45
→ logankoester joined07:45
→ Woody2143 joined07:45
→ SubZero_ joined07:45
→ xerophyte joined07:45
→ hackez_work joined07:45
→ dot-slaSh joined07:45
→ Gizmokid2005 joined07:45
→ Pieter joined07:45
→ Jygga joined07:45
→ ska-fan joined07:45
→ ianmcorvidae joined07:45
→ knittl joined07:45
→ iaj joined07:45
→ d1zzy joined07:45
→ jaeckel joined07:45
→ Davey joined07:45
→ chayin joined07:45
→ marienz joined07:45
→ Wojo joined07:45
→ zomg joined07:45
→ jeffhung joined07:45
→ nick_h joined07:45
← biz left07:45
→ biz joined07:45
benjamin → Guest4461307:45
← MissionCritical left07:45
→ ExtraSpice joined07:45
eagles_znc → eagles051387507:45
← tyteen4a03 left07:45
← D-Roch left07:45
← kennethreitz left07:45
← _main_ left07:45
← project2501b left07:45
← TrineLocke left07:45
← aef left07:45
← sirdancealot left07:45
← fcuk112 left07:45
← nardev_ left07:45
← heinrich5991 left07:45
← dibber left07:45
← spatulasnout left07:45
← werdan7 left07:45
← JEEB left07:45
← estan left07:45
← bball- left07:45
← cxreg left07:45
← cbz left07:45
← slakmagik left07:45
← joppe_ left07:45
← j0llyr0tten left07:45
← cehteh left07:45
← yzlin_ left07:45
← tty234 left07:45
← tychoish left07:45
← imarcusthis left07:45
← ezkl left07:45
← envi_laptop left07:45
← EgS left07:45
← kokx left07:45
← EnTeQuAk left07:45
← ph^ left07:45
← normanrichards left07:45
← boazsender left07:45
← theoretical left07:45
← dr_win left07:45
← zodiak left07:45
← kpreid left07:45
← Zenopus left07:45
← GrowLinux left07:45
← Wooga left07:45
← boaz left07:45
← romel left07:45
← tsaavik left07:45
← PerlJam left07:45
← Rovanion left07:45
← d-snp left07:45
← tro left07:45
← rlb left07:45
← ferrouswheel left07:45
← SunilThaha left07:45
← Katibe left07:45
← reuss left07:45
← BeerSerc left07:45
← numbah left07:45
← harv left07:45
← bjornbjorn left07:45
← mjt left07:45
← aperlstein left07:45
← ianmcorvidae left07:45
→ AAA_awright joined07:45
→ GOP-USA_dotcom joined07:45
← bburhans left07:45
← sejo left07:45
→ tty234 joined07:45
→ ianmcorvidae joined07:45
← shachaf left07:45
← ianmcorvidae left07:45
→ ianmcorvidae joined07:45
← mino_ left07:45
→ mino_ joined07:45
→ sejo joined07:45
stuffcorpse_ → stuffcorpse07:45
← stuffcorpse left07:45
→ stuffcorpse joined07:45
→ shachaf joined07:45
← TML left07:45
→ bburhans joined07:45
→ cods joined07:46
→ joschi joined07:46
← _iron left07:46
→ budsondixon joined07:46
← cods left07:47
→ cods joined07:47
→ poseid joined07:48
← Tabmow left07:48
← dok left07:48
→ Tabmow joined07:48
← poseid left07:48
→ dok joined07:48
hermes369_ OK, I got it to work; but, I'm so tired, I don't know if I remember what exactly I did.07:48
→ aspotashev joined07:49
→ Lgb joined07:49
→ Ingmar_ joined07:49
→ tpope_ joined07:49
→ eletuchy joined07:49
→ f00li5h joined07:49
→ ketas joined07:49
→ nd joined07:49
→ Smirnov joined07:49
→ joel_falcou joined07:49
→ Marquel joined07:49
→ mattly joined07:49
→ Sonderblade joined07:49
→ RvnPhnx joined07:49
→ troyt joined07:49
→ cballou joined07:49
→ resixian joined07:49
→ dwmw2____ joined07:49
→ mattp_ joined07:49
→ farktronix joined07:49
→ Nikoli joined07:49
→ compnerd joined07:49
→ milli joined07:49
→ NooRotic joined07:49
→ ndim joined07:49
→ jds joined07:49
→ jrockway joined07:49
→ bpgoldsb joined07:49
→ lamont joined07:49
→ lahwran joined07:49
→ ajpiano joined07:49
→ tg joined07:49
→ xinetd joined07:49
→ nimred joined07:49
→ cthuluh joined07:49
→ MacGyverNL joined07:49
→ chrisf joined07:49
→ mavin|gone joined07:49
→ Ratler joined07:49
→ mike_perdide joined07:49
→ svg joined07:49
→ NfNitLoop joined07:49
→ iivvoo joined07:49
→ rphillips joined07:49
→ Fiouz joined07:49
→ roflin joined07:49
adams.freenode.net set mode: +vvv07:49
→ nb joined07:49
→ avtobiff joined07:49
→ zykes- joined07:49
→ IcePic joined07:49
→ plopix joined07:49
→ ewoud joined07:49
→ flamingspinach joined07:49
→ eregon joined07:49
→ madduck joined07:49
→ joelpet joined07:49
← bnovc left07:49
→ tyteen4a03 joined07:49
→ kennethreitz joined07:49
→ D-Roch joined07:49
→ _main_ joined07:49
→ project2501b joined07:49
→ TrineLocke joined07:49
→ aef joined07:49
→ sirdancealot joined07:49
→ estan joined07:49
→ fcuk112 joined07:49
→ nardev_ joined07:49
→ heinrich5991 joined07:49
→ joppe_ joined07:49
→ dibber joined07:49
→ spatulasnout joined07:49
→ werdan7 joined07:49
→ JEEB joined07:49
→ bball- joined07:49
→ cxreg joined07:49
→ cbz joined07:49
→ slakmagik joined07:49
→ j0llyr0tten joined07:49
→ cehteh joined07:49
→ imarcusthis joined07:49
→ yzlin_ joined07:49
→ tychoish joined07:49
→ ezkl joined07:49
adams.freenode.net set mode: +vv07:49
← kennethreitz left07:49
→ kennethreitz joined07:49
← D-Roch left07:49
→ D-Roch joined07:49
→ bnovc joined07:49
← qknight left07:49
← bnovc left07:49
→ bnovc joined07:49
→ pcc1 joined07:49
→ qknight_ joined07:49
→ vdv joined07:49
→ Pilif12p_ joined07:49
→ freaky[t]_ joined07:49
→ erichammond joined07:49
→ f0ster_ joined07:49
→ kinlo_ joined07:49
→ jtoy_ joined07:49
→ nhOmega joined07:49
→ dreiss joined07:49
→ colazero joined07:49
→ thoolihan joined07:49
→ fluido joined07:49
→ ShadesofGray_afk joined07:49
→ denysonique joined07:49
→ rtyler joined07:49
→ BinGOs joined07:49
→ Martz joined07:49
→ Kicer86 joined07:49
→ mulletron joined07:49
→ johnhill joined07:49
→ dj_tjerk joined07:49
→ j4cbo joined07:49
→ Mizar-jp joined07:49
→ kms joined07:49
→ Soliton joined07:49
→ dotCOMmie joined07:49
→ starcoder2 joined07:49
→ eMBee joined07:49
→ spb joined07:49
← mikepack left07:49
← Maletor left07:50
→ TML joined07:50
→ envi_laptop joined07:50
→ EgS joined07:50
→ kokx joined07:50
→ EnTeQuAk joined07:50
→ ph^ joined07:50
→ normanrichards joined07:50
→ boazsender joined07:50
→ theoretical joined07:50
→ romel joined07:50
→ dr_win joined07:50
→ zodiak joined07:50
→ kpreid joined07:50
→ Zenopus joined07:50
→ GrowLinux joined07:50
→ Wooga joined07:50
→ boaz joined07:50
→ Rovanion joined07:50
→ rlb joined07:50
→ tsaavik joined07:50
→ PerlJam joined07:50
→ d-snp joined07:50
→ tro joined07:50
→ ferrouswheel joined07:50
→ SunilThaha joined07:50
→ Katibe joined07:50
→ reuss joined07:50
→ BeerSerc joined07:50
→ bjornbjorn joined07:50
→ numbah joined07:50
→ harv joined07:50
→ mjt joined07:50
→ aperlstein joined07:50
← dreiss left07:50
← nhOmega left07:50
→ nhOmega joined07:50
← Pilif12p_ left07:50
→ Pilif12p_ joined07:50
Pilif12p_ → Pilif12p07:50
← budsondixon left07:51
nhOmega → ruskie07:51
← TML left07:52
← cm left07:52
→ TML joined07:52
→ callumacrae joined07:54
hermes369_ I think it involved editing /etc/security/access.conf and creating an entry for the user accessing from localhost07:54
→ anderson joined07:54
→ lhz joined07:55
→ budsondixon joined07:55
← Tabmow left07:55
→ Tabmow joined07:55
← budsondixon left07:55
← dok left07:56
→ budsondixon joined07:56
→ dok joined07:56
← hermes369_ left07:57
→ _iron joined07:58
← Myth17 left07:58
← cmn left07:58
→ cmn joined07:58
← Smirnov left07:58
callumacrae → cm07:59
→ Smirnov joined07:59
← Smirnov left07:59
→ Smirnov joined07:59
→ canton7 joined08:00
← budsondixon left08:00
← aspotashev left08:01
→ MissionCritical joined08:01
← dok left08:02
→ dok joined08:02
← cm left08:04
← dok left08:07
→ callumacrae joined08:07
→ dok joined08:07
→ nullvariable joined08:09
← radarek left08:10
← amerine left08:11
← lhz left08:12
→ lanthan_ joined08:14
← ruskie left08:15
→ ruskie joined08:15
← nullvariable left08:16
← lanthan left08:17
← canton7 left08:19
← ruskie left08:20
→ ruskie joined08:21
→ md joined08:23
md → Guest6412408:23
← saschagehlich left08:23
→ Myth17 joined08:24
→ cesario joined08:25
← anderson left08:28
→ Raging_Hog joined08:28
← zodiak left08:29
→ Dave^| joined08:29
→ budsondixon joined08:31
Will|- → Will|_08:31
→ selckin joined08:32
← budsondixon left08:32
Will|_ → Will|08:32
→ budsondixon joined08:32
← durarara left08:34
← budsondixon left08:37
→ siprbaum joined08:38
→ budsondixon joined08:40
← budsondixon left08:41
→ budsondixon joined08:41
← f0i left08:43
← budsondixon left08:46
← hyperair left08:47
→ hyperair joined08:47
← Ingmar_ left08:51
→ versatiletech joined08:51
versatiletech if I git checkout to two commits prior, will I lose my last commit?08:53
cmn versatiletech: if you do it like git checkout HEAD~2 no08:54
→ diegoviola joined08:54
cmn you'll end up in 'detached HEAD' state08:54
the branch you were on remains the same08:54
versatiletech oh is that when you do a git status it says "no branch"08:55
cmn yeah08:55
versatiletech k08:55
cmn git should also warn you when you enter this state08:55
versatiletech HEAD is the last commit?08:55
cmn HEAD usually points to a branch, which points to the last commit in that branch08:56
in detached state, it points directly to some commit08:57
it's the commit you're basing your work against, would be a better way of putting it08:57
versatiletech k08:58
elliottcable → ec|detached08:58
versatiletech is HEAD~1 pointing to the same commit as HEAD?08:59
_rane_ → _rane08:59
→ psoo joined09:01
← Guest64124 left09:03
→ icwiener joined09:05
→ LukasT joined09:08
→ ronny joined09:09
ronny hi09:09
← OOPMan left09:10
ronny is there a simple/trivial way to check whether a git repo is being served at a http url (preferably via just doing a single http request)09:10
cehteh point your browser to it?09:13
jast this can obviously be fooled, but check whether a 'info/refs' file exists at that URL09:14
→ airborn joined09:17
→ unreal joined09:18
← unreal_ left09:19
→ radarek joined09:20
→ OOPMan joined09:23
← LukasT left09:25
→ blue_wall joined09:26
→ yeryry joined09:27
→ frederick joined09:31
→ namemon joined09:39
← banghouse left09:41
→ tjb2 joined09:44
← tjb2 left09:44
← blue_wall left09:44
← da1l6_ left09:47
→ urkud joined09:49
→ pantsman joined09:50
← pantsman left09:50
→ pantsman joined09:50
→ krz joined09:50
→ linusoleander joined09:53
→ caseymcg joined09:54
← Myth17 left09:55
→ brian_g joined09:55
rudi_s_ → rudi_s09:55
→ jophish joined10:00
→ Rockj joined10:02
Rockj Q: I've been working locally on a repository of mine and done lots of local commits, now I want to "rebase" I think and push the whole thing under 1 commit named "Inital public commit" to github. Is this possible so I don't need to publish my ridiclous local commit messages?10:03
→ Dreamer3 joined10:04
→ dim_ joined10:05
→ Jigal joined10:05
FauxFaux Rockj: Easiest way to do that is just to mv .git ~/backup.git && git init.10:06
Jigal good morning, when i want to use git from within netbeans on a windows machine. Do i need to install this client? http://help.github.com/win-set-up-git/10:06
FauxFaux Jigal: Yes (70% sure).10:06
Jigal FauxFaux, Egit from netbeans wouldn't do the job?10:07
Rockj FauxFaux: I can't do anything like git merge --squash master ?10:07
merging with it self is maybe stupid - heh10:08
FauxFaux Oh, apparently it does use jgit now. Probably should've looked that up before guessing. Jigal: WELL, WHY DON'T YOU TRY IT AND FIND OUT.10:08
Rockj: You can do things like that, but getting it to work with the very first commit is a pain for various technical reasons it's not worth caring about; if you want to get it down to two commits then that's fine.10:08
→ setmeaway joined10:10
→ leo2007 joined10:11
← Fretta left10:13
→ rendar joined10:13
Rockj guess ill just do a mv .git backup-thingie10:14
← namemon left10:15
→ namemon joined10:16
→ jutaro joined10:16
← psoo left10:18
→ kipras joined10:19
→ logik-bomb joined10:19
← ronny left10:19
← logik-bomb left10:20
→ ronny joined10:21
→ logik-bomb joined10:21
← logik-bomb left10:21
→ logik-bomb joined10:21
← xxjthxx left10:23
← EgS left10:23
→ EgS joined10:23
← kipras left10:24
→ kipras joined10:24
← vdv left10:25
EugeneKay → EugeneKaway10:31
→ lxsameer joined10:31
EugeneKaway → EugeneKay10:31
lxsameer how can i delete a remote tag10:31
dilfridge_ → dilfridge10:31
→ Anubisss joined10:32
jaeckel lxsameer: man git push10:32
jast lxsameer: *automatic message* the 'git-push' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-push.html10:32
hint: --delete10:32
lxsameer jast: ok thanks10:32
← linusoleander left10:33
← topi left10:34
→ Bartzy|work joined10:35
← Bartzy|work left10:36
→ saschagehlich joined10:36
→ HolySinner joined10:36
← shad left10:37
HolySinner i want to understand the git source code - any advice regarding where to start and how10:37
FauxFaux HolySinner: Pick a command you recognise from builtin/*.c and work out how it works.10:37
← diegoviola left10:38
← lxsameer left10:38
→ shad joined10:38
HolySinner FauxFaux: thanks buddy10:38
→ p3rror joined10:39
← jutaro left10:39
← kinlo_ left10:40
→ kumbayo joined10:42
→ jutaro joined10:42
→ MonsieurLu joined10:44
→ lxsameer joined10:45
lxsameer is it possible to tag a commit just in a specific branch10:45
FauxFaux That question doesn't really make sense, i.e. no.10:45
lxsameer FauxFaux: hmm i want to mark the rc releases of a software, what do you suggest ?10:46
← MonsieurLu left10:46
FauxFaux lxsameer: Tag the commit. Tags can contain /s for namespaces, if you'd like.10:47
lxsameer FauxFaux: it seems that this is what i want10:48
→ Octalot joined10:49
lxsameer FauxFaux: can you give me an example of /s10:49
FauxFaux git tag foo/bar10:50
lxsameer FauxFaux: aha thanks10:50
← caseymcg left10:52
← lxsameer left10:53
→ pen joined10:58
→ aspotashev joined11:00
→ tjb2 joined11:00
← tjb2 left11:00
→ flowbee joined11:01
→ Saur joined11:01
→ bonhoffer joined11:03
← saschagehlich left11:04
← versatiletech left11:04
← sirdancealot left11:04
→ eijk joined11:06
→ Sajaki joined11:07
Sajaki hi, i'm doing git add root/images/dirname/ but the directory stays red, i.e. unstaged11:08
and it exists11:08
← cesario left11:09
← cthuluh left11:09
→ jophish_ joined11:10
→ malumalu joined11:10
→ d3vic3 joined11:11
→ f0i joined11:11
← kerrick_ left11:15
← eletuchy left11:20
← leo2007 left11:21
← ph^ left11:22
→ ph^ joined11:22
← HolySinner left11:26
→ __name__ joined11:26
← __name__ left11:26
→ __name__ joined11:26
← Alien_Freak left11:27
→ ggorgen joined11:30
← gkmngrgn left11:30
Rockj a bit off topic, but anyone know if there's a channel where I can ask questions about licenses? Trying to figure out what license suits my project best before publishing.11:31
thiago_home doesn't know of any11:31
→ cthuluh joined11:32
→ lut4rp joined11:34
← lut4rp left11:34
→ lut4rp joined11:34
← RichiH_ left11:34
bremner Rockj: if you want to know specifically about licenses published by the FSF, there is #fsf. Of course that won't help you compare those to other licenses11:34
→ ralc joined11:35
→ tore_ joined11:37
→ RaceCondition joined11:39
Rockj bremner: ahh , I'll keep that in mind. It's kinda either GPL or apache license I guess. Probably GPL as I want code to be contributed back .11:40
→ devth joined11:40
FauxFaux The GPL is only the right license if you hate the software development community. :/11:41
Rockj AGPL?11:43
← devth_ left11:43
FauxFaux That's the same license in practice.11:43
bremner can we please not have a "this license sucks" discussion here?11:43
FauxFaux Aww.11:44
EugeneKay I'm a big fan f the "Do whatever the hell you like" license.11:44
← gnufied left11:45
← gavin_huang left11:46
← malumalu left11:50
← shiba_yu36 left11:50
← LongBeach left11:53
→ shiba_yu36 joined11:54
Rovanion I'm trying to push a set of commits to a remote, but the push ends saying that "Everything is up to date" even though there are large differences between the both repos. I'm very sure that I've commited my local changes. What could be wrong?11:55
→ gusnan joined11:55
← shiba_yu36 left11:55
FauxFaux Rovanion: Different remotes? git remote -v11:55
Rovanion FauxFaux: Will look11:56
FauxFaux: No the only remote I have is this repo, and the error wouldn't be "Everything is up to date" if the remote didn't exist right?11:58
FauxFaux Different branches? git branch -vv etc.11:59
← c00kiemon5ter left12:00
Rovanion That could have something to do with it, seems like my branches are a mess12:00
→ malumalu joined12:02
← cenuij left12:02
ec|detached → elliottcable12:04
Rovanion Will git checkout branchname revert all changes done in the current branch?12:05
FauxFaux No. If in doubt, man git stash12:05
jast *automatic message* the 'git-stash' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-stash.html12:05
← krz left12:07
← uau left12:09
← eijk left12:09
→ uau joined12:10
← gusnan left12:16
← tore_ left12:20
← js__ left12:21
← dim_ left12:24
→ dim_ joined12:25
← bonhoffer left12:25
→ bonhoffer joined12:26
→ Guest59300 joined12:28
FauxFaux There are basically no examples of non-trivial filter-branch --index-filters. :/12:29
← Guest59300 left12:30
← jutaro left12:33
← EugeneKay left12:34
← bonhoffer left12:38
→ [intra]lanman joined12:40
→ MUILTFN joined12:41
→ Bass10 joined12:42
→ shiba_yu36 joined12:43
→ varioust joined12:43
← logik-bomb left12:43
→ zhengyang joined12:44
→ Chillance joined12:45
→ SimonP86 joined12:46
→ saschagehlich joined12:47
← saschagehlich left12:48
→ saschagehlich joined12:48
→ dotemacs joined12:49
→ linusoleander joined12:52
dotemacs hello, once I've set up a repo with 'git --bare init' and can push to it, I don't see the files in it as it's not a working repo. What I would like to do is be able to push to it and have it automatically pick up what was pushed and 'depoloy' it. Is there a way to do it other than doing 'git clone ...', just so that I can get the files, then deploying them? thanks12:52
cbreak dotemacs: man git-clone12:53
jast dotemacs: *automatic message* the 'git-clone' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-clone.html12:53
cbreak write a hook that uses git-archive or similar12:53
or google for a solution that does that for you12:53
dotemacs cbreak: thank you12:55
bremner many people like "google: ams toroid web git"12:55
← saschagehlich left12:55
cbreak hmm?12:55
→ bonhoffer joined12:55
cbreak what's toroid ams?12:55
I'd have googled for "abusing git as deployment tool"12:55
→ saschagehlich joined12:56
← maleknet left12:56
← bonhoffer left12:57
dotemacs bremner: http://toroid.org/ams/git-website-howto ?12:58
bremner that one.12:58
→ empity joined12:58
bremner cbreak: your keywords are full of php12:59
← saschagehlich left13:00
→ jonanin_ joined13:00
empity so I was wondering, what is an easy way to find out the history of a given function?13:01
→ name joined13:01
← name left13:01
→ name joined13:01
empity I am on a function and I would simply like to see how it was 10 revisions ago for example13:01
← __name__ left13:01
→ vdv joined13:01
name → __name__13:01
empity I'm sure it can be done but I never found a simple way..13:02
→ kelvie_` joined13:02
→ itsyou49 joined13:02
→ deavidsedice joined13:03
→ joschi_ joined13:03
bremner empity: use git-gui and blame, and click your way back, I think13:03
cbreak empity: or git show the file13:03
→ rudi_s_ joined13:04
empity yes well that I knew ;)13:04
→ Blackshark joined13:04
empity I would like git show-function "def function"13:04
← shiba_yu36 left13:04
empity asking too much probably13:04
→ kanru_ joined13:04
→ cmn__ joined13:04
→ maguey_ joined13:05
empity but maybe in emacs+magit something is possible13:05
→ eagles_znc joined13:05
→ c00kiemon5ter joined13:05
← c00kiemon5ter left13:05
→ c00kiemon5ter joined13:05
→ GodEater joined13:05
← GodEater left13:05
→ GodEater joined13:05
→ dec_ joined13:05
→ tlipcon_ joined13:05
→ iElectri1 joined13:05
→ Fudgey joined13:06
dotemacs i guess you could do something like git show HEAD~X file | then get the function (where X is the number of revisions you wanna go back)13:06
→ pizza_ joined13:06
→ callumacrae_ joined13:06
_rane empity: git doesn't care about programming languages etc.13:07
→ Will|- joined13:08
→ lekefly_ joined13:08
→ _Eko_ joined13:08
→ mandric joined13:08
→ angelsl joined13:08
→ orospakr` joined13:08
bremner hence my suggestion of using blame to follow lines13:09
→ gerard0` joined13:09
← callumacrae left13:10
← cmn left13:10
← joschi left13:10
← angelsl` left13:10
← rudi_s left13:10
← eagles0513875 left13:10
← _Blackshark left13:10
← Will| left13:10
← deavid left13:10
← Tac_Home left13:10
← k-man left13:10
← SavoSuperCool left13:10
← Fudge left13:10
← gerard0 left13:10
← tlipcon left13:10
← SimonNa left13:10
← metze left13:10
← LekeFly left13:10
← jonanin left13:10
← kelvie_ left13:10
← GodEater_ left13:10
← iElectric left13:10
← orospakr left13:10
← kingfishr left13:10
← Eko left13:10
← dec left13:10
← blueyed left13:10
← bond` left13:10
← Drakevr left13:10
← koki left13:10
← tomaw left13:10
← kanru left13:10
← hamb left13:10
← up_the_irons left13:10
← Putr left13:10
← Kiall left13:10
Will|- → Will|13:10
→ k-man joined13:10
rudi_s_ → rudi_s13:11
→ leo2007 joined13:12
empity I know git doesn't care, but I also guess many programmers do ;)13:13
so I think there is something higher leve13:13
cbreak xcode has something in version 413:14
not used it in detail though13:14
selckin it's not very hard to open blame, scroll to the function, and you have all the last relevant commmis changing those lines on the left and can go back13:14
the effort of makign the other thing is probably quite huge13:14
empity selckin: I think doing it with emacs not so much13:15
if I have already semantic understanding of the language13:15
where a function starts and ends and so on13:15
→ kingfishr joined13:16
→ blueyed joined13:16
→ SimonNa joined13:16
→ Tac_Home joined13:17
→ lastk joined13:17
→ SavoSuperCool joined13:17
→ Yuuhi joined13:17
→ up_the_irons joined13:18
bremner empity: see also the hint about using 'git log -S' in the git-blame man-page13:20
→ tomaw joined13:21
← tyteen4a03 left13:23
← empity left13:23
→ metze joined13:24
← __name__ left13:25
→ dmojoryder joined13:25
← SimonNa left13:26
→ Ownatik joined13:27
necromancer`zzz → necromancer13:27
→ tyteen4a03 joined13:28
→ d0k joined13:28
→ Kiall joined13:29
→ shiba_yu36 joined13:30
→ DoctorDarren joined13:33
→ Modius joined13:33
→ AdRem joined13:35
← AdRem left13:36
→ xiangfu joined13:37
→ xiangfu` joined13:39
← xiangfu left13:42
→ madewokherd joined13:42
← madsy left13:44
→ tewecske joined13:46
→ aminpy joined13:48
← xiangfu` left13:51
← project2501b left13:52
← MUILTFN left13:53
→ gnufied joined13:55
→ Mpenzi joined13:56
← eagles_znc left13:58
→ eagles_znc joined13:58
eagles_znc → eagles051387513:58
necromancer → necromancer`zzz13:58
→ rns joined13:59
← dmojoryder left14:00
← dotemacs left14:01
→ dmojoryder joined14:03
← namemon left14:03
← Octalot left14:07
→ Octalot joined14:10
← NetHawk left14:10
→ saschagehlich joined14:10
← kumbayo left14:11
← saschagehlich left14:12
← aspotashev left14:12
→ InAFishBowl joined14:14
← lamont left14:16
← electrogeek left14:16
→ bitkiller joined14:19
← akent left14:20
→ akent joined14:22
→ Highor joined14:22
→ _psychic_ joined14:23
ChanServ set mode: +v14:23
Highor hello, trying to start git-daemon, but it says failure, if i check the log i get `initialize` address already in use, any suggestions?14:23
→ project2501a joined14:24
← InAFishBowl left14:24
← gnufied left14:24
→ lamont joined14:24
← envi_laptop left14:27
→ nd_ joined14:27
→ InAFishBowl joined14:29
→ RichiH joined14:29
← nd left14:30
→ empity joined14:33
← Mpenzi left14:34
← project2501a left14:34
→ banghouse joined14:39
→ project2501a joined14:40
→ NetHawk joined14:41
← mandric left14:41
→ ISF joined14:41
← joeytwiddle left14:42
← pizza_ left14:42
→ pizza_ joined14:42
← Saur left14:46
→ meisth0th joined14:48
meisth0th hello14:48
how can i modify cgit's link structure?14:48
← project2501a left14:48
→ alberto56 joined14:49
← dmojoryder left14:49
meisth0th i am using mod_rewrite for removing cgit.cgi from url but cgit is using it for url generation14:49
→ marsilainen joined14:49
→ electrogeek joined14:49
← electrogeek left14:49
→ electrogeek joined14:49
→ madsy joined14:50
← madsy left14:50
→ madsy joined14:50
Highor /gitorious/script/git-daemon:47:in `initialize': Address already in use - bind(2) (Errno::EADDRINUSE)14:50
any suggestions ?14:50
cbreak pick a different address14:51
meisth0th any idea for me?14:52
→ dmojoryder joined14:52
→ MUILTFN joined14:53
Highor how cbreak?14:53
cbreak Highor: man git-daemon14:53
jast Highor: *automatic message* the 'git-daemon' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-daemon.html14:53
cbreak look for --port14:53
→ project2501a joined14:54
Highor i am using: ./git-daemon start --port=198414:54
← EricInBNE left14:55
← varioust left14:55
Highor or: sudo env RAILS_ENV=test /etc/init.d/git-daemon start --por=198414:56
but if i change port i still get failure14:56
→ peterhil joined14:56
Highor the*14:56
→ Corren joined14:56
← d3vic3 left14:57
← RvnPhnx left14:59
← electrogeek left15:00
→ jfkw joined15:04
← f0i left15:04
→ bonhoffer joined15:09
ggorgen → gkmngrgn15:13
→ arunce joined15:14
← linusoleander left15:15
→ g0bl1n joined15:16
← iElectri1 left15:17
→ iElectric joined15:17
← alberto56 left15:19
→ f0i joined15:20
Jigal can't i create a repository when i have a free plan?????15:20
thiago_home a free plan of what?15:22
← Corren left15:24
← maguey_ left15:25
→ alberto56 joined15:26
← zhengyang left15:26
bremner wonders if we need a "git is not github" factoid15:26
→ iband joined15:27
→ tore joined15:28
→ iori joined15:32
radarek in the ruby/rails community there is the same problem :D15:33
Jigal thiago, github with just one repository15:34
radarek many people say 'rails' when they mean 'ruby'15:34
→ Murr joined15:34
← alberto56 left15:35
→ gozoner joined15:36
← iori left15:37
← bonhoffer left15:38
→ bonhoffer joined15:39
→ iori joined15:39
thiago_home Jigal: if you can't create more repositories, find other hosting15:40
there are many free hosting websites for Git15:40
← callumacrae_ left15:42
→ dfr|mac joined15:42
Jigal thiago_home, i thougth with a github account i could at least create one free. But appearantly not. So switched to google code15:42
selckin can create many with github15:44
→ noyb joined15:44
→ kakashi_ joined15:44
← kakashi_ left15:44
Jigal selckin, but not for free ;-)15:44
→ ceej joined15:45
selckin yes for free15:45
← normanrichards left15:46
← bonhoffer left15:46
← bitkiller left15:47
Jigal so selckin why can't i do that on github???15:47
selckin dunno, can't read?15:47
→ bitkiller joined15:47
→ linusoleander joined15:48
← rendar left15:49
→ normanrichards joined15:51
Jigal selckin, hmm found a link appearantly i can15:52
← leo2007 left15:52
← jfelchner left15:53
← iori left15:53
← g0bl1n left15:55
← TLMonitor left15:56
← urkud left15:57
Jigal hello i made a typo by adding an origin but when i try it again i get an error that the remote origin already exists. How can i correct this?15:57
bremner Jigal: read man git-remote15:57
jast Jigal: *automatic message* the 'git-remote' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-remote.html15:57
cbreak delete it...15:57
Jigal cbreak, how15:57
necromancer`zzz → necromancer15:57
bremner by reading the man page I pointed you to15:58
cbreak Jigal: man git-remote15:58
jast Jigal: *automatic message* the 'git-remote' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-remote.html15:58
← lastk left15:58
← normanrichards left16:00
← toabctl left16:00
→ SimonP86_ joined16:00
→ rendar joined16:01
→ SimonP86__ joined16:02
→ iori joined16:03
→ urkud joined16:03
necromancer → necromancer`zzz16:03
← SimonP86 left16:03
→ dreiss joined16:04
→ __name__ joined16:04
← __name__ left16:04
→ __name__ joined16:04
← EnTeQuAk left16:04
← SimonP86_ left16:05
← f0i left16:06
→ logik-bomb joined16:07
← logik-bomb left16:07
→ logik-bomb joined16:07
→ beakerman joined16:07
← pen left16:07
→ Corren joined16:08
← Ownatik left16:08
← logik-bomb left16:08
→ Maletor joined16:10
→ electrogeek joined16:10
← electrogeek left16:10
→ electrogeek joined16:10
← dreiss left16:11
Highor so i tryed: ./git-daemon start --port=1984, but still i get failure, `initialize` address already in use :/16:11
FauxFaux netstat -anp | grep 198416:11
→ tPotato4a03 joined16:12
← tyteen4a03 left16:12
← aminpy left16:12
← tore left16:13
Highor then i get: (Not all processes could be identified, non-owned process info16:13
will not be shown, you would have to be root to see it all.)16:13
← shiba_yu36 left16:14
← itsyou49 left16:14
Highor i did sudo now, but it shows nothing16:14
→ tore_ joined16:14
→ felipe joined16:14
← Murr left16:15
← stuffcorpse left16:17
→ John__ joined16:17
→ shiba_yu36 joined16:17
→ kukks joined16:18
← tPotato4a03 left16:18
→ tyteen4a03 joined16:19
bencc jgit support pushing to amazon s3 bucket16:20
is it safe or can the repo become corrupted?16:21
← iori left16:21
→ thirdtruck joined16:21
← _psychic_ left16:22
→ iori joined16:22
→ Liam joined16:22
← tpope_ left16:23
→ tpope joined16:23
→ Ownatik joined16:23
← Liam left16:23
→ xxjthxx joined16:24
→ _iori_ joined16:24
→ f0i joined16:25
→ krz joined16:25
masterkorp bencc: did you tried it ?16:25
→ rarar joined16:26
← rarar left16:26
→ ymasory joined16:27
← John__ left16:27
bencc masterkorp: if I tried it and it works, will it answer my question?16:27
← Corren left16:27
← f0ster_ left16:27
→ f0ster joined16:28
bencc masterkorp: even if it works for 1 year, it still doesn't mean that it can't break16:28
masterkorp bencc: idk, i just stick with github16:28
← iori left16:28
bencc masterkorp: because?16:28
bremner bencc: what are you looking for exactly, reports from people successfuly using jgit to push to s3?16:28
→ aspotashev joined16:28
masterkorp bencc: userbase, speed, reliability (linux kernel)16:28
bremner wonders what the lk has to do with github16:29
masterkorp bremner: jgit is a gui for git ?16:29
← peterhil left16:29
bremner no16:29
cbreak I bet it's related with java16:29
masterkorp bremner: an example16:29
→ hwrdprkns joined16:29
bremner an example of what?16:29
← kpreid left16:30
bencc bremner: no, I'm asking if the mechanism to push to a web file server is unsafe16:30
→ mipata_1 joined16:30
bencc masterkorp: I can also use mazda. a great car but not what I was asking for16:31
jgit is a git implementation in java16:31
→ kpreid joined16:31
bencc one of its feature is to push a repo to amazon s316:31
← urkud left16:31
bremner bencc: given jgit doesn't afaik share code with git, you probably need to know specifically about jgit16:31
→ pen joined16:32
← [intra]lanman left16:32
bencc bremner: I need to know about s3, not about jgit16:32
← revberaldo left16:32
bencc bremner: s3 is a file server. you send files over http and it store it for you16:32
cbreak amazon s3 is expensive16:32
it's ot a file server16:32
bencc cbreak: compared to rice?16:32
bremner bencc: yes, I know what s3 is16:32
→ EnTeQuAk joined16:32
cbreak compared to github16:33
bencc cbreak: if you have 1GB repo, it'll cost you 0.15$ per month16:33
cbreak + traffic16:33
bencc and github is probably using s3 so it can't be cheaper16:33
← xxjthxx left16:33
cbreak github is free16:33
Jigal I get this message, what should i do? $ git remote add origin [email@hidden.address] $fatal: remote origin already exists.16:34
cbreak s3 is not16:34
so github is cheaper16:34
bremner Jigal: did you read man git-remote yet?16:34
jast Jigal: *automatic message* the 'git-remote' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-remote.html16:34
cbreak Jigal: don't add origin a second time16:34
it's already there16:34
bencc cbreak: listening to the wind is also free but it won't help me store my PRIVATE repo16:34
cbreak add some other remote16:34
Jigal: pick a name that's not already taken16:34
Jigal bremner, yes i did but i thought i made a typo so want to be sure what the remote is16:34
masterkorp bencc: oh, java sucks16:34
Jigal now i dont know what the remote name is16:35
bencc masterkorp: yes, this is also very helpful16:35
cbreak Jigal: man git-remote -v16:35
jast Jigal: *automatic message* the 'git-remote' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-remote.html16:35
Jigal excuse me remote origin16:35
masterkorp bencc: sorry, i am in hangover mode16:35
but i dont truste java anyway16:36
← thoolihan left16:36
→ jamb joined16:36
cbreak did they already rename it?16:36
→ jas4711 joined16:36
Jigal cbreak, jast get this error $ git remote rm [email@hidden.address]16:36
error: Could not remove config section 'remote.git@githum.com:sandersjj/jcms.git16:36
'16:36
→ thoolihan joined16:36
cbreak Jigal: read the damn man page16:37
← linusoleander left16:37
← iband left16:37
cbreak the name is not gitblabhablaablababalbalb16:37
→ iband joined16:37
cbreak it's origin16:37
you picked that name!16:37
how can you have forgotten?16:37
short time memory like a cup of water... :(16:37
← angelsl left16:40
← Carraway left16:40
→ leo2007 joined16:40
→ Chillax joined16:40
Chillax i have submodules that exist in my .gitmodules but not in my .git/confg. How can I make them get added to my .git/config?16:41
cbreak Chillance: man git-submodule init16:41
jast Chillance: *automatic message* the 'git-submodule' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html16:41
→ dragoonis joined16:41
cbreak also take a look at update --init16:41
Chillax that's not working16:41
cbreak sure it is16:41
Chillax i started this repo by copying another in, and then removing the .git directory so that it wouldn't have the history16:42
Chillance wrong nick eh? :)16:42
Chillax now that i git init the directory, i cannot make it recognize the modules16:42
i was thinking maybe i will just manually copy the necessary lines from the old .git/config into this one16:43
→ mmw joined16:43
← mmw left16:43
cbreak Chillance: you removed the git repository16:43
now it's not a git repository anymore16:43
← radarek left16:43
cbreak so YOU DO NOT HAVE A GIT REPOSITORY16:43
so, of course, GIT COMMANDS DON'T WORK16:43
make a new repository16:43
Chillax ...16:43
read all the words and use the right nick16:44
i git init the directory that i copied the files in after i removed the .git directory16:44
so it is a git repository16:44
cbreak good16:44
then git submodule init path/to/module16:45
Chillax pathspec did not match any files.. it wants me to git submodule add all of them16:46
← tore_ left16:46
→ _psychic_ joined16:46
Chillax but they already exist in my .gitmodules file so i just want to a way to make the .git/config recognize them without having to re-add all of them16:47
cbreak that's for new submodules16:47
→ gnufied joined16:47
cbreak git submodule init is supposed to do exactly that16:47
← _iori_ left16:48
Chillax but its not, maybe i will try copying the original repo again and trying to submodule init before i remove the .git directory and git initing it again to see if that works16:50
← mipata_1 left16:52
cbreak Chillance: how about not deleting .git? :)16:52
...16:53
I have to kick this auto complete into the bucket16:53
Chillax, I chose you!16:53
you can just git checkout --orphan to get a new branch without history16:53
Chillax i was trying to clone with --depth=1 but that leaves one record of history16:54
does --orphan remove all of them?16:54
oele2 → oelewapperke16:54
cbreak it doesn't remove any16:55
it creates a new branch without history16:55
it is done after cloning the repository16:55
← shiba_yu36 left16:55
Chillax hrm might have to update my git, that isn't showing up in my help file16:55
cbreak see channel motd for newest version info16:56
← ronny left16:56
← Spockz left16:58
→ whyking_ joined16:58
→ mipata_1 joined16:58
Chillax yeah i'm at .1.7.0.216:58
→ hendeby joined16:58
→ apocalyptiq joined16:58
← mipata_1 left16:58
hwrdprkns I'm having a little bit of trouble -- I16:58
am trying to use git as a deployment tool16:59
FauxFaux ¡jwz16:59
hwrdprkns and I've written a post-update script and i get an error that it can't find the work tree after doing a git pull16:59
→ friskd joined16:59
← hendeby left16:59
hwrdprkns Could someone check out my gist and see what I'm doing wrong? https://gist.github.com/608977d52db4e351f25416:59
→ psoo joined17:00
← whyking left17:00
→ mipata_1 joined17:00
hwrdprkns Wondering if I have to do a git fetch and merge with the work tree set17:00
bremner generally, merge in hook = fail17:00
→ Savoxis joined17:01
friskd I renamed a folder from app/webroot/img/static/Users to app/webroot/img/static/users/ when i do git status, i see the typical un tracked files: ... app/webroot/img/static/users/17:01
← Savoxis left17:01
→ Savoxis joined17:01
friskd i do git add app/webroot/img/static/users/17:01
but it is still not added...17:02
i do have files inside of app/webroot/img/static/users/17:02
→ nimred_ joined17:02
→ urkud joined17:02
→ archis joined17:02
friskd what am i missing?17:02
← psoo left17:02
cbreak git's not a deployment tool17:03
but if you want to abuse it, make a hook that uses git archive17:03
or maybe if you don't care about clean solutions, make a non-bare with a git reset --hard in a hook17:03
hwrdprkns cbreak: git archive?17:04
khaije|minder friskd: if you have difficulty adding a path to the index, try using git add -i , I've found that it cuts down on the frustration in those situations nicely17:05
cbreak correct17:05
← archis left17:05
← aspotashev left17:06
hwrdprkns cbreak: so just run that and then untar the files?17:06
cbreak you can do that in a pipe17:06
← jamb left17:06
← ramusara left17:07
cbreak make a new folder, archive | tar -x - or something17:07
friskd sweet! tnx khaije|minder17:07
cbreak then move the old folder away17:07
and move the new folder there17:07
friskd that worked. Never even seen that before. Its weird that a basic git add .17:07
didn't pickup on this.17:07
I simply did the git add -i app/webroot/img/static/users/17:07
and then it showed me a bunch of files it wasn't showing me before...17:08
very interesting. Thanks again.17:08
khaije|minder friskd: be mindful, git add . will add from that path down. If you want to add everything in the project's reach, it's best to use git add --all17:08
cbreak friskd: . expands to the current folder17:09
or rather, the current path17:09
khaije|minder they are often functionally the same but it's good to know they actually do different stuffs17:09
yup, $PWD17:09
friskd Confused... I am at the top level folder of my app. So everything in it and its sub folders should be found by git add .17:10
→ CannedCorn joined17:10
friskd ex: i am @ /app17:10
so everything in in /app/webroot/img17:10
should have been included in git add .17:10
right?17:10
→ ner0x joined17:11
ner0x How can I put my GIT_COMMITER_EMAIL etc in my local git config?17:11
← kpreid left17:12
← electrogeek left17:12
← Kiall left17:12
← metze left17:12
← up_the_irons left17:12
← gerard0` left17:12
← lekefly_ left17:12
← iElectric left17:12
← uau left17:12
← p3rror left17:12
← pantsman left17:12
← _iron left17:12
← Lgb left17:12
← tpope left17:12
← f00li5h left17:12
← ketas left17:12
← joel_falcou left17:12
← Marquel left17:12
← mattly left17:12
← Sonderblade left17:12
← troyt left17:12
← cballou left17:12
← resixian left17:12
← dwmw2____ left17:12
← mattp_ left17:12
← farktronix left17:12
← Nikoli left17:12
← compnerd left17:12
← milli left17:12
← NooRotic left17:12
← ndim left17:12
← jds left17:12
← jrockway left17:12
← bpgoldsb left17:12
← lahwran left17:12
← tg left17:12
← xinetd left17:12
← nimred left17:12
← MacGyverNL left17:12
← ajpiano left17:12
← chrisf left17:12
← mavin|gone left17:12
← Ratler left17:12
← mike_perdide left17:12
← svg left17:12
← NfNitLoop left17:12
← iivvoo left17:12
← rphillips left17:12
← Rockj left17:12
← nb left17:12
← avtobiff left17:12
← zykes- left17:12
← IcePic left17:12
← plopix left17:12
← ewoud left17:12
← flamingspinach left17:12
← eregon left17:12
← madduck left17:12
← roflin left17:12
← Fiouz left17:12
← joelpet left17:12
FauxFaux ner0x: The way git is nagging you to do any time you run any command?17:12
← Savoxis left17:13
ner0x Well I have GIT_COMMITER_EMAIL in my .gitrc I'd like to put it in my .git config so I can transfer it and keep the commiter the same.17:13
cbreak ner0x: man git-config17:13
jast ner0x: *automatic message* the 'git-config' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-config.html17:13
→ LekeFly joined17:15
→ psoo joined17:16
→ tPotato4a03 joined17:16
← tyteen4a03 left17:17
karstensrage if i want to track one single file from one repo in another repo, is gitslave the right thing to do?17:17
→ roflin joined17:17
→ mike_perdide joined17:18
ner0x cbreak: That worked out great, thank you. Last question with I do a [user] email = "email@email.com" <--- Do I use the " or without?17:18
cbreak you best use git config to set the variables17:19
→ xxjthxx joined17:20
cbreak it's a program17:20
ner0x Yeah, I've never really done any specific git configuration. It worked out fine though.17:20
← xxjthxx left17:22
→ tjholowaychuk joined17:22
← fcuk112 left17:24
→ wilhelmtell joined17:25
← psoo left17:26
→ toabctl joined17:28
→ jds joined17:28
→ IcePic joined17:29
← wilhelmtell left17:29
→ fcuk112 joined17:30
→ plopix joined17:31
← saurik_ left17:31
→ saurik joined17:31
← ISF left17:32
→ lahwran joined17:35
→ psoo joined17:36
→ cakehero joined17:36
→ nardev__ joined17:36
← theoretical left17:38
← psoo left17:39
← nardev_ left17:39
→ Myth17 joined17:40
← Myth17 left17:40
→ Myth17 joined17:40
→ jrockway joined17:41
→ namemon joined17:43
→ gerard0 joined17:43
→ dwmw2____ joined17:43
→ iivvoo joined17:43
→ nb joined17:43
→ kpreid joined17:43
→ tpope joined17:43
→ electrogeek joined17:43
→ iElectric joined17:43
→ Kiall joined17:43
→ metze joined17:43
→ uau joined17:43
→ p3rror joined17:43
→ Rockj joined17:43
→ pantsman joined17:43
→ _iron joined17:43
→ Lgb joined17:43
→ f00li5h joined17:43
→ ketas joined17:43
→ joel_falcou joined17:43
→ Marquel joined17:43
→ mattly joined17:43
→ Sonderblade joined17:43
→ troyt joined17:43
→ cballou joined17:43
→ resixian joined17:43
→ mattp_ joined17:43
→ farktronix joined17:43
→ Nikoli joined17:43
→ compnerd joined17:43
→ milli joined17:43
→ NooRotic joined17:43
→ ndim joined17:43
→ bpgoldsb joined17:43
→ ajpiano joined17:43
→ tg joined17:43
→ xinetd joined17:43
→ MacGyverNL joined17:43
→ chrisf joined17:43
→ mavin|gone joined17:43
→ Ratler joined17:43
→ svg joined17:43
→ NfNitLoop joined17:43
→ rphillips joined17:43
→ avtobiff joined17:43
→ zykes- joined17:43
→ flamingspinach joined17:43
→ eregon joined17:43
adams.freenode.net set mode: +vv17:43
→ madduck joined17:43
→ joelpet joined17:43
nb → Guest2161317:44
← iivvoo left17:46
← _psychic_ left17:50
→ _psychic_ joined17:50
→ radarek joined17:51
← tPotato4a03 left17:52
→ varioust joined17:53
← krz left17:55
→ mipata joined17:55
← Guest21613 left17:58
→ Guest21613 joined17:58
Guest21613 → nb17:58
→ [intra]lanman joined18:04
→ Textmode joined18:05
→ tore_ joined18:07
→ ISF joined18:09
← gebi left18:10
→ killtheliterate joined18:10
→ dnuke joined18:10
← killtheliterate left18:10
→ killtheliterate joined18:11
← killtheliterate left18:11
→ killtheliterate joined18:12
← p3rror left18:13
→ jjn joined18:14
← marsilainen left18:14
→ p3rror joined18:15
jjn Anyone in here tried installing the git binary package on any of the Mac OS Lion Preview Releases?18:16
← deqer left18:16
← bindaas left18:16
← toabctl left18:17
← _psychic_ left18:18
→ maestrojed joined18:18
→ deqer joined18:18
maestrojed Not truly a git question but I am following a tutorial to add git to my cli prompt, It tells me to put my .git_completion file in my user directory. Where do I get my .git_completion file?18:19
thiago_home I think you're supposed to write it18:20
FauxFaux maestrojed: What do you want? Completion? Or the branch name and the like in your prompt?18:21
← pen left18:21
maestrojed FauxFaux yeah I am following a tutorial that will make my prompt include branch info http://digitalformula.net/articles/pimp-my-prompt-like-paul-irish18:22
FauxFaux Ignore it's advice and see what happens.18:22
maestrojed I get missing file errors18:23
cbreak tutorial?18:24
can't you just source the script from contrib?18:24
FauxFaux We need a channel where I can metaphorically punch people in the face for making completly and utterly useless statements on irc.18:24
← jjn left18:25
maestrojed It says to get that file from the git source code and links me to a deb file but honestly, I don't know what to do with that18:25
cbreak just get the git sources18:26
robgleeson FauxFaux: #thefuture18:26
maestrojed I checked the stable download and that file was not part of the download18:26
cbreak contrib.18:27
← IcePic left18:27
→ IcePic joined18:27
← killtheliterate left18:28
maestrojed cbreak if you are talking to me, I don't follow18:28
cbreak it's in contrib18:29
get the sources and find it there18:29
→ Corren joined18:29
← apocalyptiq left18:30
→ saschagehlich joined18:30
→ HG` joined18:31
← Corren left18:32
→ bindaas joined18:33
← thirdtruck left18:34
maestrojed cbreak I downloaded from here http://www.kernel.org/pub/software/scm/git/ Is that considered the "source" because it does not include a git-completion file. There is a folder called contrib but no git-completion file18:34
cbreak I mean the git.git repository18:34
→ thirdtruck joined18:35
cbreak it's in contribgit/contrib/compl18:35
Jigal hello i am getting this error: what should i do with it $ git push -u origin master18:35
Enter passphrase for key '/c/Documents and Settings/Jigal/.ssh/id_rsa':18:35
Counting objects: 3, done.18:35
error: failed to push some refs to 'git@github.com:sandersjj/jcms.git'18:35
cbreak that's not an error18:35
→ versatiletech joined18:36
Jigal rather18:36
?18:36
cbreak it's a statement of fact18:39
an error would tell you more about the why18:39
→ caseymcg joined18:39
cbreak it's like writing "He's dead Jim" into an autopsy18:39
albel727 (that is to say, you should have pasted the whole error message. and used pastebin)18:39
maestrojed the instructions call for a file .git-completion. I found the file git-completion.bash. Do you think that is the same file?18:40
← versatiletech left18:40
→ versatiletech joined18:40
← p3rror left18:40
Jigal cbreak, ok but how can i find out why it failed18:40
?18:40
cbreak don't know18:40
add more verbosity18:40
or maybe read up on GIT_TRACE in man git18:41
jast *automatic message* the 'git' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git.html18:41
← tore_ left18:41
← iband left18:41
← leo2007 left18:42
← cmn__ left18:42
→ cmn joined18:42
maestrojed cbreak FauxFaux thx for you help, We got it working18:43
← thirdtruck left18:43
← versatiletech left18:45
← gnufied left18:45
→ g0bl1n joined18:46
← airborn left18:46
→ durarara joined18:46
→ p3rror joined18:46
← durarara left18:46
→ durarara joined18:46
→ gnufied joined18:47
→ versatiletech joined18:50
FauxFaux waits 20 minutes for this --index-filter to complete before realising it was missing the --all. /o\18:50
cbreak well, lucky you18:51
I waited 25 hours for my cv::Boost training to finish18:52
just to notice that I forgot an offset and trained the wrong features18:52
FauxFaux Oops.18:52
→ whyking joined18:52
← whyking left18:52
joel_falcou 25h ??? is th ebase this large or the cv code this bad ?18:52
→ bonhoffer joined18:52
← whyking_ left18:53
→ whyking joined18:53
→ din joined18:53
cbreak I had six sets with between 200k and 450k feature vectors18:54
each vector consisting out of 63 features I think18:54
joel_falcou ok18:55
but god 225h18:55
25*18:55
selckin heh we have indexing jobs that take more then a week18:55
→ ap3mantus joined18:57
← caseymcg left19:00
→ airborn joined19:01
← mipata_1 left19:02
← mipata left19:02
→ mipata_1 joined19:02
→ ereslibre joined19:03
← ereslibre left19:03
→ ereslibre joined19:03
→ jfelchner joined19:05
→ Fiouz joined19:05
→ kerrick joined19:05
→ aspotashev joined19:05
← jophish_ left19:08
→ versatiletech_ joined19:08
← kst left19:09
→ kst joined19:09
→ dafis joined19:09
← versatiletech left19:10
versatiletech_ → versatiletech19:11
← varioust left19:12
→ varioust joined19:12
→ up_the_irons joined19:13
← ph^ left19:15
← versatiletech left19:15
→ tore_ joined19:16
← g0bl1n left19:17
→ iivvoo joined19:17
← din left19:17
← tore_ left19:20
← varioust left19:20
→ tshauck joined19:21
← _iron left19:21
→ d3vic3 joined19:24
→ khaije|minder joined19:28
→ Yuffster joined19:29
khaije|minder if I push a rewind to a remote, how does that affect the orphaned commits? do they sort of hang-around? are they available to people who subsequently clone from my remote? (if it clarifys things, github is the remote I'm thinking about)19:31
← iivvoo left19:32
← legumbre_ left19:32
FauxFaux khaije|minder: They're subject to garbage collection on the remote, when this happens is unspecified.19:32
cbreak khaije|minder: only available via refs19:32
like tags or other branches19:32
→ Drakevr joined19:33
→ xerora joined19:37
→ iivvoo joined19:38
← gnufied left19:41
→ KindTwo joined19:41
← KindOne left19:42
→ versatiletech joined19:42
→ ndavid joined19:42
← dafis left19:44
← ymasory left19:44
→ toabctl joined19:44
← ndavid left19:46
← MUILTFN left19:49
→ lekefly_ joined19:49
→ ewoud joined19:50
→ legumbre joined19:50
← LekeFly left19:50
← jfelchner left19:52
← OOPMan left19:53
→ LekeFly joined19:54
→ tore_ joined19:54
→ drev1 joined19:55
← arunce left19:55
← RaceCondition left19:55
→ cenuij joined19:55
← cenuij left19:55
→ cenuij joined19:55
← whyking left19:56
→ lunks joined19:56
→ din joined19:57
→ whyking joined19:57
← lekefly_ left19:57
bencc what is the difference between a lightweight tag and a tag object?19:58
→ krz joined19:58
bencc do I have to specify the commit when creating a tag or can git use the last commit?19:58
← krz left19:59
→ versatiletech_ joined19:59
bremner did you try it?19:59
→ Murr joined20:00
← versatiletech left20:00
bencc bremner: thank you again. very helpful like before20:00
versatiletech_ → versatiletech20:01
bencc bremner: you don't have to answer you know...20:01
bremner I'm trying to understand what the question really is. The one you asked seems pretty easy to test: "git tag foo && git show foo"20:02
bencc that's an answer :)20:03
← noyb left20:03
thiago_home don't ask a question you can easily test20:06
and the difference between a lightweight tag and a tag object is the tag object20:06
← Raging_Hog left20:07
→ jophish_ joined20:08
← jophish_ left20:08
→ mastroDani joined20:08
bencc thiago_home: the difference between a plain and a ball is the ball20:09
thiago_home: or the plane20:09
→ jophish_ joined20:09
← mastroDani left20:09
→ OOPMan joined20:09
thiago_home no20:09
bremner well, you can see that statement expanded in man git-tag20:10
jast well: *automatic message* the 'git-tag' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-tag.html20:10
thiago_home the difference between nothing and a ball is the ball20:10
so the difference between nothing and an object is the object20:10
→ Agos joined20:11
→ varioust joined20:11
→ sechrist joined20:11
→ Saur joined20:15
← Saur left20:16
← bonhoffer left20:16
← ap3mantus left20:18
→ canton7 joined20:18
← KindTwo left20:20
← tjholowaychuk left20:20
→ tj joined20:20
→ ph^ joined20:20
tj → Guest4628520:21
→ whyking_ joined20:21
← whyking left20:22
← DoctorDarren left20:23
← ereslibre left20:23
→ alexgordon joined20:24
→ ereslibre joined20:24
← n8o left20:24
→ n8o joined20:25
← ereslibre left20:25
→ ereslibre joined20:26
← ereslibre left20:26
→ ereslibre joined20:27
← ereslibre left20:28
← tore_ left20:28
→ tore_ joined20:30
→ seivan joined20:31
← d3vic3 left20:34
← HG` left20:34
← yeryry left20:36
→ yeryry4 joined20:36
← urkud left20:36
→ urkud joined20:37
← tore_ left20:37
→ EricInBNE joined20:37
→ Juo joined20:37
→ Master-Passeli joined20:37
→ gusnan joined20:38
← dim_ left20:38
→ dim_ joined20:39
ChanServ set mode: +v20:39
Master-Passeli hi everyone20:39
→ normanrichards joined20:40
Master-Passeli can someone give tips to my situation20:40
i made changes to sources but forgot to branch before changes20:41
how can i create new branch from master and transfer my changes to that branch without copying files and copying back after branch make20:42
← RichiH left20:44
→ Corren joined20:45
← flazz_ left20:45
_rane uh20:45
ndim Master-Passeli: Have you committed any of those changes to master?20:45
_rane git checkout -b newbranch20:45
Master-Passeli i have not done commit yet20:46
if i make new branch now i loose my changes, right?20:47
← Murr left20:47
ndim Master-Passeli: Then _rane's solution will work for you. "git checkout -b newbranch" is equivalent to "git branch newbranch HEAD && git checkout newbranch", and as the current HEAD and newbranch have identical content, your uncommitted changes can directly be committed onto newbranch.20:47
→ Murr joined20:48
_rane more importantly they can me transferred to the new branch20:48
ndim And the creation of the newbranch does not actually change your directory tree - so no issue to be had there.20:48
_rane automatically, without conflicts20:48
← lunks left20:48
← Myth17 left20:49
← Juo left20:50
← normanrichards left20:52
← InAFishBowl left20:52
→ InAFishBowl joined20:52
← Murr left20:52
Master-Passeli It worked really nice. Thank you ndim and _rane20:52
← versatiletech left20:53
← dnuke left20:53
→ mikepack joined20:55
← Highor left20:55
← kipras left20:56
→ phaedrix joined20:58
→ lunks joined20:58
← frederick left20:59
necromancer`zzz → necromancer20:59
← radarek left21:02
→ poijn joined21:04
← Chillax left21:05
poijn hey.. I'm some what of a noob to git, But I have a project on git hub I would like to update.21:07
My question is: Some of the old files no longer exist. How can I commit the new version so that those files will be removed?21:07
_rane git add -u && git commit -m 'remove crap'21:08
poijn _rane thanks :)21:08
← aspotashev left21:13
← wolog_ left21:13
← namemon left21:13
→ wolog joined21:14
← Master-Passeli left21:16
← whyking_ left21:18
← jophish_ left21:19
← toabctl left21:19
← blast_hardcheese left21:21
← InAFishBowl left21:23
← sechrist left21:23
→ radarek joined21:24
→ Spockz joined21:24
→ Rotham joined21:25
→ Savoxis joined21:27
→ oriba joined21:31
necromancer → necromancer`zzz21:33
← Rotham left21:35
poijn used the following command to push:21:38
git push origin21:38
got the following message: http://pastebin.com/mKD0YX8421:38
What did I do wrong?21:38
FauxFaux Failed to read the output of the command or any of the bajillion google results for that problem; the most common problem ever.21:39
FauxFaux goes to write a patch to make it output flashing text.21:39
← ISF left21:39
← oriba left21:40
→ daviddoria joined21:42
daviddoria when I rebase to squash some commits, why would I get "error: could not apply [hash]"?21:42
FauxFaux You really shouldn't.21:43
daviddoria so it says "hint: after resolving the conflicts, mark the corrected paths"21:44
how do i see where the conflicts were?21:44
FauxFaux git status21:44
→ krz joined21:44
← pantsman left21:45
daviddoria it shows some modified files, but i dont see anything about conflicts?21:46
FauxFaux What does "git rebase --continue" do?21:46
offby1 daviddoria: look carefully; it will say something like "needs merging"21:46
← fcuk112 left21:47
daviddoria hmm, nope: http://pastebin.com/5VKshpi521:48
ah FauxFaux, that shows where the conflict is ("needs merging")21:48
offby1 ... or "unmerged paths"21:48
← dragoonis left21:48
offby1 hmm, curious.21:49
← gusnan left21:49
offby1 well, that sucks. I have no idea; this smells like a bug.21:49
it should really tell you _why_ it couldn't apply that commit.21:49
karstensrage is gitslave/gitsubmodule appropriate for one file ?21:49
FauxFaux Curious indeed. Looks like linecks, too.21:49
offby1 Leenucks21:49
daviddoria so that file has been deleted21:49
← Modius left21:49
daviddoria in the latest commit21:49
cbreak karstensrage: folder granularity for submodules at least21:50
daviddoria so should i 'git rm' it and then try rebase -i --continue ?21:50
← poijn left21:50
karstensrage hmm21:50
folder granularity only?21:50
daviddoria yea that seemed to work21:52
it made me do two separate squash commits though21:52
→ RobertLaptop joined21:52
→ johtso joined21:52
johtso Is there an easy way to copy a file from one branch to another?21:52
can I checkout both branches at the same time?21:53
bremner johtso: git checkout branch:file21:53
err, branch file21:53
no :21:53
johtso bremner: what will that do?21:53
← maestrojed left21:54
jast checkout the file from the other branch to your current working tree21:54
johtso but doesn't make that branch the active branch?21:55
canton7 not in this case21:55
johtso handy, thanks21:55
→ cesario joined21:55
→ zwick joined21:56
offby1 johtso: the "checkout" command does two (or three :-( ) almost-entirely-unrelated things.21:56
johtso offby1: how confusing :)21:57
→ idoru joined22:00
→ fcuk112 joined22:00
canton7 hmm what else would you call it though? i guess since git does do much, you either have lots and lots of commands, or make some commands do multiple things. not sure which is more confusing22:00
← tchan left22:01
← uau left22:01
jast or regroup the things it does into different commands22:01
← workmad3 left22:01
cbreak legacy22:03
canton7 sorry i meant, what would you call the tool that picks a file from a specific commit. i guess, thinking about it, not many commands have mutiple distinct uses22:03
cbreak in git, many do22:03
checkout: branch switching and getting-file-out-of-history-or-cache22:04
reset: branch modification or changing-content-of-cache22:04
rebase -i: more than you can count22:04
diff: showing differences between all kinds of things, with all kinds of modes22:04
show: similar22:05
← Dave^| left22:05
canton7 point on reset. rebase -i is a separate tool anyway :P22:05
→ Dave^| joined22:05
cbreak rev-parse: who knows what that thingdoes...22:05
→ drekaus joined22:06
canton7 but that's only a small handful of new commands to learn the names of if the functionality was split22:07
canton7 has successfully argued himself round to the opposite viewpoint22:07
cbreak question is: how would you call them?22:08
how would you call the branch-creating checkout?22:08
canton7 which was my original question :P22:08
← drekaus left22:08
cbreak or the branch-altering-and-workspace-killing reset --hard?22:08
or the changes-unstaging reset --mixed HEAD22:09
and you have to learn those functions anyway22:09
just a different thing how to access them22:09
← radarek left22:10
→ normanrichards joined22:10
canton7 and the current system does all make (mostly) sense when considering what git's actually doing22:11
→ ISF joined22:11
canton7 not that Junio will ever break compatibility anyway22:11
→ uau joined22:11
← alexgordon left22:11
cbreak he's working for microsoft?22:12
→ zi joined22:13
← bindaas left22:13
← cesario left22:13
zi How can I list the file structure of current branch?22:13
→ diegoviola joined22:13
cbreak ls-files?22:14
or probably git ls-tree -r22:14
depending what you want to look at exactly22:14
← cthuluh left22:14
zi Derp, I wrote git ls and zsh didn't suggest ls-files, but log. >_<22:14
← ThomasLocke left22:15
→ cthuluh joined22:15
canton7 am i right in thinking that git-completion only auto-suggests porcelain commands?22:16
FauxFaux Not in bash or zsh as shipped by debian, the only case that matters. ;)22:17
← friskd left22:18
canton7 git on arch and msysgit only seem to suggest porcelain22:18
zi On arch as well.22:18
← TrineLocke left22:18
← varioust left22:19
zi s/O/I'm o/22:19
Not porcelain: http://sprunge.us/KWCP22:19
→ leavittx joined22:19
→ joeytwiddle joined22:20
← oc80z left22:21
→ delinquentme joined22:22
delinquentme is it a bad idea to have git running on multiple directories ? .. specifically ones which aren't contained within the same parent directory?22:23
→ oc80z joined22:23
← project2501a left22:23
← lut4rp left22:23
canton7 hmm git-completion (on argh) does know about plumbing commands. not sure why it's not suggesting them22:24
canton7 digs deeper22:24
canton7 s/argh/arch/ <-- probably my worst yet22:24
meisth0th → meisth0th_zzz22:24
→ lut4rp joined22:25
→ maestrojed joined22:25
→ DoctorDarren joined22:26
→ SavoFedora joined22:27
← SavoFedora left22:27
← logankoester left22:30
charon canton7: there's a big case switch somewhere that excludes most plumbing and deprecated commands from the list git gives22:30
← maestrojed left22:30
→ jophish_ joined22:30
→ tchan joined22:31
jdav_gone → jdav22:31
← EricInBNE left22:32
→ EricInBNE joined22:33
meisth0th_zzz → meisth0th22:34
canton7 charon hmm just seems odd that it fetches a list of all commands from git, then passes that to the case which classifies all of them, of which only the porcelain ones are picked. not sure why it's not just using its list of porcelain ones in the first place...22:35
→ gfto joined22:36
→ marsilainen joined22:36
← Anxi80 left22:36
→ Dis0 joined22:38
→ maestrojed joined22:38
→ caseymcg joined22:38
← Dis0 left22:38
← oc80z left22:39
→ jutaro joined22:39
meisth0th how can i get syntax highlighting in cgit?22:39
← madewokherd left22:39
→ oc80z joined22:40
→ arand joined22:40
johtso How come after I do a "git checkout otherbranch filename" and then do "git diff" I don't get any differences?22:41
→ logankoester joined22:41
FauxFaux johtso: It's staged; git diff --cached.22:41
johtso but I do get diffs if I go through the tortoisegit gui22:41
FauxFaux: oh, it's automatically staged?22:41
FauxFaux git status22:41
← mikepack left22:43
← boazsender left22:43
→ boazsender joined22:44
← gerard0 left22:44
← jutaro left22:44
arand I'm looking for a way to do this "git rebase --onto master branchy~500 branchy" and in addition, only pick commits that relates to an independent directory "debian/", is that doable somehow?22:44
← leavittx left22:45
← ExtraSpice left22:47
canton7 the best advice i've seen is to do the rebase --onto, then write a script that generates a list of commits you want to keep, and stick this (appropriately formatted) into the editor from a subsequent rebase -i22:47
though i'm now wondering whether you could do the rebase --onto, then a filter-branch --tree-filter22:47
← gfto left22:48
← saschagehlich left22:49
arand I was looking at that, I guess it could be done with the remove empty commits flags, and an additional run after that removing all leftover merge points...22:49
← thiago_home left22:49
canton7 ooh, branch~500..branch contains merges? that's going to be fun22:50
arand Yup.22:51
canton7 you'll want --preserve-merges on the rebase, but read the BUGS section on the man page22:51
doesn't always work in my experience22:51
← ner0x left22:53
← xerora left22:53
arand I wonder if I can do a new branch from branchy, filter-branch that until it only has what I want, and then rebase it over..22:54
canton7 will be quicker, if nothing else22:55
← Guest46285 left22:55
→ florianb joined22:56
← florianb left22:57
→ florianb joined22:57
arand 20/2963 ... I guess it's telling me to do something else for a while ...22:57
canton7 nah, you want to test it on a subset22:57
you will not get this right first time. or if you do, i'll be thoroughly impressed22:58
← ceej left22:58
← gkmngrgn left22:58
← tewecske left22:59
florianb hi there - i'd like to ask a question: i have a strange merge error while update: https://gist.github.com/102208622:59
canton7 you have a branch, which contains an untracked file. you're trying to merge in a branch which contains that file, and tracks it. amiright?23:00
florianb what i do not understand is, that if git will overwrite those two files (as it want it to do) why do i have to delete those two files?23:00
canton7 git doesn't like deleting stuff you can't recover. you're asking it to delete an untracked file, which there's no way to restore23:01
→ nazgul102 joined23:01
florianb ahh..23:01
← nazgul101 left23:01
florianb the funny thing is i'm trying to pull my origin/master into the local branch..23:01
is there a short way to get the local master-branch updated without deleting those single files?23:03
→ Murr joined23:03
canton7 as far as i know, it's either "reset master to origin/master, throwing away all local commits", or go through the merge23:04
← Octalot left23:04
florianb okay - i'll try that - thank you @canton7!23:04
canton7 you can remove *all* local untracked files, of course23:05
florianb yeah, but i ran into this the third time now, and i'd prefer a single command-line-shot..23:05
arand would not stash be appropriate, or am I misunderstanding the issue?23:06
florianb huhm.. i could try that..23:06
→ gerard0 joined23:06
canton7 i thought stash didn't work on untracked files?23:07
florianb stash did not work either.. :)23:07
canton7 i'm just curious as to how you ended up in a situation where you've got untracked files locally, which origin/master suddenly decides to track23:08
→ marc_kdab joined23:08
canton7 and have this happen frequently23:08
← daviddoria left23:09
florianb the problem is, that i tried to deliver a new "tracking" of directories over all distributed developers.23:09
i guess that i chose the wrong way to realise that..23:09
canton7 and they all had those files, but weren't tracking them?23:09
← ping-pong left23:10
← ew0 left23:10
canton7 fair enough. erm...23:10
← bencc left23:11
→ ping-pong joined23:11
canton7 if there aren't any other untracked files, you can nuke those with git clean, of course23:11
florianb well in fact we're versioning a netbeans-project, and after a while we got peeved by the changes on some directories and files which are frequently changed by nb..23:12
tried that, but it does not work.. :O23:12
jdav → jdav_gone23:12
canton7 you'll need to pass it -f23:12
florianb i did so..23:12
canton7 as you're permanently deleting stuff23:12
hmm23:12
those files definitely show up as untracked in git status?23:13
← Corren left23:13
florianb git status says i'm 1 commit behind, working dir clean, everything is ready to ff..23:13
→ ew0 joined23:13
canton7 then those untracked files look like they've gone and you should be able to merge..... ooh unless they're ignored? not sure whether git cleans listens to .gitignores23:14
florianb oh yes, they're on my ignore-list..23:15
canton7 there's -x and -X then23:15
(for git clean)23:15
florianb hmm..23:16
→ versatiletech joined23:16
← Dave^| left23:16
florianb it deleted DS_Stores, the other files kept untouched.23:17
maybe i did wrong with mit gitignore-file..23:17
i used a lot negation-definitions..23:18
canton7 hmm it's looking like the easiest solution is just to manually delete those two files :P23:18
florianb looks like - yeah.. i am sorry..23:18
→ Corren joined23:19
florianb anyway - thank you for your help! :)23:19
canton7 yeah, no worries23:19
← maestrojed left23:19
← Corren left23:20
→ whyking joined23:25
← versatiletech left23:26
→ SrishAkaTux1 joined23:27
← SrishAkaTux1 left23:27
← airborn left23:29
meisth0th i added a shell script as source-fiter on my cgitrc but it doesn't seem to work :S23:29
← vdv left23:30
← Morphous left23:32
← zwick left23:32
← d0k left23:33
← Sajaki left23:33
→ rendar_ joined23:34
← yeryry4 left23:35
→ yeryry joined23:35
→ maestrojed joined23:35
← verto_ left23:36
← rendar left23:36
← tshauck left23:39
← CannedCorn left23:39
→ florianb_ joined23:44
→ madewokherd joined23:45
← warthog9 left23:46
← kerrick left23:47
← florianb left23:47
→ Morphous joined23:49
← avdg left23:49
← marsilainen left23:50
RealKillaz question about a workflow I would like to introduce with Git. I have no clue how to do this, since I'm new to Git: The idea is the following we have for example a minimum of 3 branches: 1. master, where the stable code goes 2. client_a and 3. client_b23:52
→ rchavik joined23:52
RealKillaz all other branches are development branches for a certain fix or feature23:52
After branch feature_A has been finished it should be tested by client_a who ask for the feature. So we are merging it to client_a branch. After it has been accepted it should go to master but also to branch of client_b.23:53
→ bindaas joined23:54
RealKillaz Is there a way of making a merge to the master merge the same changes to branch client_b at the same time?23:54
← Chillance left23:55
jdav_gone → jdav23:55
canton7 nah, you merge twice. you've got to have the branch you're merging into checked out when you do the merge23:55
RealKillaz in other words any merge to the master branch needs to merge to client_a and client_b branch as well23:55
canton7, oh ok so I need to create maybe a script to do this.23:56
canton7 sounds sensible. https://github.com/nvie/gitflow is a helper script for a commonly-used workflow if you want inspiration23:57
RealKillaz canton7, can I use hooks for this?23:57
← Sonderblade left23:58
canton7 i guess you might be able to locally. don't know enough about hooks to say whether they can do things like a checkout. i rather suspect not23:58
→ maguey_ joined23:59

Logs Search ←Prev date Next date→ Channels Documentation