IRCloggy #git 2011-07-16

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-07-16

→ glennpratt joined00:00
→ ramusara joined00:01
← RaceCondition left00:01
→ PabloM joined00:03
→ phretor joined00:04
← glennpratt left00:04
← devth left00:05
← markbao left00:06
→ glennpratt joined00:06
← rolfb left00:07
rtyler is there any case where `git cherry-pick -n` won't create a .git/MERGE_MSG00:08
← phretor left00:11
→ babilen joined00:11
← juvenal left00:12
← vmil86 left00:13
→ juvenal joined00:13
← chrischambers left00:14
→ diegoviola joined00:14
← DarkHouse left00:19
→ mikeyutley joined00:19
→ James1479 joined00:22
← jalama left00:22
← James147 left00:23
→ macUzer joined00:24
← metze left00:24
→ d0k joined00:25
← tjholowaychuk left00:29
← w0bni left00:29
← Corren left00:30
→ metze joined00:30
→ ianawilson joined00:31
← arunce left00:32
→ arunce joined00:34
→ caseymcg1 joined00:35
→ gaffo joined00:37
← jfkw left00:37
gaffo anyone know of a way to append somthing to all of the commit messages in commit series. suck as CodeReview: Some Guy00:38
← ianawilson left00:38
→ tty2 joined00:40
catsup gaffo: i know a way, something along the lines of, EDITOR='sed -i -e ...'00:41
← bburhans left00:41
← homosaur left00:41
catsup cept you might want to make it a shell script that calls sed -i00:41
actually i guess you could just append with >>00:41
→ jutaro joined00:42
→ spearce_ joined00:43
← tty1 left00:43
← spearce_ left00:43
← Araxia_ left00:45
← spearce left00:46
← rideh left00:47
→ dfr|mac joined00:48
← sebersole left00:48
gaffo catsup, cool, thanks00:49
← ccushing left00:49
← pandeiro left00:49
← towski left00:53
← flavius left00:55
→ gavin_huang joined00:56
→ srcerer joined00:56
← catphive left00:56
→ pdtpatrick joined00:59
← gaffo left01:01
← mkanat left01:02
← bousquet left01:02
← ksawicki left01:02
← nb left01:05
→ haydenmuhl joined01:05
→ mikeyutl_ joined01:05
← _psychic_ left01:05
→ nb joined01:06
← mikeyutl_ left01:06
→ pandeiro joined01:06
→ mikeyutl_ joined01:07
← mikeyutley left01:09
← mikeyutl_ left01:11
← kpreid left01:11
← lunks left01:14
→ Corren joined01:14
→ Ben12345 joined01:16
← bittin left01:16
→ dr_win joined01:16
→ bittin joined01:17
← caseymcg1 left01:17
← gorakhargosh left01:18
→ MikhX joined01:18
ChanServ set mode: +v01:19
← jutaro left01:20
← kipras left01:20
← Corren left01:22
Ben12345 Hello01:23
I'm french then scuse for my poor english01:23
I have too many problem with my svn serveur on my VM ubuntu then i try to install gitolite and git for replacement.01:23
But when i'm not an expert on linux, i have some problem with installation of gitolite (I try to follow this instructions : http://doc.ubuntu-fr.org/gitolite )01:23
on this page, for the line "src/gl-easy-install git localhost admin" (with my admin's login instead of admin) I have this error :01:24
http://pastie.org/222060901:25
I didn't understand because i have set the ssh key and ssh-copy01:26
my usser git had the good /.ssh/authorized_keys01:26
user*01:26
anybody can help me please ? tell me if you want more information01:27
banisterfiend Ben12345: quel qu'un chose, ca la petite mort dans le tres beurre couchez la femmes de la cou?01:27
Ben12345 banisterfiend: Je n'ai pas compris ta phrase / I didn't undestand your sentence01:29
← dr_win left01:29
banisterfiend Ben12345: voulez vous couchez?01:29
Ben12345 ^^01:30
no i want to install gitolite01:31
i'm on the good channel ? ^^01:31
and scuse me for my president too (it's hard to be french ^^)01:31
→ akosikeno joined01:34
CareBear\ haha01:34
Ben12345 : it is not the perfect channel because we focus primarily on the git tool itself here01:35
bremner Ben12345: if you can read english ok, I suggest to follow the official documents on github for installing gitolite01:35
→ shiba_yu36 joined01:35
bremner CareBear\: I disagree, I think this channel is fine for gitolite support.01:35
CareBear\ Ben12345 : but maybe someone can help also with gitolite, I think it is fairly commonly used01:35
← Vampire0_ left01:36
← Adys left01:36
← [intra]lanman left01:37
CareBear\ bremner : I do not mean that it is out of order, I just mean that it may not be what the channel is most expert at01:37
Ben12345 maybe i haven't need gitolite, i need do versionning because i'm beginner on web developpement over symfony01:37
bremner Ben12345: start with http://sitaramc.github.com/gitolite/doc/1-INSTALL.html ; I suggest the root or non-root method, rather than the from-client method that you started01:37
CareBear\: ok01:37
Ben12345 bremner: thank you very much, i read that01:37
CareBear\ Ben12345 : personally I do not know what the benefits of gitolite are. I so far only use git without it, the last few years01:39
bremner If you are only one user, it may not be worthwhile.01:39
Ben12345 CareBear\ and bremner Thank you, I think I do simply with git for the moment01:40
I'm only one user01:40
exit gitolite :)01:41
→ trobrock joined01:41
trobrock How can I setup git so that for a particular branch it will push to a different branch than it pulled, with a simple git push and git pull? I am trying to make gerrit as easy for my team to use as possible and this requires pushing to refs/for/master, but still pulling from master01:42
← dreiss left01:43
CareBear\ trobrock : +1 let's see what comes up01:43
I don't know01:43
← djbpython left01:43
bremner trobrock: have a look at .git/config; there are seperate urls for push and pull01:43
trobrock bremner: so it is the same url, just a different ref01:44
CareBear\ there's both remote.name.push and .pull you say?01:44
ah01:44
.fetch01:44
good01:44
hm01:45
what I have so far is merge= on each branch01:45
fetch I guess is not the problem01:45
"Without this option, git-pull defaults to merge the first refspec fetched." so I guess it might be settable on the server side?01:46
hm01:47
or using fetch =01:47
← rendar left01:47
← SimonNa left01:48
haydenmuhl When I have a tag and a branch named the same thing, how do I specify whether I want to check out the tag or branch?01:48
bremner don't do that ;)01:49
CareBear\ I would rename the branch01:49
bremner refs/heads/blah vs refs/tags/blah01:49
haydenmuhl Ah, ok.01:49
I'm just playing around right now, seeing what is and isn't possible.01:49
CareBear\ trobrock : so does it work for you?01:49
→ sbell joined01:49
← pandeiro left01:50
→ Vampire0_ joined01:50
trobrock CareBear\: not quite following what you are saying, I will look through the docs related to those sections though01:50
→ xiagox joined01:52
← spaceonline left01:52
CareBear\ trobrock : http://dpaste.com/569530/01:52
trobrock CareBear\: I saw that, but would that not push any branch to refs/for/master?01:53
CareBear\ trobrock : note I changed remote.origin.fetch manually to only have master, so that it is the first ref that fetch fetches, which is what git pull will merge by default when branch.*.merge is not set01:53
trobrock : how do you mean any branch?01:54
trobrock so on branch x which is tracking origin/x `git pull` should still pull from origin/x, that still needs to work01:55
lahwran recommended software to host a private repo?01:55
CareBear\ lahwran : git+ssh01:55
sitaram Ben12345: I'm curious where you heard of gitolite (or at least who told you that you need it). I'm the author, but I've never advocated its use for people who do not need it :-)01:56
CareBear\ trobrock : I see. no good solution. coreboot so far only uses one branch01:56
lahwran what are the .git files?01:56
← alvaro_o left01:56
sitaram CareBear\: gitolite is only an access control layer. Unless you have multiple users/repos and cant have a "everyone can do everything" policy, you do not need it01:57
→ mcc joined01:57
sitaram (damn; too many double negatives in that; hope it makes sense)01:57
bremner lahwran: man gitrepository-layout01:57
jast lahwran: *automatic message* the 'gitrepository-layout' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/gitrepository-layout.html01:57
lahwran no I mean01:57
→ p3rror joined01:58
lahwran there are files (possibly directories?) that github has me set as a remote01:58
their filenames end in .git01:58
← airtonix left01:58
Ben12345 sitaram: I have created my companie and maybe I'll employ some person, a friend recommand me to anticipate this with a simply management of users01:58
→ airtonix joined01:58
lahwran I mean like, [email@hidden.address] is the ssh clone url for one of my projects01:58
"skybot.git"01:58
← MikhX left01:59
Ben12345 but, with my knowledge and I'm alone over this job yet, maybe only git is adequate01:59
bremner that is a repository01:59
→ mikeyutley joined02:00
lahwran https://gist.github.com/1b7b5c3ce46edda36d6802:01
I can't seem to get at the actual file ...02:01
bremner what are you trying to do?02:02
lahwran host a private repository02:02
← Error404NotFound left02:02
CareBear\ sitaram : cool. for more complex user scenarios I so far use ACLs successfully02:02
→ beautifulmind joined02:03
lahwran I think someone mentioned gitolite to me recently02:03
lahwran googles02:03
CareBear\ lahwran : .git are not files, but directories02:03
lahwran : typically a bare repository02:03
EugeneKay gitolite is a nifty thing.02:03
← pl0sh left02:03
lahwran right uh02:03
EugeneKay The "project.git" syntax for github/gitolite is a naming convention for "bare" repositories02:04
lahwran <repo>/.git is different from <repo>.git isn't it?02:04
CareBear\ Ben12345 : you do not need to consider the multiuser case until it is a fact02:04
lahwran : no, actually not02:04
EugeneKay <repo>/.git/ is typical for a Normal repository. <repo>.git/ for --bare ones.02:04
CareBear\ right, what EugeneKay said, but the contents is identical02:04
EugeneKay Both contain all the same files, but the bare one lacks a "working" directory, so you can push to it safely.02:04
lahwran oh!02:05
that makes sense.02:05
Ben12345 CareBear\: ok thanks :)02:05
← mandric left02:05
← mikeyutley left02:06
CareBear\ Ben12345 : because git is distributed (every clone is a full repository) you can always change your policy and workflow later02:06
EugeneKay gitolite uses just <repo> internally, but it accepts <repo>.git paths as well, for compatibiltiy02:06
I prefer to specify my remotes as <repo>.git because it shows, at a glance, that the remote is a bare repo02:07
Ben12345 CareBear\: this is an excellent news, I can progress with git and I'll see gitolite when I can delegate some job :)02:07
EugeneKay <3 gitolite02:07
→ zehrique joined02:07
→ Araxia_ joined02:08
← trobrock left02:11
→ cjs joined02:12
sitaram CareBear\: what ACLs? file system ACLs? yeah but if you need those you probably should consider gitolite. Gitolite's rules are much more readable plus gitolite makes it auditable and revisioned02:13
cjs Wasn't there an option on "git svn clone" to bring over only a certain number of the most recent revisions, rather than the whole repo?02:13
EugeneKay Gitolite is nice because there's no need for a local shell02:13
haydenmuhl cjs: I usually look in the svn log, pick a commit I want to be my earliest revision and do a git svn fetch -r02:14
← PabloM left02:14
← EugeneKay left02:14
haydenmuhl cjs: Then I just do a git svn rebase and pull down all newer commits.02:14
sitaram EugeneKay: if it's just to avoid local shell, you can use 'git-shell'. Comes with git02:14
→ Error404NotFound joined02:15
← p3rror left02:15
cjs You can use -r on anything but log? Totally undocumented. Sheesh.02:16
s/anything but/things other than/02:16
← haydenmuhl left02:17
→ pandeiro joined02:18
← airtonix left02:19
→ airtonix joined02:19
Ben12345 After read the documentation, I'm not sur about the repository definition. It's same as SVN or we must directly work on it ? (I believe that the second things but i'm not sur)02:19
cjs Ah, not true; I just didn't read the manpage quite closely enough.02:19
CareBear\ Ben12345 : every working copy is also a complete repository02:20
→ dreiss joined02:20
CareBear\ Ben12345 : in several ways git is very different from svn02:20
← Anubisss left02:20
CareBear\ this is one of them02:20
it usually takes time to realize the effects of this fact - every working tree is a repository02:21
but all those effects are lovely!02:21
← zivester left02:22
cjs Not all of them. :-)02:22
Ben12345 CareBear\: ok, then i create my projet and work on it directly in my local and alone repository and in a few moment, i could create a remote server repository over my curent repository ?02:22
→ zivester joined02:23
← shennyg left02:23
CareBear\ Ben12345 : you create your project and work locally, when you want to make the first commit you initialize a git repository inside your project, use git add to say which files you want to commit, and then use git commit to create a commit in your repository, which is still completely inside your local directory.02:23
← antix left02:24
CareBear\ Ben12345 : after that you can "push" commits from your local repository into any number of other repositories around the world02:24
→ kpreid joined02:24
Ben12345 CareBear\: thank you very much, I love already git and now, i hate definively SVN ^^02:25
→ antix joined02:25
CareBear\ haha02:25
you learn fast02:25
→ bburhans joined02:25
→ Savoxis joined02:25
→ Prasad joined02:25
Ben12345 because i have good teachers :)02:26
sitaram Ben12345: I have been told this has been useful in explaining these concepts: http://sitaramc.github.com/1-basic-usage/simple-git-session.html02:26
← Error404NotFound left02:26
← bburhans left02:26
CareBear\ indeed there are many good resources published on git02:26
I haven't read sitaramc's tutorial but it is probably great02:27
sitaram yup... I think the bets is still progit though -- very easy reading02:27
CareBear\: :)02:27
s/bets/best02:27
CareBear\ yes, I also recommend progit.org02:27
Ben12345 CareBear\: thank you, I bookmark all and I read basic usage :)02:28
← sbell left02:30
Savoxis → WizardOfNand02:32
→ bburhans joined02:32
← bburhans left02:33
→ leen^| joined02:33
→ shennyg joined02:34
→ bburhans joined02:36
← Dave^|| left02:37
← Fudge left02:39
→ Fudge joined02:40
← spatulasnout left02:40
→ alberto56 joined02:40
→ mnaser joined02:41
→ spatulasnout joined02:42
→ caseymcg1 joined02:45
→ herdingcat joined02:45
← manithree left02:46
dstorrs so...I've got a branch that had some stuff mistakenly merged into it, and THEN a bunch of updates to the HTML / CSS / template files were made. I'd like to get those updates merged into the prod branch and pushed, but I don't want to bring everything else over.02:48
what is the best way to handle this? cherrypick?02:49
← shiba_yu36 left02:49
CareBear\ exactly02:52
← zivester left02:53
→ bitri joined02:53
→ n8o-mba joined02:54
→ f0i joined02:54
dstorrs CareBear\: cherrypick brings over complete commits, yes? I haven't gone through yet, but if it turns out that a particular commit includes something I want and something I don't, how do I handle that?02:56
cehteh cherrypick -n .. edit .. commit02:57
dstorrs also, if I cherrypick certain bits from dev into master & prod, what will happen when I eventually merge dev into those things?02:57
← cherro left02:58
cehteh well generally you should try not to cherrypick. git may resolve that but it gives a ugly history02:58
(and maybe spurious merge conflicts)02:58
← banisterfiend left02:58
dstorrs yeah, I've been studiously avoiding it until now. :>02:59
← Chillance left03:01
dstorrs I could do this using filesystem commands -- copy the files to new names, change branches, mv files back to old names, commit. that should keep history clean and avoid merge conflicts,03:01
but it's error prone.03:01
suggestions?03:01
← mjessome left03:05
← mnaser left03:05
→ mnaser joined03:05
← macUzer left03:05
→ MikhX joined03:07
cehteh dstorrs: sorry didnt followed here .. take a look at rebase --interactive and revert too03:07
dstorrs wilco. thanks, cehteh03:08
→ mandric joined03:08
→ shurane joined03:08
→ banisterfiend joined03:09
← zehrique left03:10
← msieradzki left03:11
← MikhX left03:13
Araxia_ dstorrs: would/could you merge from e.g. master into dev first? if so (and if that is indeed a cleaner merge) you could then try to merge dev back into master with `git merge -s recursive -Xtheirs dev`03:13
→ martin1 joined03:15
→ Yakko joined03:16
← dstorrs left03:16
→ Vikash joined03:17
→ adymitruk joined03:17
← mklappstuhl left03:17
ChanServ set mode: +v03:18
adymitruk Hey guys. What do you think of this branch-per-feature post? http://t.co/kMjc1QZ03:20
→ MikhX joined03:24
← banisterfiend left03:25
cehteh too much too read :P03:25
→ Nuck joined03:25
cehteh (besides i consider that common practice, as well as disposing branches sometimes)03:26
→ rchavik joined03:26
offby1 considers "tl;dr" common practice03:27
Araxia_ adymitruk: looks pretty good to me, but i'm not so certain how well it would work on a team lacking sufficient discipline and knowledge of git across the board. granted, such a team has many other problems...03:32
← cakehero left03:34
adymitruk Araxia_: with a proper issue tracking system it's not that hard. And yes got makes it possible03:34
← caseymcg left03:34
adymitruk Git03:34
Autocorrect :/03:34
→ johnw joined03:35
Araxia_ adymitruk: what issue tracking system would you recommend? we're in search of one now. currently using mantis.03:35
← gavin_huang left03:36
adymitruk cehteh: Fowler considers it an anti-pattern03:36
I use kira but Ruby mine is good too03:36
→ gavin_huang joined03:36
adymitruk cehteh: he chimes in in the comments03:37
Araxia_ adymitruk: do you mean jira?03:37
→ shiba_yu36 joined03:38
adymitruk Yes ... Autocorrect again03:38
crab autowrong03:39
← Vikash left03:40
adymitruk Lol03:41
← Prasad left03:41
→ banisterfiend joined03:42
← kukks left03:47
Ben12345 can I add and commit an empty directory in my git repository ?03:48
It's not very important but I have made many test and I see that the empty directories are never restored03:48
banisterfiend Ben12345: cannot commit empty direc03:49
Ben12345 banisterfiend: ok thank you03:49
→ jfkw joined03:50
→ zivester joined03:50
Ben12345 now I think I have the knowledge for work alone03:51
thank you all for your help03:51
banisterfiend Ben12345: im french too btw03:52
← xiagox left03:52
Ben12345 and Git is MAGIC !03:52
← Risar left03:52
→ Risar joined03:52
Ben12345 banisterfiend: ta phrase tout a l'heure n'en donnait pas l'impression ^^03:52
banisterfiend Ben12345: i just pretend im not french since ppl seem to dislike the french03:53
← cwillu_at_work left03:53
→ cwillu_at_work joined03:53
Ben12345 banisterfiend: I don't understand ppl ?03:54
banisterfiend Ben12345: ppl => people03:54
Ben12345 ah ok :)03:54
← zivester left03:55
Ben12345 I go. Have a nice day/night03:55
banisterfiend cya03:55
Ben12345 see you later ++03:55
← Ben12345 left03:55
← n8o-mba left03:57
→ DarkHouse joined03:57
← bitri left03:57
← tro left04:00
Araxia_ → Araxia04:00
← mandric left04:00
← MikhX left04:00
→ trobrock joined04:01
→ zivester joined04:02
→ MikhX joined04:03
← OOPMan left04:03
← adymitruk left04:03
→ tro joined04:04
→ adymitruk joined04:04
← banisterfiend left04:05
← MikhX left04:07
← caseymcg1 left04:11
→ mandric joined04:11
← mandric left04:12
← trobrock left04:13
← Araxia left04:13
→ MikhX joined04:15
← pandeiro left04:15
← zivester left04:17
← herdingcat left04:18
→ cakehero joined04:18
→ Chib joined04:18
← mnaser left04:19
→ mnaser joined04:20
→ zivester joined04:20
← gavin_huang left04:20
→ trobrock joined04:20
← novascorpio left04:21
→ gavin_huang joined04:21
← Tommy[D] left04:22
← cakehero left04:22
→ scharan joined04:22
→ Tommy[D] joined04:23
→ OOPMan joined04:23
← Yakko left04:23
ChanServ set mode: +v04:23
← bgy left04:24
← scharan left04:24
→ p3rror joined04:24
→ n8o joined04:25
→ scharan joined04:26
→ cytrinox_ joined04:27
← scharan left04:28
← cytrinox left04:30
cytrinox_ → cytrinox04:30
→ srid joined04:30
← srid left04:30
→ srid joined04:30
← srid left04:31
→ banisterfiend joined04:32
← kpreid left04:33
→ Davey_ joined04:34
← Davey_ left04:34
→ Davey_ joined04:34
→ angelsl joined04:35
← trobrock left04:37
→ dr_win joined04:37
← tro left04:37
→ leo2007 joined04:38
→ n8o-mba joined04:39
→ dr0id joined04:44
← p3rror left04:46
→ tro joined04:46
→ jonanin joined04:50
→ SirFunk joined04:51
← iXeno left04:51
→ kpreid joined04:53
→ p3rror joined04:53
→ ajsie joined04:54
→ chuck joined04:55
ChanServ set mode: +v04:56
chuck Hi all! I've got a merging question04:56
→ din joined04:56
chuck I created a new repo from scratch with basically the same files as a remote repository on GitHub04:56
offby1 nods absently04:56
banisterfiend offby1: sweety, did you check out that little video demo04:56
offby1 now you want to merge04:56
chuck I'd like to merge that remote repo into my local one, and preserve all local changes (so, delete files on the remote repo that aren't present locally, preserve all local changes, etc)04:57
offby1 banisterfiend: I did. I even had a comment or two. Lemme think if I can remember them.04:57
→ mcluskydodallas joined04:57
offby1 chuck: I think you want to add the github repository as a remote, then do "git merge --ours" or something like that.04:57
→ iXeno joined04:57
← troyt left04:57
← Kreative` left04:58
→ Kreative` joined04:58
offby1 banisterfiend: well, I slowly realized the point: it's an extension, or something, to git, that understands Ruby enough that it can focus on individual methods.04:59
That seems mildly useful.04:59
→ vmil86 joined04:59
offby1 Also, I was frustrated by a) the small font size; b) the lack of editing :)04:59
chuck offby1: oh okay, -s ours looks like what you're referring to04:59
→ agile joined04:59
offby1 yeah, something like that.05:00
→ Goopplesoft joined05:00
Goopplesoft anyone here?05:00
offby1 You could also a) clone the github repository; b) delete all the files in the work tree; c) copy your files into the work tree; d) "git add . ; git commit"05:00
← sherjilozair left05:00
offby1 that'd probably do the same thing.05:00
Goopplesoft: nope05:00
nobody here but us zombie processes.05:00
Goopplesoft lol05:00
chuck offby1: git merge -s ours remotes/origin/master worked like a charm, thank you!05:00
Goopplesoft so I have a project folder called Dock05:00
← Kreative` left05:00
offby1 nods absently05:01
→ Kreative` joined05:01
banisterfiend offby1: yes, it wasn't an official screencast, just a crappy little demo i did in 4 mins to show true friends who wouldn't judge me (such as yourself, friendo)05:01
Goopplesoft and I have a subfolder that was pulled from github05:02
offby1 frets over his judge-mental-ness05:02
Goopplesoft I want to merge that subfolder into the main git05:02
so I can commit the whole thing05:02
offby1 Goopplesoft: I can think of two options05:02
banisterfiend offby1: hehe, anyway i dont think adding/commiting methods is so useful really, but the blame and diff functionality is pretty cool05:02
← vmil86 left05:02
offby1 Goopplesoft: either you make the _current state_ of the subfolder part of your repository, losing all its history ...05:02
Goopplesoft: or, of course, you incorporate it as a submodule05:03
Goopplesoft: any idea which you prefer?05:03
Goopplesoft I dont care about history, I just want the current changes I made to not be gone...05:03
lol05:03
offby1 Goopplesoft: then I'd just do "rm -rf subfolder/.git", then edit those files (if necessary) to make them look the way you want, then "git add subfolder/; git commit"05:04
Goopplesoft cool05:05
← unomi left05:06
→ SimonNa joined05:07
← mcluskydodallas left05:08
← adymitruk left05:08
← volodya left05:08
→ caseymcg joined05:08
Goopplesoft so offby105:09
# Changes to be committed:05:09
# (use "git reset HEAD <file>..." to unstage)05:09
#05:09
# modified: vendor/bundles/FOS/UserBundle05:09
just wanna make sure05:09
thats what git commit tells me currently05:09
offby1 hard to tell, but presumably you want to commit that05:09
Goopplesoft so I go into FOS/Userbundle, remove .git and go back to the main folder add .05:09
offby1 Goopplesoft: you need to spend some time practicing the basics.05:09
← p3rror left05:10
Goopplesoft no doubt05:10
→ deepthinker82 joined05:11
→ Corren joined05:11
→ dstorrs joined05:11
Goopplesoft so I removed the .git05:12
now it says nothing to commit05:12
offby1: ^05:13
offby1 hmm05:13
I wonder if vendor/bundles/FOS/UserBundle is already a submodule.05:14
→ p3rror joined05:14
← p3rror left05:16
→ p3rror joined05:16
← glennpratt left05:16
← madewokherd left05:17
Goopplesoft offby1: how can I find out?05:18
← ryansch left05:20
← MikhX left05:21
← p3rror left05:21
→ markbao_ joined05:27
← ivan left05:29
→ ivan joined05:30
→ msieradzki joined05:31
leo2007 hello, I am on a slow network and currently Receiving objects: 27% (508/1874), 2.28 MiB | 2 KiB/s05:33
if I interrupt that and start again, will it pick up from where it left?05:34
← din left05:35
CareBear\ no05:36
leo2007 sucks.05:38
banisterfiend CareBear\: did you like the care bear cartoon05:38
→ dwmw2_gone_ joined05:39
← Bass2 left05:39
→ cesario joined05:41
← Corren left05:42
→ sechrist_ joined05:42
← sechrist left05:42
→ fp1 joined05:42
→ codecowboy joined05:44
→ ThomasLocke joined05:44
← Davey_ left05:46
→ Prasad joined05:47
← dreiss left05:50
← tizzo-afk left05:52
→ fp_ joined05:53
ChanServ set mode: +v05:54
fp1 Why is there no 1.7.6 for Mac?05:54
← jeff-h left05:57
← Prasad left05:58
→ jutaro joined05:59
← akosikeno left06:02
→ leavittx joined06:04
→ akosikeno joined06:14
Kreative` is away: Away06:14
← beautifulmind left06:16
→ dreiss joined06:18
← jkyle left06:18
← f0i left06:19
← preflex left06:20
→ preflex joined06:20
← ISF left06:20
← bblfish left06:21
→ jkyle joined06:22
→ f0i joined06:22
→ _lazylisper joined06:22
← _lazylisper left06:23
→ bblfish joined06:25
← johnw left06:25
→ Davey_ joined06:27
← Davey_ left06:27
→ Davey_ joined06:27
→ boombatower joined06:29
← boombatower left06:29
→ boombatower joined06:29
← OOPMan left06:31
← rchavik left06:33
← leavittx left06:33
→ Bonkers joined06:35
→ jeff-h joined06:35
Bonkers during a rebase -i, what's the right way to edit out just a few bits of a commit?06:36
like interactive unadd or something06:36
cjs What is a "branch," precisely? I am thinking that it cannot be "a mapping of a name to a commit ID" if the manpages talk about "the tip of a branch."06:36
← coletg left06:36
Bonkers cjs, why not?06:36
cjs, a commit represents the entire state of the repository when the commit was made06:37
cjs What is the "tip" of a name->ID mapping?06:37
← macabre left06:37
Bonkers cjs, the commit pointed to by the branch ref06:37
commits point backwards at their parents06:37
← DarkHouse left06:38
Bonkers a branch ref maps to a commit ID06:38
cjs But a commit is not a name->ID mapping. Those are two quite different concepts. (I am asking about this because I'm trying to write an explanation of something about git, and I'm having trouble finding consistent terminology.)06:38
Bonkers a branch is the entire state at that point06:38
a commit is a tree+commit message essentially06:39
cjs Ah, so "branch ref" is the name->ID mapping.06:39
Bonkers identified by a SHA-1 hash06:39
and you can alias them to branches06:39
there's very little difference between a branch and a tag06:39
cjs Bonkers: I understand the internals quite well; I'm just looking for precise terminology here.06:39
Do you have an example somewhere of where the term "branch ref" is used?06:40
Bonkers not sure, but you just have to be precise in what you're talking about, both branches and tags are refs06:41
hence refs/heads/<branch>06:41
→ amerine joined06:41
Bonkers a ref is really a name->ID mapping06:41
cjs Ah! I think this is really helping. So a reflog entry is also a ref.06:42
→ pdtpatr1ck joined06:42
Bonkers reflog just tells you how a reference changed over time06:42
a branch is just a ref that gets updated when you make a new commit06:42
→ liquid-silence joined06:46
cjs Hm. So it appears that the reflog itself is not a mapping of names->commits, at least as its stored.06:50
So a reflog entry is sort of a pseudo-ref?06:51
(The names, e.g., HEAD{0}, appear to be generated on the fly as the reflog is read by "git reflog".)06:51
Bonkers ya, just like HEAD^ and HEAD~ etc.06:51
← boombatower left06:52
cjs Hm. Is HEAD^ considered a "ref"?06:52
Bonkers yep06:52
HEAD^ points to a single commit06:53
any single commit is a ref06:53
→ erguolinge joined06:53
← erguolinge left06:53
cjs I see. Hm. So in a test repo I have read now, I have two commits, the initial commit (or "root commit"?) a, and a child, b. HEAD and HEAD^ are refs to b and a, respectively. What is HEAD^^?06:53
← d0k left06:54
Bonkers not sure, try git rev-parse on it06:54
I hardly ever deal with git repos that young, I've never even considered that situation06:54
cjs "fatal: ambiguous argument 'HEAD^^': unknown revision or path not in the working tree."06:54
Bonkers HEAD^^ means 2 merge parents back06:54
so with 3 commits, sitting at c, HEAD^^ == a06:55
← ThomasLocke left06:55
cjs Hm. So I think it's fair to think of a git repo as having a complex function, resolve_ref(s), that takes a string and, working from the branch and reflog information, produces a commit name. ("commit hash"? "commit"?)06:56
I guess in my repo you'd also call 'b2792e067682b43588697ffc145b943e876cb181' and 'b2792e0' refs as well, right?06:56
Bonkers yep06:57
more correctly, working from the HEAD06:57
cjs "more correctly, working from the HEAD"? I don't quite understand that comment.06:58
Bonkers instead of where 'you say working from the branch'06:58
branch is kind of ambiguous there06:58
only HEAD^ and HEAD~ require a reference point06:59
cjs By " working from the branch and reflog information" I meant, "the function uses branch and reflog information stored in the .git directory".06:59
Bonkers ah, ok06:59
so then probably more accurately refs and reflog information07:00
cjs Ok, so I think I'm achieving some clarity on this now. Git rev-parse takes a ref, and produces a commit hash, which is also a ref, but a fully resolved one.07:00
Bonkers although I'm not sure at all where reflog even comes from07:00
→ chrisf__ joined07:00
Bonkers look in .git/refs07:00
← juvenal left07:00
← chrisf__ left07:01
→ chrisf|laptop joined07:01
cjs If you look at the file .git/logs/refs/heads/master you will see a list of entries that are essentially tuples of (previous_value,new_value,who,timestamp) which indicate the changing values of a ref over time.07:02
Bonkers yep, just found that07:02
and they have customizeable pruning settings07:02
anyway, good luck with that, I gotta run07:02
cjs Thanks, you've been helpful.07:03
→ Kuntau joined07:04
← Kuntau left07:05
← aperlstein left07:06
→ aperlstein joined07:07
← Slush- left07:09
→ Slush- joined07:09
→ hookdump joined07:10
← Davey_ left07:10
← pheaver left07:11
→ ozzloy joined07:11
→ erguolinge joined07:11
← erguolinge left07:12
→ MikhX joined07:13
← jeff-h left07:13
→ mjessome joined07:14
← dr0id left07:15
← fp1 left07:17
→ mikeyutley joined07:18
→ Juo joined07:23
→ flavius joined07:23
→ leavittx joined07:24
← jjore left07:32
flavius Ok so git reset --soft HEAD^ will just move the HEAD backwards one step, that's the same as amending the last commit07:34
My question is: since the original HEAD is now in the index, if I do some "bad" things, can I lose that "future" version of the file?07:34
→ jjore joined07:35
→ rchavik joined07:37
→ airborn joined07:38
← dreiss left07:38
← jjore left07:40
crab sure.07:41
← cesario left07:42
flavius so it's not like "if you had commited a version of a file to the repo, you can never ever lose that state of the file"?07:43
I guess this is related to git-gc07:45
→ tore_ joined07:45
← seawise_ left07:45
→ jjore joined07:45
crab '"bad" things' is rather vague. you can always delete the repository or something. if you do only "ordinary" bad things, then you can always get the old HEAD back from the reflog for a long time.07:46
flavius how long?07:46
yeah I was not thinking about that "bad" things :) I was speaking only about git07:46
← shiba_yu36 left07:49
→ tvw joined07:50
← jjore left07:50
← jfkw left07:52
→ seawise joined07:53
→ jargon- joined07:54
← jargon- left07:54
→ jargon- joined07:54
jargon- i'm trying to figure out how to pull from someone's svn to my local git. any ideas?07:55
→ tansell-laptop joined07:55
→ Dave^|| joined07:56
← amerine left07:57
→ n8o_ joined07:58
→ j0llyr0t2en joined07:59
flavius jargon-: I've never used it, but here it is http://www.kernel.org/pub/software/scm/git/docs/git-svn.html08:01
→ oc80 joined08:01
→ mikeyutl_ joined08:01
← BiggFREE left08:01
← Tianon left08:01
← hookdump left08:01
← shurane left08:01
← Badababuba left08:01
← Bombe left08:01
← cwillu_at_work left08:01
← leen^| left08:01
← j0llyr0tten left08:01
← iXeno left08:01
← AlexanderS left08:01
← mdpatrick left08:01
→ Bombe joined08:01
← Bombe left08:01
→ Bombe joined08:01
← oc80z left08:01
→ mdpatrick joined08:01
← n8o left08:01
← ToxicFrog left08:01
← zivester left08:01
→ zivester joined08:01
← mikeyutley left08:01
→ ToxicFrog joined08:01
→ cwillu_at_work joined08:01
← gavin_huang left08:02
← ketas-av left08:02
→ Tianon joined08:02
→ AlexanderS joined08:02
→ iXeno joined08:02
→ ketas-av joined08:03
← Ardonik left08:03
→ gavin_huang joined08:03
← Tianon left08:05
→ Tianon joined08:05
jargon- flavius: yeah,thanks. :)08:05
→ Murr_ joined08:08
← bauruine left08:09
→ hookdump joined08:10
→ shurane joined08:11
→ li joined08:14
← leo2007 left08:15
← li left08:15
→ Textmode joined08:18
← sagex_ left08:23
← bla left08:24
← SimonNa left08:25
→ bla joined08:25
← rchavik left08:26
→ jjore joined08:26
→ sagex_ joined08:27
← mjessome left08:27
← tore_ left08:27
→ tore_ joined08:29
→ bauruine joined08:29
← jutaro left08:29
← cjs left08:30
← murr4y left08:30
→ mjessome joined08:31
← jjore left08:31
← mjessome left08:32
→ mjessome joined08:32
→ jutaro joined08:32
→ jjore_ joined08:32
← mjessome left08:33
→ pheaver joined08:33
← sp3000 left08:34
← tore_ left08:35
→ tore_ joined08:37
→ sp3000 joined08:37
→ dr0id joined08:37
← jutaro left08:38
→ yugushen_ joined08:38
→ jutaro joined08:38
→ SimonNa joined08:39
← yugushen_ left08:40
← erik-landvall left08:43
→ xiangfu joined08:43
← jjore_ left08:44
← airborn left08:44
→ murr4y joined08:47
← Dave^|| left08:47
→ Dave^|| joined08:48
← pheaver left08:48
← mikeyutl_ left08:49
← jutaro left08:49
← Leonidas left08:50
← MikhX left08:50
→ mikeyutley joined08:52
Fudge → Fudg08:55
→ sherjilozair joined08:55
← caseymcg left08:59
→ caseymcg joined09:01
← mikeyutley left09:01
← flexd left09:03
→ flexd joined09:04
→ jjore joined09:05
Fudg → Fudge09:06
← nowhereman left09:10
→ nowhere_man joined09:11
← xiangfu left09:11
← liquid-silence left09:11
→ liquid-silence joined09:11
→ xiangfu joined09:12
→ j4mie joined09:18
← caseymcg left09:20
ec|fkn_away_nick → elliottcable09:23
← chrisf|laptop left09:24
→ chrischambers joined09:24
→ chrisf|laptop joined09:24
← j4mie left09:27
← marvin2 left09:27
→ BiggFREE joined09:27
← Amorphous left09:27
← BiggFREE left09:28
→ marvin2 joined09:29
← mattalexx left09:29
← hookdump left09:30
zomg Heh, interesting Q on SO relating to git09:33
Why is the index called the index :D09:33
http://stackoverflow.com/questions/6716355/why-staging-directory-is-also-called-index-git-index09:35
If anyone knows :)09:35
Bombe Who cares?09:36
They could have called it Pjotr Ehlersson. Doesn’t make a difference.09:37
← Behi left09:38
← Murr_ left09:40
→ aminpy joined09:40
→ Amorphous joined09:42
→ airborn joined09:42
← CoinOpeBoy left09:44
← xiangfu left09:47
→ aspotashev joined09:48
← codecowboy left09:49
→ BiggFREE joined09:53
→ Adys joined09:54
→ caseymcg joined09:58
→ pen joined09:58
→ rvsjoen_ joined09:59
← rvsjoen left10:01
→ j416 joined10:01
→ Yuuhi joined10:02
→ Murr_ joined10:02
→ N0va` joined10:02
← bauruine left10:02
→ beautifulmind joined10:03
→ snitko joined10:03
← dfr|mac left10:05
← workmad3 left10:07
→ dr_lepper joined10:10
← dr_lepper left10:10
→ dr_lepper joined10:10
← angelsl left10:11
→ jp42 joined10:12
← Adys left10:13
← SimonNa left10:14
→ Coriolan joined10:14
→ angelsl joined10:14
tango_ Bombe: I like the idea. I'm going to call some component of the next software I write with that name 8-D10:15
Bombe Random names are the best!10:15
← snitko left10:15
tango_ I was thinking about writing an OpenCL toolkit, maybe I'll call it Esteban van de Florijes instead of clut10:16
→ snitko joined10:16
← snitko left10:16
→ LiohAu joined10:18
← BiggFREE left10:21
→ Adys joined10:22
← airborn left10:22
→ rump joined10:23
rump if ^ is back one, how do i go forward 1?10:23
HEAD^110:24
sha+110:24
→ Qpac joined10:27
Bombe rump, there’s no way to do that easily.10:27
rump oh, okay10:27
Bombe: thank you10:27
no wonder i couldnt find it anywhere online10:27
← dr_lepper left10:29
ChanServ set mode: +v10:29
Qpac hi everyone. Is there a way to watch a line and "go back in time" to see, who did changes to that line? I´m on OS X10:30
j416 Qpac: man git-blame10:30
jast Qpac: *automatic message* the 'git-blame' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-blame.html10:30
← bgerber left10:30
Qpac jast: thank you, I´ll check that10:31
s0undt3ch hello ppl, anyone know where I can find a "soft quota" hook?10:34
→ kane77 joined10:35
← LiohAu left10:36
← akosikeno left10:36
← caseymcg left10:37
→ bgerber joined10:38
← tvw left10:40
← sherjilozair left10:41
→ sherjilozair joined10:42
→ Behi joined10:44
→ Chillance joined10:46
← chrisf|laptop left10:47
← rump left10:48
← seawise left10:52
← babilen left10:53
← Adys left10:54
→ bodom joined10:55
→ Adys joined10:59
→ SimonNa joined10:59
← sirdancealot left11:00
→ Myth17 joined11:00
← arooni left11:00
→ Nugget joined11:00
→ arooni joined11:01
→ liquidproof joined11:01
← Fudge left11:01
→ Error404NotFound joined11:01
← Error404NotFound left11:01
→ Error404NotFound joined11:01
→ Fudge joined11:02
← Nugget left11:05
← Fudge left11:06
→ Fudge joined11:06
← dinsdale left11:07
← Behi left11:08
← sherjilozair left11:08
← frikinz left11:08
→ Nugget joined11:12
→ Behi joined11:13
← Adys left11:13
← tore_ left11:14
→ canton7 joined11:15
→ dinsdale joined11:16
← jp42 left11:19
→ jp42 joined11:20
→ sherjilozair joined11:20
← berserkr left11:21
→ berserkr joined11:21
→ spaceonline joined11:21
← sherjilozair left11:22
← MavJS left11:24
← liquid-silence left11:25
→ tewecske joined11:26
→ bauruine joined11:27
← Fudge left11:30
→ Fudge joined11:30
← martin1 left11:32
→ dsop joined11:34
← selckin left11:34
wereHamster s0undt3ch: what should that hook do?11:34
kane77 another question about git svn, let's say I have A and B git branches and I develop in B and once in a while I git svn rebase A and merge new changes to B, as a final step I merge B to A and checkout A and run git svn rebase (because otherwise git svn would try to dcommit also the merge commits which would fail) and git svn dcommit.. Will git be able to figure out what parts it should merge if I do some further work in B and then try to merge it back to A? ho11:35
w?11:35
→ seawise joined11:36
→ brodo joined11:36
→ sirdancealot joined11:38
→ MavJS joined11:41
→ masando joined11:45
← diegoviola left11:51
→ Anubisss joined11:54
← beautifulmind left11:54
← Nuck left11:54
← pen left11:54
→ sbell joined11:57
→ babilen joined11:58
→ Adaptee joined11:58
→ brian_g joined11:58
→ possibilities joined11:58
→ beautifulmind joined12:00
← beautifulmind left12:02
→ lunks joined12:06
← jp42 left12:11
→ kipras joined12:13
→ D-Roch_ joined12:13
→ canton8 joined12:15
← canton7 left12:15
← canton8 left12:15
→ canton7 joined12:16
→ Corren joined12:17
← sbell left12:17
← tewecske left12:17
← j0llyr0t2en left12:17
← n8o_ left12:17
← preflex left12:17
← pdtpatrick left12:17
← DrNick left12:18
← crab left12:18
← D-Roch left12:18
← mrtadis left12:18
← AAA_awright left12:18
← SRabbelier left12:18
← ajt_ left12:18
← tehbaut left12:18
← eqs left12:18
← orospakr left12:18
← kytibe left12:18
← eli left12:18
← blast_hardcheese left12:18
← Phlogistique left12:18
← crakdmirror left12:18
← dec left12:18
← dna left12:18
← thoraxe left12:18
→ sbell joined12:19
→ tewecske joined12:19
→ j0llyr0t2en joined12:19
→ n8o_ joined12:19
→ preflex joined12:19
→ pdtpatrick joined12:19
→ mrtadis joined12:19
→ DrNick joined12:19
→ crab joined12:19
→ AAA_awright joined12:19
→ SRabbelier joined12:19
→ ajt_ joined12:19
→ tehbaut joined12:19
→ eqs joined12:19
→ orospakr joined12:19
→ kytibe joined12:19
→ eli joined12:19
→ blast_hardcheese joined12:19
→ Phlogistique joined12:19
→ crakdmirror joined12:19
→ thoraxe joined12:19
→ dec joined12:19
→ dna joined12:19
→ mtkd joined12:19
→ gebi joined12:22
→ jp42 joined12:23
← masando left12:23
← stamina_ left12:26
→ g0bl1n joined12:26
→ name joined12:27
← name left12:27
→ name joined12:27
← name left12:28
→ w0bni joined12:28
← SirFunk left12:31
← tty2 left12:35
→ glennpratt joined12:35
→ stamina joined12:35
← arunce left12:36
→ fustfick joined12:38
← LouisJB left12:38
← jordanm left12:38
← o] left12:39
→ tty1 joined12:40
← Chillance left12:43
→ leo2007 joined12:43
← stamina left12:45
← wonslung left12:45
← thiago left12:45
→ nd__ joined12:46
← Myth17 left12:46
← canton7 left12:47
← glennpratt left12:48
← Adaptee left12:49
← nd___ left12:49
→ morphic joined12:50
→ stamina joined12:50
morphic hi, i have created a repo with /etc folder and some files inside it, when I try to clone it on / i get destination path '.' already exists and is not an empty directory, is there some --force option, or better way to do itA?12:51
← stamina left12:51
→ stamina joined12:51
← stamina left12:51
← Error404NotFound left12:52
← n8o-mba left12:52
→ stamina joined12:52
→ brainwave92 joined12:53
← morphic left12:54
→ thiago joined12:54
← brainwave92 left12:55
→ brainwave92 joined12:55
brainwave92 Guys i have a bazaar directory......in which i have a source. Now how do i make a clone of this directory and use it with git?12:55
→ resmo_ joined12:57
→ kukks joined12:57
← leavittx left12:59
← James1479 left12:59
→ Adaptee joined13:00
→ mklappstuhl joined13:01
→ leavittx joined13:01
ioerror__ morphic: so, you did `git init` in /etc and then?13:01
→ RaceCondition joined13:01
j416 ioerror__: he left13:02
→ rvsjoen joined13:02
→ wowdd1 joined13:02
← jp42 left13:03
brainwave92 *repear*Guys i have a bazaar directory......in which i have a source. Now how do i make a clone of this directory and use it with git?13:04
→ jordanm joined13:04
← rvsjoen_ left13:04
← project2501a left13:04
← wowdd1 left13:04
BinGOs Isn't there something called git-bzr13:04
j416 brainwave92: if someone knows and feels like helping you, they will. Be patient.13:04
→ herdingcat joined13:05
← Soliton left13:05
→ project2501a joined13:05
→ Sonderblade joined13:05
BinGOs https://github.com/pieter/git-bzr13:05
← Sonderblade left13:06
brainwave92 j416, i did wait or quite some time....and hence marked it with *repear*13:06
j416 brainwave92: well it's not like there was a lot of conversation inbetween.13:06
:)13:06
→ Sonderblade joined13:06
brainwave92 j416, for those who joined new.....:) wont repeat again13:06
j416 haha I see13:07
hm, does a blob (as in loose object) ever contain only part of a file? e.g. delta?13:08
BinGOs https://github.com/termie/git-bzr-ng13:08
( seems more up to date ).13:08
brainwave92 hmm13:08
BinGOs Brought to you by the power of http://www.google.com/search?q=git-bzr13:09
brainwave92 lol thanks13:09
BinGOs I make no claims of merchantability etc.13:10
brainwave92 yes that disclaimer is certainly in order :)13:12
← brainwave92 left13:13
→ jp42_ joined13:15
→ madewokherd joined13:15
→ delinquentme joined13:20
← jp42_ left13:20
→ jp42 joined13:21
delinquentme git checkout HEAD^ app/controllers/resumes_controller.rb <, this should undo any changes in the current working tree to that controller right?13:21
← d1b left13:21
← Kreative` left13:23
ioerror__ delinquentme: it's HEAD, HEAD^ would change the file to what it looked like before the last commit13:24
delinquentme check.13:24
thanks ioerror__13:24
← chitragupt left13:25
→ glennpratt joined13:26
→ chitragupt joined13:26
→ akem joined13:30
← seawise left13:35
→ seawise joined13:35
→ nibblebot joined13:35
→ NetRoY joined13:36
← glennpratt left13:36
→ ch077179 joined13:36
← Pupeno left13:37
← delinquentme left13:38
→ questionable joined13:39
← questionable left13:39
→ PawnStar joined13:40
→ sherjilozair joined13:40
→ gusnan joined13:40
PawnStar hi all. how does branching work in git?13:40
← sherjilozair left13:40
PawnStar i keep hearing it's better than in hg, but i don't get it13:40
→ avsej_ joined13:41
sitaram damn.. my /ignore list seems to have been reset to last month's...13:43
← NetRoY left13:43
→ nedbat joined13:43
j416 PawnStar: for one, git doesn't store branch names in the commit objects, which sounds like a good design choice to me.13:43
PawnStar: a branch is but a pointer to a commit. Nothing more nothing less.13:43
nedbat 13:43
sitaram j416: PawnStar is a troll. Please do not feed the trolls13:44
j416 sitaram: oh, sorry, I didn't know.13:44
sitaram j416: that's how I realised my /ignore list got reset13:44
banisterfiend j416: i just had a brainfreeze, how does git know which branch to push to when you just issue a 'git push' again?13:44
sitaram j416: no worries -- I didn't either, last time I saw him13:44
j416 banisterfiend: from the config file13:44
banisterfiend which section again?13:44
j416 banisterfiend: and with respect to the matching stuff, I don't remember the name of the config setting13:45
← avsej left13:45
sitaram push.default I think13:45
PawnStar sitaram: huh?13:45
banisterfiend j416: [branch "dev"]13:46
remote = origin13:46
merge = refs/heads/dev13:46
sorry13:46
so it pushes to the 'merge' ? or is that just for pulling?13:46
PawnStar j416: thanks. i'm not sure what sitaram is saying13:46
j416 it pushes to push, iirc13:46
← project2501a left13:46
banisterfiend j416: i dont have a 'push' in my config though hmm :/13:46
j416 PawnStar: you're welcome.13:46
sitaram banisterfiend: not that one; see the one that starts with +refs...:...13:47
j416 banisterfiend: I'm not sure how it works, maybe it falls back on something.13:47
nedbat I'm trying to make an exact copy of a local repo. I tried to use "git clone --mirror", but that implies --bare, and my entire goal was to get a second working directory I could compare to the first. Is "cp -r" the right way to go?13:47
banisterfiend sitaram: isn't that just for fetching?13:47
PawnStar a git branch sounds like a mercurial tag or bookmark13:47
j416 nedbat: sure, cp -r, or cp -a13:47
nedbat: just copy all of it and it'll be fine13:47
nedbat j416: thanks, I got stuck on the mindset of "find how git can do this" that I overlooked the simple solution.13:48
sitaram banisterfiend: I think if a specific remote.foo.push is not found, it also uses the same refspecs from fetch... (not sure about this)13:48
banisterfiend sitaram: interesting13:48
PawnStar so what is the difference between a git branch and an hg tag/bookmark?13:49
→ DarkHouse joined13:49
j416 nedbat: btw, in my OS, I think it's not cp -r, but cp -R13:49
nedbat: I typically use cp -a though so I dunno.13:49
nedbat j416: -a looks perfect13:49
j416 nedbat: well you could clone it, of course that'd lose you your remotes and stuff13:49
sitaram banisterfiend: no -- that is not it...13:50
j416 nedbat: it depends on what you want to achieve, really13:50
sitaram banisterfiend: or at least I can't make it work that way13:50
j416 PawnStar: I don't know how tags/bookmarks work in mercurial, sorry.13:50
banisterfiend sitaram: ill see if progit book says anything about it13:50
→ Chillance joined13:51
nedbat j416: I just want two repos side by side so I can checkout one branch in one, and another in the other, and use file tools to see the differences.13:51
j416 banisterfiend: you could check the git source, should hold the one true answer :)13:51
nedbat: is there a good reason you can't use git to compare them?13:51
nedbat j416: I'm not that good with git yet! :)13:52
j416: I want to compare two branches in meld.13:52
j416 nedbat: well it's what git does best13:52
I thought meld could only compare single files, no?13:53
not whole trees?13:53
nedbat j416: it can do trees.13:53
→ project2501a joined13:53
j416 nedbat: then try: git difftool branchA branchB13:53
if you have not configured it to use meld, you can give it flag I think: git difftool --tool=meld branchA branchB13:54
never tried using a difftool in this way.. interesting13:54
I'm guessing it may fail13:54
→ Vikash joined13:54
nedbat j416: it gets half-way: It defaulted to launching meld for me, but it's launching it once for each file, serially. :(13:55
→ bourke_ joined13:55
j416 nedbat: yeah, that's what I would expect13:55
← PawnStar left13:56
j416 nedbat: I don't think you can do tree-diffs that easily13:56
graphically13:56
← bourke_ left13:56
→ brk3 joined13:56
brk3 Whats the syntax to delete a remote branch? Im trying 'git branch -d mybranch' but its saying not found?13:57
nedbat wow, i think this is the first thing that hg does better than svn, and git does the svn way. :)13:57
j416 nedbat: you can check out branchA, then move away the files somewhere (alternatively moving the .git dir and contents to and different empty folder), then check out branchB13:57
→ sou_ joined13:57
nedbat j416: or "cp -a" !13:57
j416 nedbat: can mercurial do this?13:57
nedbat: sure, but that'd copy the .git dir too, if it's large you might want to avoid it to speed things up13:58
nedbat j416: yeah, mercurial knows how to create a temp dir, and then diff the dirs, so you can navigate among files in meld or Beyond Compare.13:58
← brk3 left13:58
← jargon- left13:58
j416 nedbat: that is a cool feature, would you happen to know the exact command in mercurial to do this?13:59
nedbat j416: in my .hgrc, I have: [extdiff]\n cmd.meld= and that's it. Then "hg meld" works like "hg diff"14:01
sitaram j416: http://pastebin.com/um3VWd5i is a program called "git-multidiff" that you can put in your path... I use it sometimes, loosely works like what nedbat described above14:01
nedbat j416: oh, and in [extensions], add "hgext.extdiff="14:01
→ empity joined14:02
j416 nedbat: git has aliases too, you can define 'git meld' if you think that is easier to type than 'git difftool'14:02
← connerk left14:02
← Qpac left14:02
j416 sitaram: cool14:02
sitaram j416: I think charon wrote it first or helped me with it14:03
j416 nedbat: so, 'hg diff branchA branchB' would default to writing those temp dirs?14:03
sitaram hasn't seen him around lately... and Ilari, and doener appears only rarely... such is life14:03
j416 sitaram: I'll check the link when my system is up and running at normal speed again :)14:03
sitaram :)14:04
j416 I'm experimenting with packing14:04
different compression levels and the speed of checkout14:04
nedbat j416: i don't know a way to get "hg diff" to use meld, and not sure if it writes the dirs14:04
sitaram aah... perfect for a weekend!14:04
j416 nothing formalised, just to convince myself not to set core.compression to 9 :)14:04
sitaram j416: I've learnt that that is an asymptotic curve; the defaults are usually ok, except for some really special repos14:05
j416 so far it seems like it's a stupid choice, I'm saving 10% in space or so, but a full checkout takes about double the time14:05
sitaram: yeah, so it seems.14:05
→ afief joined14:06
j416 sitaram: I ran repack over the night, it took a full 8 hours, insane. :D14:06
sitaram j416: you might simply try it with plain gzip on a normal file -- that itself doesn't show much gain on 9 versus the default, IIRC14:06
oh wow14:06
j416 sitaram: yeah, figured I could do that, but it'd leave me wondering if git has some trick up its sleeve that would make a difference :P14:07
→ jbw` joined14:07
sitaram j416: if anything git would make it worse, since after decompression it has to do undelta (for unpack)14:07
err I mean checkout14:07
← jbw` left14:07
j416 it's really a bad choice of test repo, I'm compressing (uncompressed) database backups in a repo with just a single commit. But still, it gives an idea.14:08
→ CBke joined14:08
sitaram how many objects and how similar are they? If there are no commonalities your results may not be representative for normal repos. The delta stuff *will* affect things, I am certain14:09
→ Bass10 joined14:09
kane77 another question about git svn, let's say I have A and B git branches and I develop in B and once in a while I git svn rebase A and merge new changes to B, as a final step I merge B to A and checkout A and run git svn rebase (otherwise git svn would try to dcommit also the merge commits which would fail) and git svn dcommit. Will git be able to figure out what parts it should merge if I do some further work in B and then try to merge it back to A? how?14:09
j416 it is interesting to note though, 7zip took significantly less time (under an hour) to compress the files (total of 5.5 GB), and could compress it to just under 500 MB, whereas a 'git repack -adF --window=250 --depth=250' with core.compression set to 9, would take 8 hours and produce a packfile that is just over 900 MB.14:10
sitaram: I'm not sure how similar they are, no clue in fact. But there should be some similarity, it's backups of the same database structure but with different data in it.14:11
(different from scratch)14:11
sitaram hmm ok14:11
→ sherjilozair joined14:11
neuro_damage how can I see what the diff is on staged commits?14:12
j416 19 objects.14:12
← gavin_huang left14:12
j416 neuro_damage: staged content you mean? in that case: git diff --cached14:12
sitaram j416: 7zip uses LZMA I think, which is different than zlib's deflate14:12
much newer14:12
neuro_damage j416: ty14:12
nedbat is there a reason git hasn't added --staged as an alias for --cached, so that people can stick to just one term?14:13
j416 nedbat: perhaps to avoid confusion with many commands doing the same thing14:13
sitaram: yeah.. kind of saddening. Though I wonder if it would be performance-wise worse, with packing/unpacking all the time14:14
→ Drammer joined14:14
j416 git is a different use case, faster compression/decompression is more important than the size of the compressed data, right.14:14
sitaram j416: I found this in my notes directory, from about 2 years ago: http://pastebin.com/bLJVA0SN14:15
j416 wonders if clicking that will work14:15
j416 tries14:15
→ Soliton joined14:16
banisterfiend sitaram: figured it out yet? :P14:16
j416 hah it did.14:16
sitaram: "space is important AND the file will be decompressed many times"14:16
banisterfiend sitaram: i mean the pushing thing, how does it know the branch to push to14:17
im still baffled14:17
j416 sitaram: I guess git could potentially benefit from using a combination then; lzma for packs, and gzip for fast compressing in day-to-day use14:17
sitaram banisterfiend: oh sorry... I got side-tracked! I think the answer is "all branches get pushed to the corresponding matching branch on the other side if it already exists"14:17
j416 if decompression is on par that is14:17
banisterfiend sitaram: unless a 'push' refspec says otherwise?14:18
sitaram yes14:18
banisterfiend cool14:19
sitaram banisterfiend: I'm trying to find what part of the git push man page actually says this but it's not in *one* place; you have to read back and forth a bit14:20
banisterfiend thanks14:20
← lanthan left14:20
sitaram banisterfiend: oh; got it... it was right there!14:20
banisterfiend: just before the "--all" option is described14:21
← jp42 left14:21
← sherjilozair left14:21
sitaram j416: I think Linus went for maximum compatibility/history. Zlib is not that bad actually, esp for text, I guess14:22
→ sherjilozair joined14:22
← sherjilozair left14:22
→ jfkw joined14:23
← oc80 left14:23
→ n8o-mba joined14:23
j416 sitaram: I guess, yeah. Breaking backwards compatibility would be pretty expensive I presume.14:23
→ brk3 joined14:23
sitaram I guess14:23
→ oc80z joined14:24
brk3 Say I have two branches in git for my android app, myapp-free, and myapp-pro. Would people generally say develop pro features on the myapp-pro branch, or develop all features on master and just merge specific revisions to each?14:24
sitaram I think you should try it on *his* repo (the canonical one for him: linux). But it will be hard to gauge the real effect from outside14:24
outside meaning plain compression, no subsequent delta stuff14:24
j416 sitaram: but, if support for a new compression algo was added _now_ (without actually switching to it), it would be a simple task to switch over in later versions, keeping backwards compatibility with the version of today14:25
sitaram j416: look at it this way: the better the delta stuff works, the smaller the pieces being compressed independently. And we know smaller texts blur the differences between algos14:25
j416 sitaram: yeah. That'd be a good test. My computer is way too slow for me to spend time on doing that stuff right now though, need to upgrade. heh14:26
sitaram: I think LZMA uses delta compression too though14:26
sitaram j416: they all do it *within* their compression schemes. I'm talking about the git-specific one that saves space by reusing bits of other objects when blob-ifying a new one14:27
this is at ahigher level, in some sense14:27
j416 I guess. Maybe it's incompatible, kind of defeats the purpose.14:29
one would have to make a new packfile format that uses bits and pieces of LZMA then14:30
← Drammer left14:30
j416 but I guess, it's not a huge deal14:30
storage is becoming cheaper and cheaper, repos aren't that huge generally14:31
text will still be text14:31
← herdingcat left14:31
→ lanthan joined14:33
← WizardOfNand left14:33
j416 sitaram: a question since you are here, if I wanted to backup an entire gitolite repo collection, would it be sufficient to just take a backup of say, the git user's home dir (where I presume the repos would reside?)?14:33
s/git user/gitolite user/14:34
if I needed to restore, I could just extract those files back into the gitolite user's home dir?14:34
sitaram j416: yeah sure, that should do...14:34
j416 great, thank you14:34
(what's with the ...?)14:34
sitaram j416: from a gitolite point of view, you should also backup ~/.gitolite.rc just for completeness. Maybe even ~/.gitolite -- which contains the log files etc14:35
j416 but that would be in the gitolite user's homedir, would it not?14:35
sitaram j416: yup14:36
j416: in a default install: ~/.gitolite.rc ~/.gitolite ~/repositories -- that should do it14:36
j416 as I understand, all configuration and repos and, everything, is stored in teh gitolite user's home dir, and configuration is done through pushing to the admin repo?14:36
sitaram j416: yes14:37
j416 just great.14:37
perfect. :)14:37
thanks14:37
← rvsjoen left14:37
sitaram you're welcome!14:37
gitolite also supports mirroring14:38
j416 ooooh14:38
realtiem?14:38
→ rvsjoen joined14:38
j416 that is _very_ interesting14:38
for us14:38
← leavittx left14:38
sitaram j416: of course. And gitolite isn't doing much there -- it's git itself. It's basically a post-receive hook with a "git push --mirror" in it14:38
gitolite just makes it easier to setup and switch mirrors14:39
j416: http://sitaramc.github.com/gitolite/doc/mirroring.html14:39
j416 thanks14:39
that saves you a couple of questions :)14:39
← cyphase left14:39
→ NetRoY joined14:39
sitaram :)14:40
j416 sigh, here goes the slow browsing again; might as well stop this repack process and run it over the night instead14:40
→ huli_ joined14:41
sitaram :)14:42
← huli_ left14:43
← seawise left14:43
→ seawise joined14:43
→ jalama joined14:44
→ herdingcat joined14:44
→ xiangfu joined14:45
hyperair xev14:46
oops14:46
→ user99 joined14:46
j416 sitaram: hm, on second thought, this is quite a hassle to set up :P14:47
← Coriolan left14:48
j416 and the server itself should be mirrored (I think) so it shouldn't be a problem14:48
← Vikash left14:48
← nibblebot left14:49
→ canton7 joined14:49
← SimonNa left14:50
← Goopplesoft left14:50
sitaram j416: probably it is; I did it once for an internal project. I myself don't use it. But I know folks in really large 2- and 3-letter IT companies do :)14:51
← jalama left14:51
→ MikhX joined14:51
← herdingcat left14:51
j416 I thought the really large 2- and 3-letter IT companies had proper infrastructure so that they could avoid this hassle14:51
cool feature for those who don't have an offsite-mirrored virtual server park though :)14:52
sitaram j416: look, RAID type mirroring or even expensive EMC stuff is almost always single location. This can mirror *just* the pushes to the other continent you have offices in14:52
j416 other continent is cool14:52
we mirror offsite, but within the city14:52
← brk3 left14:53
sitaram j416: disk-block level mirroring in another country is not easy. Git mirroring makes it workable, because a DVCS is meant to do that anyway14:53
j416 yeah14:54
I can see the use case there14:54
← sechrist_ left14:54
j416 especially if people are going to pull from that mirror14:54
sitaram j416: in fact it's *because* they have all that infra that they're using this mechanism (at least that is what I am told)14:54
j416 sitaram: hmm, that doesn't compile in my head, how so?14:55
it must be for some sharing thing then, it can't possibly be for backup/redundancy, can it14:55
sitaram j416: DR/BC (disaster recovery/business continuity -- big words but they have to live by them)!14:55
j416 hm, well, I guess it is a rather cheap way of keeping a backup14:56
sitaram j416: cheap or not, when you're using a DVCS anyway, it's stupid not to make *it* do the hard work. Theyve already thought through all that, anyway!14:57
← CBke left14:57
← sou_ left14:57
→ Goopplesoft joined14:57
sitaram tell people to change their remotes and life goes on. Or a bit of DNS magic and users dont even know14:57
j416 sitaram: well, think of it this way, if you have the infrastructure that can already do mirroring and that, it can be more a question of maintainability/configuration14:57
a bit like how it's easier to just use a package manager than to compile everything yourself14:58
sitaram plus the slaves can all be read-only mirrors to distribute the fetch load (push should only be to one machine though)14:58
j416 sitaram: it queues the pushes to the mirror I presume?14:58
bremner sadly, no14:58
→ jp42 joined14:59
sitaram j416: my version doesn't but this guy I think has changed it to do so. My version is synchronous14:59
j416 hm ok14:59
← msieradzki left14:59
Goopplesoft Last night, I had a subfolder in my project (gitted) that had its own git properties (connected to a github repo. So I deleted the .git in there. Then I found a .gitignore in there and deleted that too. Went back to the main project, did a "git add ." and a "git commit -a" and it said no changes were found (that subfolder wasnt added) any ideas?14:59
sitaram bremner: easy enough to fix. There was a thread on this some days ago IIRC.14:59
j416 so what would happen if a push is not finished and a new push is triggered?14:59
sitaram j416: doesn't matter. Git handles it. (Not gitolite!!!)14:59
bremner sitaram: yes, just a minor grumble. And synchronous probably should be the default.14:59
j416 ooh14:59
hmm15:00
→ avinashhm joined15:00
sitaram bremner: synchronous is fine if the slaves are in the same building. Otherwise the user waits too long. Let me look at it sometime...15:00
j416: that's what I meant when I said "let the DVCS do the hard work" :)15:01
j416 sitaram: my thought was, what happens if a push is initiated during another push? will that not happen?15:01
Goopplesoft anyone?15:01
j416 (i.e. a new git instance pushing)15:01
Goopplesoft repeat: Last night, I had a subfolder in my project (gitted) that had its own git properties (connected to a github repo. So I deleted the .git in there. Then I found a .gitignore in there and deleted that too. Went back to the main project, did a "git add ." and a "git commit -a" and it said no changes were found (that subfolder wasnt added) any ideas?15:01
→ Katrix56 joined15:01
j416 Goopplesoft: take it easy, if someone knows and feels like helping out, they will15:02
Goopplesoft cool just wanna fix this b4 going out15:02
← Katrix56 left15:02
j416 Goopplesoft: we're not an instant support service, sometimes you'll have to wait a while before there is an answer, if your question is not thattrivial15:03
that trivial*15:03
canton7 does git status mention it at all? it wasn't a submodule, was it?15:03
Goopplesoft ^^15:03
← Adaptee left15:03
Goopplesoft nope15:03
← Phrogz left15:03
Goopplesoft should I do a git init in the folder?15:03
subfolder*15:03
j416: I gotcha15:04
→ munichlinux joined15:04
← RaceCondition left15:05
canton7 Goopplesoft, it's not ignored anywhere else, is it?15:05
→ liquid-silence joined15:05
nedbat if i try to checkout a branch, and get a message about detached head, that means I don't have the branch locally?15:05
Goopplesoft canton7: I did a ls -la of every folder, no git ignore15:06
canton7 .git/info/exclude ?15:06
j416 nedbat: you either checked out a remote branch, or you checked out a commit15:06
sitaram j416: git handles it. See http://permalink.gmane.org/gmane.comp.version-control.git/122670 for a partial explanation (question was asked in another context but really the same: locking)15:07
j416 nedbat: you have the branch, but it's not a branch which you can (should) modify15:07
sitaram: oooh.15:07
Goopplesoft canton7: lemme recheck15:07
nedbat j416: i don;'t want to modify it. if it's just for reading, then I'm ok with detached head?15:07
← dasginganinja left15:07
canton7 Goopplesoft, does git show gitted give anything?15:08
j416 nedbat: perfectly fine15:08
nedbat: in fact, that is the state you will always be if you check out anything but a local branch15:08
nedbat j416: thanks so much for you patience with these questions.15:08
j416 s/be/be in/15:08
Goopplesoft canton7: should I do that in the main folder or subfolder?15:08
j416 nedbat: we have to take care of our new users don't we :)15:08
Goopplesoft nope none of those files15:09
canton7 if i'm correct in thinking that 'gitted' is the name of the subfolder, and it's in the main folder, do it from the main folder15:09
nedbat j416: not everyone on IRC has that attitude, I appreciate it.15:09
← g0bl1n left15:09
j416 nedbat: :)15:09
← aminpy left15:09
Goopplesoft canton7: nothing relevent to that subfolder15:10
← akem left15:11
canton7 (I was looking for a line that starts "+Subproject commit blahblah")15:11
j416 nedbat: you can even start working in that detached state if you should want, and make it into a proper branch when you feel like it. The drawback to working like that is if you check something else out, you have nothing that refers to the chain of commits you made (except for reflog), and they will be pruned after some time.15:11
nedbat: so the preferred way would be to create a branch first (it's as easy to create one as it is to delete it, so why not)15:11
nedbat j416: that's ok, i'm happy with a read-only copy.15:11
canton7 Goopplesoft, my bad, that was pulling up the log. right i think i know what's happened, but one more... git ls-tree HEAD gitted ?15:12
j416 nedbat: it's not read-only per-se, but you get that. ok :)15:12
← dr0id left15:12
nedbat j416: yes, thanks!15:12
j416 nedbat: but you don't have to worry about destroying anything15:12
Goopplesoft canton7: can you put the command in quotes?15:12
→ cherro joined15:12
Goopplesoft so15:13
← MikhX left15:13
← n8o_ left15:13
canton7 "git ls-tree HEAD gitted"15:13
Goopplesoft "git ls-tree HEAD" in the main folder?15:13
→ n8o joined15:13
canton7 (from the main folder)15:13
(assuming gitted is in the main folder)15:13
Goopplesoft ok15:13
← mklappstuhl left15:13
s0undt3ch wereHamster: That hook would need to enforce quota, ie, imagine a repo which has a 500Mb quota, untill that value(du -sh for example) push'es are allowed15:14
Goopplesoft so if I am cd'd in the main folder I dont need that 3rd argument right?15:14
canton7 the 3rd arg is just a filter :)15:14
Goopplesoft so all the subfolders come up15:14
but the folder I am concerned with is a subfolder of one of em15:14
→ coletg joined15:14
Goopplesoft super-super-subfolder15:15
canton7 ah, so the gitted folder is buried quite deep?15:15
j416 ponders; does he actually mean sub-sub-subfolder?15:15
Goopplesoft Mainfolder/a/b/c/d15:15
its at d15:15
canton7 git ls-tree HEAD path/to/gitted15:15
→ sou_ joined15:15
canton7 what i'm after is whether git was treating it as a submodule15:16
Goopplesoft 160000 commit a0bc260c4f6641c26aab0e517d9907d500ece9e415:16
canton7 so yes, it was15:16
right :)15:16
we need to tell git that we're no longer interested in that "submodule"15:16
git rm --cached path/to/gitted15:16
then we can re-add it, as a straight directory15:17
git add path/to/gitted15:17
→ rvsjoen_ joined15:17
j416 (perhaps do something about .git in that subfolder)15:17
Goopplesoft git rm --cached vendor/bundles/FOS/UserBundle15:17
rm 'vendor/bundles/FOS/UserBundle'15:17
canton7 he's already killed the .git folder, i think?15:17
Goopplesoft I did kill the .git15:17
j416 (oh, ok)15:17
canton7 fair point though :)15:18
j416 :)15:18
Goopplesoft AND THERE IT IS!!!! :) :)15:18
canton7 woot! and there was much rejoicing.15:18
j416 will there be cake?15:18
Goopplesoft thanks man15:18
e cake?15:18
lol15:18
canton7 for future reference (for anyone who's interested), if you create a git repo in another git repo, you can git add the sub-repo from the super one, and it'll be treated as a submodule (ie record the commit that the subrepo's on, etc), although there'll be no .gitmodules file15:19
Goopplesoft ok one quick thing?15:19
→ coldboot|home joined15:19
Goopplesoft ah15:19
canton7 j416, we don't dish out lies here :)15:19
← rvsjoen left15:19
Goopplesoft so last thing: last night when I was trying to solve this I did a git add . -f thinking it might work15:19
now all .DS-Store hidden files are in there15:20
j416 canton7: :P15:20
canton7 yeah, cos you added all your .gitignored files15:20
Goopplesoft how can I just remove all hidden files from being tracked15:20
← NetRoY left15:20
canton7 if the commit where you did that isn't public, just rebase -i <sha1 past the commit where you added them> and remove it15:20
j416 Goopplesoft: I keep a global .gitignore for those .DS_Store files, too.15:20
canton7 if it is public, git revert <sha1 of commit where you added them>15:20
j416 handy.15:20
Goopplesoft that wont revert files right?15:21
git keeps me freaking out man15:21
canton7 a 'revert' is a commit that undoes the change from another commit :)15:22
bremner thiago: mind an offtopic query about http://sourceware.org/bugzilla/show_bug.cgi?id=10326 ?15:22
Goopplesoft ah15:22
canton7 kinda like an inverse commit15:22
Goopplesoft honestly "fuck it"15:22
← dinsdale left15:23
→ CAAVLNH joined15:23
thiago bremner: let me look at the report first15:23
bremner thiago: sure, I mainly wondered if you had a workaround.15:23
thiago bremner: yeah, go ahead15:23
bremner: no. Brute-force15:24
→ whitman joined15:24
j416 sitaram: right, so with that reference to the mailing list on concurrent pushes, it boils down to that it won't be a problem because of the way git handles the writing of them, right?15:25
sitaram exactly15:26
j416 cool15:26
→ RaceCondition joined15:26
sitaram j416: and dont forget, this can happen even without mirroring and so on. Just a normal repo on a slow day!15:26
j416 yeah15:26
I guess15:26
s/guess/am certain/15:26
→ joel_falcou joined15:27
→ Gitzilla_M1 joined15:28
← Gitzilla_M1 left15:28
→ Gitzilla_M1 joined15:28
j416 would 'git gc' running on a server cause trouble for concurrent pushes/pulls to the same repo?15:30
thiago no15:30
j416 thanks15:30
I guess it repacks into a temp file, then renames that, and only afterwards kills the loose objects?15:30
thiago yes15:31
at no time is the repository in an invalid state15:31
j416 great15:31
← Gitzilla_M1 left15:31
j416 :)15:31
→ mrtadis_ joined15:31
→ d1b joined15:32
→ BiggFREE joined15:33
← Swimming_bird left15:35
→ glennpratt joined15:35
← mrtadis left15:35
→ pen_ joined15:37
← optixx left15:37
→ optixx joined15:37
→ shiba_yu36 joined15:38
rvsjoen_ → rvsjoen15:39
← EricInBNE left15:40
→ cbx33 joined15:40
→ smolyn joined15:42
→ phr3ak joined15:43
→ kmox83 joined15:43
← zivester left15:43
→ zivester joined15:44
phr3ak i accidentally delete one dir of downloaded files how could i download the missing files with repo command? the repo sync doesn't download the missing files. http://android.git.kernel.org/ anyone could help me please?15:44
← xiangfu left15:45
j416 phr3ak: you mean you deleted files in .git/objects/ ?15:45
phr3ak i think no15:46
← fflush left15:46
j416 phr3ak: does 'git fetch' not get it?15:46
phr3ak i see15:46
← bodom left15:46
j416 phr3ak: 'git fetch', should get any objects you need if you don't already have them, if I did't miss out on something. Did it work?15:47
phr3ak ~/mydroid/system/core$ git fetch15:48
fatal: No remote repository specified. Please, specify either a URL or a15:48
remote name from which new revisions should be fetched.15:48
← fustfick left15:48
← sou_ left15:49
j416 phr3ak: what does "git remote" output?15:49
phr3ak i have .git directory in this directory15:49
git remote15:49
korg15:49
j416 then try 'git fetch korg'15:50
phr3ak no output15:50
j416 oh15:51
→ beiter joined15:51
j416 "17:46 phr3ak: i think no"15:51
I read that as "I think so"15:51
sorry15:51
phr3ak: so what files did you actually delete?15:51
phr3ak i had a toolbox directory with c sources in this dir15:51
j416 ah, I completely misunderstood15:52
← lunks left15:52
phr3ak ~/mydroid/system/core/toolbox15:52
j416 phr3ak: have you other changes that you wish to keep?15:52
phr3ak i'd like to download the missing files again but i don't want delete the already downloaded files because it 6GB15:53
j416 phr3ak: I take it you cloned a git repo, that is inside ~/mydroid/system/core/toolbox ?15:53
→ workmad3 joined15:53
→ dfr|mac joined15:53
→ _iron joined15:54
j416 phr3ak: I understand your problem, but I don't completely follow where your git repo is, or even if it is a git repo15:54
I take it you're inside the working dir of the repo, anyway. So, I ask again, do you have any changes that you wish to keep?15:55
(because there are a few ways you can do what you're asking, some ways perhaps easier than others.)15:56
phr3ak i did 'Install the Repository' section: http://wiki.cyanogenmod.com/wiki/HTC_Wildfire:_Compile_CyanogenMod_%28Linux%2915:56
j416 phr3ak: so I take it you have not done any changes to the repo that you wish to save?15:57
← Dave^|| left15:57
→ Murr__ joined15:57
j416 phr3ak: you just want it like it was when you first cloned it?15:57
→ tore_ joined15:57
→ Dave^| joined15:57
phr3ak yes15:57
j416 in that case15:57
run15:57
git reset --hard15:57
and you should be good to go.15:57
it won't download any new files, you have them already locally15:58
but they live inside .git, packed.15:58
:)15:58
phr3ak: however... I have no idea what that 'repo' command is15:58
phr3ak thank you. yes i know it is not part of git15:59
j416 phr3ak: 'git status' will show you some info by the way, including what you have accidentally deleted.16:00
← Murr_ left16:01
← CareBear\ left16:02
→ CareBear\ joined16:03
phr3ak git reset --hard16:03
HEAD is now at d0b93f4 Merge "Create world readable, system writeable /data/resource-cache."16:03
← yhager left16:03
phr3ak git reset --hard16:03
HEAD is now at d0b93f4 Merge "Create world readable, system writeable /data/resource-cache."16:03
sorry16:03
← zivester left16:03
phr3ak WOW16:03
← munichlinux left16:03
→ munichpython joined16:03
phr3ak toolbox directory appear16:04
thank you!16:04
j416 :)16:04
magi16:04
magic16:04
munichpython → munichlinux16:04
→ zivester joined16:04
→ sebersole joined16:04
← flavius left16:05
→ urkud joined16:06
← kmox83 left16:12
→ cyphase joined16:13
← RaceCondition left16:14
← Corren left16:22
→ Error404NotFound joined16:22
← ModusPwnens left16:24
← zivester left16:27
→ SirFunk joined16:27
→ juangiordana joined16:28
→ mandric joined16:28
← Chib left16:28
← BiggFREE left16:31
→ zivester joined16:31
← n8o-mba left16:32
← Error404NotFound left16:32
→ nibblebot joined16:32
← zivester left16:32
← smolyn left16:33
→ zivester joined16:33
→ rolfb joined16:38
← zivester left16:38
→ d0k joined16:39
→ n1xNc0d3 joined16:39
n1xNc0d3 → muneeb16:40
→ ModusPwnens joined16:40
← emf^ left16:42
→ mDraze joined16:42
→ Opettaja joined16:43
← whitman left16:44
← nedbat left16:45
← tychoish left16:46
→ zivester joined16:46
← muneeb left16:47
→ tychoish joined16:47
→ msieradzki joined16:49
← liquidproof left16:50
→ Octalot joined16:50
← ModusPwnens left16:50
← tychoish left16:52
→ g0bl1n joined16:53
→ tty2 joined16:54
← zivester left16:55
→ rideh joined16:56
→ zivester joined16:56
→ tychoish joined16:57
← tty1 left16:57
→ avsej__ joined16:59
← DarkHouse left16:59
← juangiordana left16:59
← Opettaja left16:59
→ elyos joined17:00
← tty2 left17:01
← avsej_ left17:02
→ tty1 joined17:04
← mDraze left17:05
→ aminpy joined17:06
→ juangiordana joined17:06
← coldboot|home left17:06
→ jpmelos joined17:06
← sebersole left17:08
→ oc80 joined17:11
→ dreiss joined17:11
← afief left17:11
← Risar left17:12
→ aaron joined17:12
← zivester left17:12
aaron → Guest325017:12
→ Risar joined17:12
← oc80z left17:12
← aaronky left17:12
← urkud left17:12
→ tty2 joined17:12
← Vile left17:12
→ Vile joined17:13
← empity left17:13
→ Fullmoon joined17:14
→ zivester joined17:15
← tty1 left17:15
← rolfb left17:16
← aspotashev left17:17
← Murr__ left17:17
→ [intra]lanman joined17:17
← N0va` left17:18
→ trobrock joined17:23
→ ISF joined17:25
← BlindOracle left17:26
← mandric left17:26
→ BlindOracle joined17:26
→ Vampire0 joined17:27
← kpreid left17:28
← Vampire0_ left17:28
← zivester left17:30
→ pl0sh joined17:32
→ zivester joined17:32
→ andrewpthorp joined17:32
← canton7 left17:34
→ pheaver joined17:34
→ leavittx joined17:36
← jpmelos left17:42
← Vampire0 left17:42
← trobrock left17:42
→ Cipher-0 joined17:42
← andrewpthorp left17:42
→ SimonNa joined17:43
→ mnaser_ joined17:44
← leo2007 left17:44
→ novascorpio joined17:46
← mnaser left17:47
← tty2 left17:47
mnaser_ → mnaser17:47
→ fourcolors joined17:47
gjvc p17:47
→ tty2 joined17:48
← tty2 left17:50
← novascorpio left17:51
→ jutaro joined17:51
→ Adys joined17:52
→ andrewpthorp joined17:53
→ dr_lepper joined17:53
← dr_lepper left17:53
→ dr_lepper joined17:53
→ mateobur joined17:54
mateobur Hello17:54
how can I "clone" a repository that's in my own filesystem?17:54
dr_lepper mateobur: just by path, or by using file:// url17:55
in the former case git will create hardlinks17:55
← dstorrs left17:57
→ cccaldas joined17:58
← cccaldas left17:59
← Fullmoon left17:59
→ rvsjoen_ joined17:59
← rvsjoen left18:01
→ Fullmoon joined18:03
→ trobrock_ joined18:03
← nibblebot left18:05
mateobur ah18:05
dr_lepper, I don't want hardlinks18:05
→ mjessome joined18:05
← trobrock_ left18:06
← gusnan left18:07
dr_lepper mateobur: then use file:// url18:08
mateobur ok thanks18:08
→ maestrojed joined18:09
← angelsl left18:10
← andrewpthorp left18:10
→ Corren joined18:11
← jutaro left18:13
→ kpreid joined18:14
→ andrewpthorp joined18:14
← preflex left18:17
→ preflex joined18:17
→ kvanderw joined18:18
→ Xanax joined18:22
→ rcu joined18:22
→ nibblebot joined18:23
← whaley left18:24
→ AvonGenesis joined18:26
→ Luyang joined18:27
AvonGenesis How would I setup .netrc auto authentication on windows?18:27
← rideh left18:28
→ skoop joined18:28
→ MikhX joined18:28
← [intra]lanman left18:29
→ Xisc joined18:30
← andrewpthorp left18:30
→ rideh joined18:31
← mcc left18:32
← mnaser left18:32
← Xanax left18:33
→ Swimming_bird joined18:34
offby1 AvonGenesis: it _might_ be as simple as creating your .netrc in %HOME%18:34
worth a try18:34
banisterfiend offby1: sup daddy18:35
offby1 Roosevelt Sykes and Memphis Slim.18:35
→ Vampire0 joined18:35
banisterfiend u know your shit18:35
→ mcc joined18:35
AvonGenesis offby1: Yes, Ive done that but pushing using git gui still asks for authentication.18:35
offby1 nuts18:36
is that the Cygwin version?18:36
→ ThomasLocke joined18:37
AvonGenesis I am not totally sure, how would I check?18:37
← skoop left18:38
offby1 hmm :)18:38
usually if you have Cygwin installed, you know it, because you installed it yourself18:38
how do you invoke the git gui?18:38
AvonGenesis I installed the git windows package, and it came with it.18:38
jast i.e. msysgit18:39
offby1 hmm18:39
→ HerbMillerJr joined18:39
→ blackops67 joined18:39
→ RaceCondition joined18:39
← jp42 left18:39
→ skoop_ joined18:40
offby1 I'm out of ideas. I actually thought it'd work :-|18:40
HerbMillerJr When I try to make git as a regular user from the repository, I'm getting a GIT-CFLAGS permission denied error. Can anybody point me in the right direction to resolving this?18:40
AvonGenesis Alright, thanks, im currently installing cygwin to see if that will alleviate any problems.18:40
jast HerbMillerJr: what's the exact error?18:40
→ lm-brodo joined18:41
→ ISF_ joined18:41
← brodo left18:42
← ISF left18:45
→ skoop joined18:46
← nibalizer left18:47
→ Xanax joined18:47
skoop → skoop-test18:47
→ bblfish_ joined18:49
→ nibalizer joined18:50
← jailbox left18:51
← SirFunk left18:51
← bblfish left18:51
bblfish_ → bblfish18:51
s0undt3ch anyone knows of a quota enforcement hook?18:54
← AvonGenesis left18:54
← nibblebot left18:55
← SimonNa left18:55
← segher_ left18:57
offby1 s0undt3ch: it's faintly possible that gitolite has something like that18:57
→ savid joined18:57
← Luyang left18:57
s0undt3ch offby1: I'm using gitolite, havent seen one, lemme recheck ....18:58
→ LongBeach joined18:58
savid I have a file that I deleted a long time ago. What's the best way to search through commits to find out when that happened?18:58
→ segher joined18:58
s0undt3ch offby1: nope, gitolite's source code doesn't mention quota18:59
offby1 s0undt3ch: you're in luck -- just ask sitaram :)19:00
s0undt3ch sitaram: around?19:00
offby1 savid: not sure. I think I'd do "git log --all --numstat | egrep name-of-file"19:00
hmm, actually that won't help exactly19:00
s0undt3ch sitaram: know any quota hooks?19:00
ioerror__ savid: maybe `git log -n1 -- my_file.txt`19:01
offby1 savid: Maybe "git log --all --numstat > /tmp/yikes-a-big-log ", then edit that file in my trusty emacs, and just search for the file name. Then search backwards for the beginning of the commit.19:01
offby1 smacks forehead19:01
offby1 or that, yes :)19:01
s0undt3ch sitaram: and by the way, supose you have multiple post-receive hooks, does gitolite handles chaning them?19:01
offby1 didn't know about "-n"19:01
→ pyr0 joined19:02
← pl0sh left19:02
← pyr0 left19:03
← Xanax left19:03
rideh git = add programmers best friend imo19:03
→ akosikeno joined19:03
→ aspotashev joined19:04
CareBear\ rideh : it depends on the programmer19:04
rideh : not every programmer finds git easy to understand19:04
oh well19:04
offby1 my best friend may be my recently-purchased noise-cancelling headphones.19:04
CareBear\ has the idea of virtual hosting in gitweb come up?19:04
offby1 we'll have to see how well they perform in the challenging workplace environment.19:05
← Xisc left19:05
rideh CareBear\: yeah i guess what i'm saying is that if you have attention deficit disorder - git makes it easy to keep moving - even though you are trying to do 10 things at once... preventing errors by keeping each in their own sandbox19:05
munichlinux → JSLint19:05
CareBear\ rideh : that only works when you are able to think structured19:06
skoop-test → skoop19:06
skoop → skoop-test19:06
→ german joined19:06
CareBear\ rideh : lots of programmers just bang on keyboards and hope that shit works19:06
rideh CareBear\: hmm. didn't consider that19:06
offby1 CareBear\: what's wrong with that? ;-|19:06
bremner those are not programmers ;)19:06
\o/ no true scotsman19:06
← electrogeek left19:06
offby1 CareBear\: ok, I'm a tad more sophisticated than that -- I copy other people's code and hope that s*** works :)19:06
CareBear\ haha19:06
rideh and i don't know that i can consider myself a programmer really - more of a enthusiast19:06
offby1 \o/19:06
→ electrogeek joined19:06
offby1 /~\19:06
CareBear\ it's all good19:07
offby1 an Ersatz Scotsman19:07
CareBear\ graham has it right19:07
http://www.paulgraham.com/head.html19:07
offby1 <3 pg19:07
CareBear\ so, virtual hosting?19:07
→ seivan joined19:08
bremner CareBear\: gitweb is just a cgi. How does virtual hosting normally work with cgi?19:08
CareBear\ bremner : the hostname is available19:09
← cherro left19:09
ISF_ → ISF19:09
← cyphase left19:09
offby1 CareBear\: I'm astonished; I don't seem to have read that particular essay before.19:10
rideh i'd seen this before and had lost it - thank you for reconnecting me19:10
CareBear\ offby1 : it's one of my favorites. here are some more: http://peter.stuge.se/essays-by-paul-graham19:11
→ sechrist joined19:11
CareBear\ bremner : I'm thinking something like a .git/virtualhost file where one hostname goes per line, and this repo appears to exist only when the HTTP hostname matches one in the file19:12
this would allow my lazy ass to keep only one directory with repositories yet not neccessarily expose all personal junk at git.libusb.org19:13
bremner CareBear\: well, It seems simpler to me to make a pub directory and make that your gitweb root19:13
← german left19:14
CareBear\ bremner : you misunderstand. I have five or six public groups of repos on that server19:14
bremner where by simpler, I mean possible with existing tools ;)19:14
CareBear\ of course I have private repos too19:14
but they don't even show19:14
bremner ok, but I still think having gitweb scan all repos for each vhost is not the right approach19:14
CareBear\ the point is to tidy up, so that only libusb repos are shown through git.libusb.org19:14
it needs to scan anyway I think19:15
git-daemon-export-ok right?19:15
yes, only stat()19:15
bremner well, it should really have a different directory for each vhost19:15
CareBear\ nay19:15
sitaram s0undt3ch: no quota hooks. Multiple 'update' hooks can be chained; see commit 0d1e05c (v2.0.1). Multiple post-receive is not an issue, since gitolite doesn't use it anyway19:15
bremner CareBear\: ok, well good luck with you solution.19:16
CareBear\ bremner : ECANTTHINKSTRUCTURED19:16
:p19:16
bremner CareBear\: ETOOLAZYTOHELPPEOPLEITHINKAREWRONG19:16
CareBear\ bremner : hah. do you see another more lightweight solution?19:17
(besides using the fs)19:17
→ OOPMan joined19:18
CareBear\ hm19:18
of course there could be tricks with symlinks19:18
in the fs19:18
mh19:19
separate fastcgi crap for every dir19:19
also not so appealing19:19
← mjessome left19:20
CareBear\ hm. I need to go.19:20
thanks for the input!19:20
← JSLint left19:21
← skoop_ left19:21
→ skoop joined19:21
← skoop-test left19:22
← kvanderw left19:22
bremner CareBear\: maybe something projects.list.vhost19:23
savid Ok, so I found a file that was accidentally removed about 20 commits ago. This might sound crazy, but is it possible to make it look like it never happened? That is, I want the file back with commit history and all.19:24
← Juo left19:24
cehteh savid: possible yes but thats a bad idea if the repo is published already19:24
just add it now and be happy19:25
→ lunks joined19:25
savid cehteh, it's a private repo. but you're right, I probably shouldn't be messing up the true history like that.19:26
might cause a tear in the space-time continuum.19:26
← OOPMan left19:26
j416 if I am tracking a branch, and that branch is force-update on the remote; is there a way of updating my local branch so that it reflects the remote? I guess I'm looking for a simpler way to do: git fetch && git reset --hard origin/branch19:26
force-updated*19:27
← mateobur left19:27
← blackops67 left19:30
→ ajt__ joined19:31
→ canton7 joined19:31
← mutex left19:31
← jkyle left19:31
→ wonslung joined19:32
→ mutex joined19:33
→ kst` joined19:33
← crakdmirror left19:33
→ jkyle joined19:33
← babilen left19:33
← lunks left19:34
← shachaf left19:34
→ shachaf joined19:34
← ajt_ left19:34
→ crakdmirror joined19:34
← SerajewelKS left19:35
→ SerajewelKS joined19:35
→ preflex_ joined19:35
← cats4gold left19:36
→ cats4gold joined19:36
→ n8o-mba joined19:36
← kst left19:37
← preflex left19:37
← kassah left19:37
← Bonkers left19:38
preflex_ → preflex19:38
→ bball- joined19:39
→ __main__ joined19:39
← Fudge left19:39
→ yzlin joined19:40
→ Fudge joined19:40
s0undt3ch sitaram: if I create a quota hook, where should I "attach" it?19:40
→ lunks joined19:41
← rideh left19:42
← fourcolors left19:43
← HerbMillerJr left19:45
→ caseymcg joined19:45
→ masando joined19:45
← sechrist left19:46
← aminpy left19:47
→ dstorrs joined19:48
→ LouisJB joined19:49
← dstorrs left19:49
→ sechrist joined19:49
→ sebastorama joined19:49
← ezkl left19:51
cmn s0undt3ch: probably in post-receive19:51
s0undt3ch cmn: we can abort a push in post-receive?19:52
→ babilen joined19:52
→ lunks_ joined19:52
← pen_ left19:52
← lunks left19:53
← lunks_ left19:53
cmn you can deny it from there, I think, yeah19:54
the man page should give much more info on that19:54
→ lunks joined19:54
← lunks left19:55
← lepine left19:55
→ ezkl joined19:56
→ lepine joined19:56
← eno left19:56
→ lunks joined19:56
← JEEB left19:56
→ eno joined19:57
← n8o-mba left19:59
→ drizzd joined19:59
← MavJS left20:00
→ Xanax joined20:02
← elyos left20:04
→ jutaro joined20:05
← drizzd left20:06
← beiter left20:07
→ rvsjoen joined20:08
← Xanax left20:09
→ mjessome joined20:09
← rvsjoen_ left20:10
→ mnaser joined20:10
← rcu left20:10
→ cherro joined20:13
→ liquidproof joined20:13
← BlindOracle left20:14
→ BlindOracle joined20:15
→ andrewpthorp joined20:17
→ HerbMillerJr joined20:18
→ johnw joined20:18
← g0bl1n left20:18
→ gusnan joined20:21
← Dave^| left20:22
→ Dave^| joined20:22
← elliottcable left20:22
← jutaro left20:22
→ Kreative` joined20:25
← Corren left20:27
← robinbowes left20:28
← tore_ left20:30
→ elliottcable joined20:31
← tchan left20:33
→ fflush joined20:33
→ Xanax joined20:33
→ gfto joined20:33
← avinashhm left20:36
necromancer hey so i'm using gitolite20:36
and i was revamping my gitolite.conf, and i think i forgot to commit access back to gitolite-admin20:37
bremner "commit access back to" ?20:37
necromancer so now when i push i get ***** ABORTING ***** bad username necromancer,20:37
i cut it from the top of the document and was going to put it back in the bottom but i forgot before i committed & pushd20:37
pushed*20:38
bremner oops.20:38
necromancer and it gave me that error20:38
yeah haha20:38
whoopsy20:38
bremner do you have server access?20:38
necromancer i do have ssh access20:38
and root to that20:38
bremner so I guess you want to investigate gl-dont-panic20:38
necromancer is there a way i could just "roll back"20:38
what's that?20:38
bremner it's a way to reset access to gitolite-admin20:39
necromancer is that a hook?20:39
bremner no, a script to run on the server20:39
necromancer oh ok20:39
bremner you might double check with "ssh git@server info" to see you really messed up20:40
necromancer well i didn't *really* mess up, because my account still has access to other repos20:41
just not the repo that controls everything =\20:41
bremner keep telling yourself that if it helps ;)20:42
necromancer actually20:42
R W gitolite-admin20:42
there it is..20:42
→ robinbowes joined20:42
bremner well. That is weird. You might need the superpowers of sitaram to debug.20:42
→ kylehayes_ joined20:45
← kylehayes_ left20:45
← caseymcg left20:46
→ kylehayes_ joined20:46
← kylehayes_ left20:46
→ isionous joined20:46
← kylehayes left20:48
→ Vikash joined20:48
→ chrisf|laptop joined20:49
→ icehawk joined20:49
← glennpratt left20:51
→ cyphase joined20:53
← andrewpthorp left20:55
kane77 I have a question about git svn, let's say I have A and B git branches and I develop in B and once in a while I git svn rebase A and merge new changes to B, as a final step I merge B to A and checkout A and run git svn rebase (otherwise git svn would try to dcommit also the merge commits which would fail) and git svn dcommit. Will git be able to figure out what parts it should merge if I do some further work in B and then try to merge it back to A? how?20:59
← dfr|mac left21:00
← Cipher-0 left21:02
← joel_falcou left21:03
→ joel_falcou joined21:03
← mjessome left21:04
← tmz left21:06
← RaceCondition left21:08
→ v4n_ joined21:08
→ joel_falcou_ joined21:09
→ caseymcg joined21:09
← joel_falcou left21:09
joel_falcou_ → joel_falcou21:09
← johnw left21:11
← Goopplesoft left21:12
necromancer bremner: should i message him here or on github or something?21:12
← mnaser left21:13
← zivester left21:14
→ mnaser joined21:14
→ rvsjoen_ joined21:14
bremner necromancer: just be patient. Or send email to the list.21:14
← Xanax left21:15
→ JEEB joined21:15
← mnaser left21:15
→ zivester joined21:15
← rvsjoen left21:17
→ tmz joined21:17
← coletg left21:18
necromancer okay21:20
→ mnaser joined21:20
→ macUzer joined21:20
← mnaser left21:21
← dr_win left21:22
→ p3rror joined21:22
← maestrojed left21:23
← Vikash left21:23
← hyperair left21:24
← quentusrex left21:25
→ smolyn joined21:28
→ maestrojed joined21:30
→ fbass joined21:32
← macUzer left21:33
→ Adaptee joined21:35
→ quentusrex joined21:37
← ThomasLocke left21:37
← fbass left21:38
→ fbass joined21:38
→ rcu joined21:42
← p3rror left21:43
→ jalama joined21:46
→ davzie joined21:47
→ Xanax joined21:47
← dr_lepper left21:47
→ Nuck joined21:48
← tewecske left21:51
← savid left21:53
← juangiordana left21:54
← quentusrex left21:54
← cbx33 left21:56
→ Dave^|| joined21:56
→ p3rror joined21:58
← Dave^| left22:00
← deepthinker82 left22:00
→ mjessome joined22:01
← ISF left22:03
→ Corren joined22:03
→ [intra]lanman joined22:03
← [intra]lanman left22:03
→ [intra]lanman joined22:03
← gusnan left22:04
→ quentusrex joined22:07
→ SirFunk joined22:07
→ mnaser joined22:13
→ diegoviola joined22:14
← gfto left22:15
← quentusrex left22:16
← pdtpatr1ck left22:16
→ Cipher-0 joined22:16
→ blackops67 joined22:17
→ intertzu joined22:18
← sechrist left22:21
→ wirgom joined22:21
← wirgom left22:21
→ Vikash joined22:21
← Xanax left22:24
← HerbMillerJr left22:24
← p3rror left22:25
← shiba_yu36 left22:25
← BlindOracle left22:26
← stamina left22:26
→ stamina joined22:26
← Behi left22:28
← marvin2 left22:29
→ kennethreitz joined22:30
→ marvin2 joined22:31
→ jutaro joined22:32
← aspotashev left22:33
→ yhager joined22:33
← fbass left22:34
→ Xanax joined22:37
← rcu left22:38
← DarthGandalf left22:40
← mnaser left22:40
← Pathin left22:41
← kane77 left22:42
→ BlindOracle joined22:44
← lunks left22:45
→ Murr_ joined22:45
← berserkr left22:46
→ Tavoris joined22:46
← Xanax left22:46
← Tavoris left22:46
← BlindOracle left22:46
← Altreus left22:47
→ BlindOracle joined22:47
→ cesario joined22:48
→ Tavoris joined22:50
Tavoris anyone here?22:50
→ tchan joined22:50
← Tavoris left22:51
→ DarthGandalf joined22:52
offby1 nobody here but us zombie processes.22:53
→ psoo joined22:54
→ gusnan joined22:54
← jalama left22:56
→ johnw joined22:58
→ johnw_ joined22:58
← smolyn left22:59
→ Xanax joined22:59
← johnw left22:59
← [intra]lanman left23:00
→ jeff-h joined23:01
← Cipher-0 left23:01
← banisterfiend left23:02
← paul_andrew left23:02
← johnw_ left23:03
→ guns joined23:03
→ AaronNorris-215b joined23:04
← dreiss left23:05
→ Torsten joined23:07
← Tac_Home left23:07
← Torsten left23:07
→ lunks joined23:07
→ krookeye joined23:07
← squinteye left23:07
→ johnw joined23:08
→ spearce joined23:08
→ [intra]lanman joined23:10
← davzie left23:10
← masando left23:11
← oc80 left23:13
← Vikash left23:13
→ oc80z joined23:14
← Murr_ left23:15
→ Murr_ joined23:15
← spearce left23:15
← thews left23:17
← cherro left23:18
← Murr_ left23:19
→ sechrist joined23:22
→ ProLoser|Mobile joined23:22
ProLoser|Mobile hallo23:22
← Dave^|| left23:23
ProLoser|Mobile i have a question, i have 2 branches and i want to manually go through the differences in each and every file of the 2 branches and make the necessary changes before merging them together. I'm on a mac. Is there a way to do this?23:23
→ Dave^| joined23:23
→ bousquet joined23:23
ProLoser|Mobile I mean I could run git diff branches but that opens vim and i have to open an ide alongside it, is there a third party tool or something that can do this?23:24
→ spearce joined23:25
← johnw left23:26
→ EricInBNE joined23:28
← BlindOracle left23:28
← leavittx left23:28
← AaronNorris-215b left23:28
→ p3rror joined23:28
→ MavJS joined23:29
← orafu left23:29
← MavJS left23:29
→ MavJS joined23:29
→ OuLouFu joined23:29
OuLouFu → orafu23:29
avar why don't you just merge them together?23:30
→ thews joined23:30
avar or diff the two branches before merging?23:30
← maestrojed left23:30
← w0bni left23:31
ProLoser|Mobile i made a 'merging' branch to review another devs changes before i accept them23:31
however i need to make a significant number of changes to his code before i can merge them back in23:31
once i'm done with the changes, i fold the merging branch back into master23:31
avar so diff them to find out what changed, then either put new commits on top to fix his stuff and/or rewrite his commits, then merge23:33
← psoo left23:34
← icehawk left23:34
→ haydenmuhl joined23:36
→ leavittx joined23:37
← Swimming_bird left23:38
← spearce left23:40
← blackops67 left23:40
→ blackops67 joined23:41
← liquidproof left23:42
→ spearce joined23:42
→ maestrojed joined23:42
→ towski joined23:42
→ chrijon joined23:44
← blackops67 left23:44
→ blackops67 joined23:45
← blackops67 left23:46
→ Swimming_bird joined23:46
→ rvsjoen joined23:47
← Swimming_bird left23:48
← maestrojed left23:49
→ maestrojed joined23:49
← chrischambers left23:49
→ aLinux joined23:49
← rvsjoen_ left23:49
aLinux hi23:50
← Xanax left23:50
← haydenmuhl left23:50
← Guest18295 left23:50
→ fp1 joined23:51
← ProLoser|Mobile left23:52
aLinux i dont have ~/.ssh folder, http://help.github.com/linux-set-up-git/23:52
ChanServ set mode: +v23:52
→ Xanax joined23:52
aLinux cd ~/.ssh23:52
→ mDraze joined23:53
fp1 Why is there no 1.7.6 for Mac OS X?23:53
← intertzu left23:53
→ ProLoser|Mobile joined23:54
→ Cody__ joined23:55
← Textmode left23:55
→ __iron joined23:57
← Cody__ left23:59

Logs Search ←Prev date Next date→ Channels Documentation