IRCloggy #git 2012-10-09

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2012-10-09
	→ Esa_1 joined	00:00
	← eletuchy left	00:02
	← jso` left	00:02
	→ elkng joined	00:02
elkng	"Written in C, Bourne Shell, Tcl, Perl" that a strange combination	00:03
	← tureba left	00:03
	← psoo left	00:04
	→ danlentz joined	00:04
	gitinfo set mode: +v	00:05
	← hwrd\|work left	00:07
	← dreiss left	00:07
cmn	no stranger than any other application	00:07
cehteh	classical unix combination	00:07
cmn	but that wouldn't be git, it uses POSIX shell	00:07
cehteh	php, scheme and ada would be strange :)	00:08
	← peterschmidler left	00:08
	→ Trioke_ joined	00:08
	← Trioke left	00:09
	→ Squarism joined	00:10
comps	or prolog	00:11
	← kerrick left	00:11
	← resistivecorpse left	00:13
	→ resistivecorpse joined	00:13
	← Fandekasp left	00:13
	→ jesseFromYVR joined	00:14
	→ tureba joined	00:14
	→ cooloney joined	00:15
	← Chipzz_ left	00:17
	→ Chipzz_ joined	00:17
	← aselder left	00:18
	→ dfc joined	00:18
	Chipzz_ → Chipzz	00:18
	← rubious left	00:19
	→ kerrick joined	00:19
	← jesseFromYVR left	00:20
	→ c98_ joined	00:20
	→ rubious joined	00:21
	← rohan32\|hw left	00:21
	→ joeytwiddle joined	00:21
	← Squarism left	00:23
	← johnny_rose left	00:24
	→ johnny_rose joined	00:24
	→ DofLeFou joined	00:24
	← DofLeFou left	00:24
	← simesy_work left	00:28
	→ eletuchy joined	00:28
	Guest94463 → mariusso	00:29
	← tobo left	00:30
	→ Fandekasp joined	00:31
	→ archdori joined	00:31
	→ chmod\ joined	00:32
	→ derrekito joined	00:32
	→ hwrd\|work joined	00:32
	→ resistivecorpse2 joined	00:33
	← cakehero left	00:35
	← chmod\ left	00:35
	→ alexstanford joined	00:36
	← resistivecorpse left	00:37
	→ Milossh joined	00:37
	→ cakehero joined	00:37
	→ mritz joined	00:37
	SeoZ-work[AWAY] → SeoZ	00:38
	← eletuchy left	00:38
	← cooloney left	00:38
	→ zivester joined	00:39
	← jperry2_ left	00:40
	← mkadin left	00:40
	→ simesy_work joined	00:41
	→ eletuchy joined	00:41
	← Parhs left	00:41
	← gusnan left	00:42
	→ tmcmahon joined	00:42
	← Guest62132 left	00:43
	→ dreiss joined	00:43
	← haydenmuhl left	00:44
	→ nsang joined	00:47
	→ neataroni joined	00:50
neataroni	ive been pushing to github all day, now im getting "You don't exist, go away!" ...why?	00:50
	← nsang left	00:50
	← daniel_- left	00:50
	→ wwwjfy joined	00:50
cmn	and you get that from github?	00:51
neataroni	cmn: actually no, jsut when i get commit -m "blah"	00:51
	and also when i try to pull from github	00:51
cmn	right, when creating a commit, start with that	00:52
	you haven't told git on that system who you are, and your system doesn't know either	00:52
neataroni	cmn: yes, pulling gives me you dont exist too	00:52
	← AlbireoX left	00:52
cmn	right, creatig commits	00:52
neataroni	cmn: why would that happen all of a sudden?	00:52
cmn	your uid is somehow invalid	00:52
neataroni	could git reset --hard have done it somehow?	00:53
cmn	no	00:53
	→ mikepack joined	00:53
cmn	unless you're doing in in a version-controlled /etc	00:53
	→ jesseFromYVR joined	00:53
cmn	see if 'id' can tell you who you are	00:53
thiago	that message doesn't come from Git	00:53
cmn	yes, it does	00:53
neataroni	id in bash gives me some info	00:54
cmn	git help var	00:54
	man git var	00:54
gitinfo	the git-var manpage is available at http://git-scm.com/docs/git-var.html	00:54
thiago	git grep "You don't exist, go away" matches nothing	00:54
	→ cooloney joined	00:54
	→ aselder joined	00:54
cmn	your version is probably too new	00:54
neataroni	yea, its no longer there in latest version i think	00:54
	← johnny_rose left	00:55
cmn	oh, the web manpage is also too new	00:55
neataroni	cmn: so id gives me output, do i care about anything in there in particular?	00:55
	→ johnny_rose joined	00:55
Chipzz	thiago: because it's not a git error message nor an error message of your code?	00:55
thiago	ah, I see it removed in 2f70587502b6b5a8cfda5a3eff54392f48e2db8d (May 21)	00:55
cmn	the GECOS field, which is where your name is, IIRC	00:55
Chipzz	thiago: if I'm not mistaken that error message is an error message of bash	00:55
cmn	but that only gets queried if you haven't told git who you are	00:55
	Chipzz: no, see the conversation	00:56
thiago	Chipzz: it used to come from other sources too	00:56
neataroni	cmn: i dont see a GECOS	00:56
cmn	huh?	00:56
	← tinti left	00:58
neataroni	cmn: was that huh directed at me?	00:58
thiago	$ strings =ssh \| grep "You don't exist"	00:58
	You don't exist, go away!	00:58
	← hwrd\|work left	01:00
cmn	but git-commit doesn't call ssh	01:00
	neataroni: yes	01:00
	← mritz left	01:00
neataroni	cmn: i am using the ssh url for pushing and pulling	01:00
cmn	irrelevant	01:00
	→ Quevin joined	01:01
neataroni	cmn: when i type id into bash, i dont see the string "GECOS" in the output anywhere	01:01
thiago	also found in dotlockfile, kdepasswd, minicom, slogin, talk, userinfo and wall	01:01
	→ _dzonder joined	01:01
cmn	right, it wouldn't have it	01:01
neataroni	cmn: ok. so how do I fix this?	01:02
	← dzonder left	01:02
cmn	by figuring out what the problem is	01:02
	or you can just tell git who you are	01:02
neataroni	cmn: oh. Any idea why it would have forgotten?	01:03
cmn	not without knowing what's happened	01:03
	← kenperkins left	01:03
cmn	your config file could be corrupted or empty due to fs/system crash, deleted accidentally, you somehow unset the options...	01:03
	→ xxthink joined	01:05
neataroni	cmn: interesting. well git config --global user.name "blah" fixed it	01:05
	thank you	01:05
cmn	right	01:05
	← aselder left	01:06
neataroni	that error message is right up there with homebrew's "cowardly refusing install"	01:06
Chipzz	actually I find it quite humorous :)	01:06
	← etcetera left	01:06
thiago	neataroni: the error message comes from when getpwuid(getuid()) fails	01:06
	→ hyperair joined	01:07
	→ mritz joined	01:07
	← quazimodo left	01:07
neataroni	thiago: ok, well whoever wrote that error message was a fool	01:07
Chipzz	no, he had a sense of humor :)	01:07
thiago	neataroni: check by running: getent passwd, if you're still there	01:07
	the error message has a long tradition. It was copied from other tools.	01:07
	→ sente` joined	01:08
cmn	it's well established, and you shouldn't be seeing it in any case	01:09
	→ intripoon joined	01:09
cmn	somehow both git and your system forgot what your name is	01:09
Chipzz	in most cases because your user got deleted somehow	01:09
	→ hwrd\|work joined	01:10
	← _W_ left	01:10
	→ _W_ joined	01:10
Chipzz	if I were you I would try logging in at a console to see if you can still login	01:10
	← aspotashev left	01:10
Chipzz	that git error message might be the least of your worries ;P	01:10
	→ diegoviola joined	01:10
	→ dv310p3r joined	01:11
Chipzz	this doesn't normally just happen. chances are it didn't start occuring by itself, but it started to occur because you fucked up in some big way	01:11
	← hwrd\|work left	01:12
	← ncr100 left	01:12
thiago	that error message only occurs if your user is deleted while you're logged in	01:12
	← jdunck left	01:12
	← intripoon_ left	01:12
	→ xiangfu joined	01:12
thiago	or if the system is misconfigured (LDAP/NIS databases down)	01:12
	→ chaiz joined	01:12
thiago	or any bug that would make that appear to be the case (bug in glibc's NSS)	01:13
Chipzz	neataroni: do yourself a favor and check if you can login	01:13
	→ rchavik joined	01:13
	← rchavik left	01:13
	→ rchavik joined	01:13
neataroni	Chipzz: to what? git pushing pulling and cloning is working ok now	01:13
Chipzz	neataroni: 03:10 < Chipzz> if I were you I would try logging in at a console to see if you can still login	01:14
	→ Yuuhi```` joined	01:14
Chipzz	neataroni: IMO you fixed the symptom, not the problem	01:14
neataroni	Chipzz: true	01:14
	← johnny_rose left	01:14
Chipzz	neataroni: tbh I wouldn't be surprised if you were locked out of your system after a reboot	01:14
	→ johnny_rose joined	01:14
Chipzz	so: do yourself a favor and check if you can login at a console	01:14
neataroni	Chipzz: ok so how do i do what you say?	01:14
Chipzz	ctrl-alt-f1	01:15
	enter username, enter password	01:15
	← Yuuhi``` left	01:15
	← danlentz left	01:15
Chipzz	and I would suggest a) not logging out of your current X session and b) keeping any root terminal (if any) open	01:17
	until you've established that yes, you can log in	01:17
	← thiago left	01:17
	→ rend joined	01:18
rend	I created a new branch, when I push it says everything is updated	01:18
	I'm pushing to github	01:18
	→ mkadin joined	01:18
	→ flippo joined	01:19
	← Lgb left	01:20
neataroni	how do i push from one repo on my local machine, to another repo on my same local machine?	01:20
	← Mocramis left	01:20
	← cooloney left	01:20
cmn	presumably the problem is that git says it's up to date, rather than updated?	01:20
	← kerrick left	01:20
	→ Mocramis joined	01:20
rend	cmn: it didn't push the branch, I remember I had to do something about new branches before pushing them	01:20
	what was it?	01:20
	← Bombe left	01:20
cmn	you have to push them	01:20
	→ hwrd\|work joined	01:20
cmn	see push.default man git config	01:20
gitinfo	the git-config manpage is available at http://git-scm.com/docs/git-config.html	01:20
	← erichynds left	01:21
	← fisted left	01:21
	→ Lgb joined	01:23
CareBear\	neataroni : mkdir /other/repo && git remote add other /other/repo && git push other master	01:23
neataroni	i tried that and it worked! good job git	01:23
	→ quazimodo joined	01:26
	→ Vampire0_ joined	01:28
	← johnny_rose left	01:28
	→ johnny_rose joined	01:29
	→ tyoc213 joined	01:30
	→ apok_ joined	01:30
	→ vitor-br joined	01:30
tyoc213	Hi there, is there a way to show a stage without a name?	01:30
	forget it	01:30
neataroni	how do i push just a folder, or just a file	01:31
	← Vampire0 left	01:31
cmn	you don't	01:32
	← apok left	01:33
	← hwrd\|work left	01:33
	← Chib left	01:33
neataroni	ok, i see that	01:34
	← apok_ left	01:34
	→ Chib joined	01:34
neataroni	now here is a ridiculous question: what if my dev and production repos are initialized at different levels- in my case, the dev repo has a parent directory that the production repo doesnt	01:35
	← codewrangler left	01:35
	← SegFaultAX\|work left	01:35
	← tyoc213 left	01:36
	← jesseFromYVR left	01:36
	← AMfish left	01:42
	→ aspotashev joined	01:42
	→ Bombe joined	01:42
	→ o_Owl joined	01:44
	← hays left	01:45
	→ hwrd\|work joined	01:46
	→ AMfish joined	01:47
	← Davey left	01:48
	← Vert left	01:48
	← mritz left	01:50
	→ SegFaultAX\|work joined	01:51
	→ AlbireoX joined	01:52
	← MacGyver left	01:52
	← AlbireoX left	01:53
	← wwwjfy left	01:53
	→ mikegit joined	01:53
	→ AlbireoX joined	01:53
	← nullbit left	01:54
	→ nullbit joined	01:55
	← AMfish left	01:56
	← JPeterson left	01:56
	← project2501a left	01:57
	← project2501b left	01:57
	→ JPeterson joined	01:57
	← jalama left	01:58
	← AlbireoX left	01:58
	→ project2501a joined	01:59
	← hwrd\|work left	02:00
	← witul left	02:01
	← simesy_work left	02:01
	← resistivecorpse2 left	02:01
	→ resistivecorpse2 joined	02:01
	← juvenal left	02:02
	← BSaboia left	02:03
	→ BSaboia joined	02:03
	→ kermit joined	02:03
	← quazimodo left	02:04
	← SegFaultAX\|work left	02:05
	→ eletuchy_ joined	02:05
	← pgokeeffe left	02:05
	← rubious left	02:05
	→ simesy_work joined	02:06
	→ SegFaultAX\|work joined	02:06
	← c45y left	02:07
	← eletuchy left	02:08
	← mikegit left	02:08
	← plato left	02:09
	← brentratliff left	02:10
	→ Synthead joined	02:13
	← SegFaultAX\|work left	02:13
	← johnny_rose left	02:13
	→ holo joined	02:13
holo	hi	02:13
	→ johnny_rose joined	02:13
	→ project2501b joined	02:14
	→ preben joined	02:14
holo	how do i undo some mistake in .git/config?	02:14
	→ svetlyak40wt joined	02:14
	← LekeFly left	02:15
holo	i know this sounds silly, as it's not versioned, but how problematic it is	02:15
	← SkAzZ left	02:15
milki	nothing you can do about it	02:15
	← project2501a left	02:17
	→ MacGyver joined	02:18
	← MacGyver left	02:18
	→ MacGyver joined	02:18
holo	actually i should have manually versioned it..	02:19
	← Trioke_ left	02:19
holo	with a symlink outside .git	02:20
	→ harish_ joined	02:20
	← tmcmahon left	02:22
	→ mikegit joined	02:23
	← mkadin left	02:23
	gitinfo set mode: +v	02:23
	← mikegit left	02:23
	JakeSays_ → JakeSays	02:23
	← svetlyak40wt left	02:23
	→ jdyin joined	02:24
	→ mikegit joined	02:24
	→ rubious joined	02:25
	← rend left	02:25
	→ Trioke joined	02:26
	→ mkadin joined	02:26
	← dpk left	02:27
	← mkadin left	02:27
	→ jesseFromYVR joined	02:29
	← simesy_work left	02:29
	→ farrioth joined	02:30
	← farrioth left	02:30
	← mikepack left	02:30
	← guampa left	02:30
	← chris64 left	02:32
	← artnez left	02:32
	← sam____ left	02:32
	→ skyf joined	02:34
	← ruskie left	02:35
	← eletuchy_ left	02:35
	gitinfo set mode: +v	02:36
mikegit	I'm trying to turn off automatic merges (to mark everything as a conflict no matter what) --- I've worked on .gitattributes file, and various settings like --no-ff and --no-commit and I can't seem to turn off the auto merging... Shouldn't that be a pretty simple setting? What am I missing.. if anyone can give advice, thank you in advance.	02:38
	← orafu left	02:40
	→ orafu joined	02:40
	← SegFaultAX left	02:42
SethRobertson	octopus is documented as trying less hard to automatically merge	02:42
	Ah, merge.<driver> may be what you want, mikegit	02:43
	← codertux left	02:43
	→ codertux joined	02:44
	← SethRobertson left	02:45
	→ SethRobertson joined	02:45
	← steveoliver_ left	02:45
SethRobertson	If %O is different from any %B, then exit non-zero	02:45
	← jobin left	02:46
	→ steveoliver_mobi joined	02:46
	→ josePhoenix joined	02:46
josePhoenix	Hello all	02:46
gitinfo	josePhoenix: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	02:46
	steveoliver_mobi → stvlvr	02:47
	← stvlvr left	02:47
josePhoenix	I'm trying to set up a workflow where I push to a branch called 'staging' on GitHub, then pull from it on my staging server... but I seem to be getting tangled up in branches and remotes	02:47
	I added a remote named github but I'm not sure how to update and checkout the staging branch from it	02:48
	→ irqq joined	02:48
josePhoenix	Hum. Might have just figured it out	02:49
	So if I do git checkout --track github/staging, will the working directory update when I do git fetch github?	02:49
	→ replore_ joined	02:49
	→ LucasTizma joined	02:50
	← skyf left	02:50
milki	josePhoenix: fetch does not update working dirs	02:50
	since you did tracking, you can either do git pull github or git merge	02:50
	josePhoenix: pull = fetch+merge	02:51
josePhoenix	ahhh gitcha	02:51
	*gotcha	02:51
	Since this is living on the staging server it shouldn't have any local edits.. but is there a way to tell git pull to discard them if there are?	02:52
	← CollinPDX left	02:52
	→ CollinPD_ joined	02:52
milki	you can run a git clean before you run git pull	02:52
josePhoenix	ah, never knew about that command	02:53
	thanks!	02:53
	→ AlbireoX joined	02:53
	← nlpplz left	02:53
	← TheFuzzball left	02:53
	→ zhouxiukun joined	02:53
milki	josePhoenix: most common flags for clean are -fdx i think	02:53
	→ daniel-s joined	02:54
	→ fisted joined	02:54
	← glennpratt left	02:54
	→ nlpplz joined	02:55
	→ wwwjfy joined	02:56
	→ TheFuzzball joined	02:56
	← AlbireoX left	02:56
	← flippo left	02:57
	→ AlbireoX joined	02:57
EugeneKay	josePhoenix - !deploy may be of interest	02:57
gitinfo	josePhoenix: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html	02:57
	→ sluther joined	02:57
	→ axl_ joined	02:58
	→ ammbot_ joined	02:58
	→ simesy_work joined	02:59
josePhoenix	EugeneKay: I'm really just using it as a transport... Fabric is doing the heavy lifting	03:00
	← nedbat left	03:01
	← PCChris left	03:01
	← AlbireoX left	03:01
	← adamben left	03:02
	→ simesy_w_ joined	03:03
	→ ruskie joined	03:03
	← simesy_work left	03:03
	→ setmeaway joined	03:03
	→ c45y joined	03:03
	→ alexisabril joined	03:05
	← preben left	03:05
	→ LekeFly joined	03:05
	← replore_ left	03:05
	→ gavin_huang joined	03:07
	← simesy_w_ left	03:07
	→ ReekenX joined	03:08
	← harish_afk left	03:10
	← hyperair left	03:10
	← ammar left	03:12
	← reikalusikka left	03:12
	← kirin` left	03:12
	→ ammar joined	03:12
	← sejo left	03:12
	→ sejo joined	03:12
	← fuller left	03:12
	← Feh left	03:12
	← soiledpants left	03:12
	← dj_tjerk left	03:12
	→ ammbot__ joined	03:12
	→ Feh joined	03:12
	→ soiledpants joined	03:12
	→ fuller joined	03:12
	→ reikalusikka joined	03:12
	← ammbot_ left	03:12
	← yann\|work left	03:12
	fuller → Guest21763	03:13
	← Kicer86 left	03:13
	→ Kicer86 joined	03:13
	→ kirin` joined	03:13
	→ dj_tjerk joined	03:14
	→ simesy_work joined	03:14
	→ bicyclesuv joined	03:14
	→ artnez joined	03:14
	→ hyperair joined	03:14
	← knoch left	03:16
	→ black_13 joined	03:17
	← jamietech left	03:18
	← heytrav left	03:18
	← kpreid left	03:18
	→ jamietech joined	03:18
	← kirin` left	03:19
	→ knoch joined	03:20
	→ heytrav joined	03:20
	→ kirin` joined	03:20
	→ lkthomas joined	03:21
lkthomas	hey guys, how could I git pull specific version of repo ?	03:21
	→ Adys_ joined	03:21
	← devinrhode2 left	03:22
	← Adys left	03:23
	← kirin` left	03:25
mikegit	SethRobertson: thank you for responding! sorry for my delay...just got back to computer... I happened across the merge.<driver> numerous times but it seemed ominous to me at the moment... but with your suggestion I will focus on that .. thank you again.	03:25
SethRobertson	lkthomas: git cannot. You fetch the repo and then checkout the version you want. Same effect, kina	03:26
	→ yann\|work joined	03:26
mikegit	SethRobertson: also thanks for the octopus comment...... that helps focus my search for a solution as well.	03:26
	→ kirin` joined	03:26
	→ resistivecorpse joined	03:27
lkthomas	anyone ?	03:27
	how could I get older version of commit ?	03:28
SethRobertson	lkthomas: You mean, anyone besides me? What did you dislike about my answer?	03:28
	→ Freeder joined	03:28
Freeder	Hi - whats the proper way to rename a file already commit'd to git?	03:28
SethRobertson	Freeder: `git mv` is one way	03:29
	→ jdunck joined	03:29
Freeder	thanks. for bonus points, can I do it from the git plugin for eclipse? :)	03:29
	← resistivecorpse2 left	03:29
SethRobertson	Worse comes to worse, add the new name and delete the old. I'm not an eclipser	03:30
	→ sjuxax joined	03:30
EugeneKay	Probably. Not many of us use Eclipse/JGit.	03:30
SethRobertson	(that's what git-mv does behind the scenes)	03:30
lkthomas	sorry, I miss the answer	03:31
sjuxax	Hello. I'd like to bundle commits affecting only a specific file. git bundle create product.bundle master -- cron/product.rb does not seem to work, though its equivalent works to rev-list. I get: warning: ref 'master' is excluded by the rev-list options; fatal: Refusing to create empty bundle. rev-list returns a list of commit hashes.	03:31
	← irqq left	03:31
	→ spyro joined	03:32
lkthomas	SethRobertson: what's the exact instruction for reverse back to older version of repo ?	03:33
	→ donri joined	03:33
Freeder	thanks all	03:34
	← Freeder left	03:34
EugeneKay	lkthomas - you appear to be misunderstanding how git's object model works. You clone an entire repo, which normally gives you the "default" branch checked out(typically 'master'). From there you can check out a branch which is at a different revision, or check out the revision you want.	03:35
	← DancingBear left	03:35
	→ DancingBear joined	03:35
EugeneKay	lkthomas - clone is all-or-nothing. There is no way to get just a single commit with the standard git stack. Some git hsoting services(such as github) will let you get a tarball of a given commit, but that is not part of `git`.	03:36
	This is in stark contrast to SVN & other CVCSes, because git is not SVN.	03:36
lkthomas	ok	03:36
	I god the tarball	03:36
	got*	03:36
	← LucasTizma left	03:37
SethRobertson	lkthomas: What? tarballs are pretty much the opposite of git. If you have the git history, you just `git checkout <SHA1>` or branchname or tagname or something like that.	03:37
frogonwheels	EugeneKay: you can get a tarball of a given commit on a remote repo with git archive --remote afaict - which is cool .	03:38
SethRobertson	For newer git-server versions which allow this.	03:38
lkthomas	I am completely lost	03:38
EugeneKay	frogonwheels - does that permit you to get an arbitrary SHA? Or just a ref? Or what? And I have to imagine that the remote git-send-pack needs to be new enough - that option is new to me.	03:39
frogonwheels	lkthomas: Have you cloned a repo?	03:39
	→ svetlyak40wt joined	03:39
lkthomas	I did but I done something wrong with the git and cause some problem	03:39
frogonwheels	lkthomas: !doesntwork	03:40
gitinfo	lkthomas: Sorry to hear it doesn't work. What happened? Did it fall asleep on your couch, with your sister? Eat your homework? What did you want it to do? What happened instead? Please be specific!	03:40
lkthomas	git pull	03:40
	You asked me to pull without telling me which branch you	03:40
	want to merge with, and 'branch.8faeeccfeb9301027da7e57b0a1eaad23680ed35.merge' in	03:40
frogonwheels	lkthomas: ok. well you don't want to 'pull' an old commit.	03:40
lkthomas	ok, what should I do now then ?!	03:40
frogonwheels	lkthomas: you already (most likely) have all the information about your history on your local disk.	03:41
lkthomas	ok, then ?	03:41
frogonwheels	lkthomas: that depends on what you are doing.	03:41
	lkthomas: Do you want to just try and compile/run an older commit (the whole thing) .	03:41
	← vitor-br left	03:41
frogonwheels	lkthomas: do you want to just grab an older version of a particular file?	03:41
lkthomas	older version, full tree	03:42
	whole thing	03:42
frogonwheels	lkthomas: Do you plan on modifying it?	03:42
lkthomas	no	03:42
	I am a user, not a programmer	03:42
frogonwheels	lkthomas: git checkout {sha1}	03:42
	→ svetlyak40wt_ joined	03:42
lkthomas	git checkout 8faeeccfeb9301027da7e57b0a1eaad23680ed35	03:42
	Already on '8faeeccfeb9301027da7e57b0a1eaad23680ed35'	03:42
EugeneKay	Tada, you're done.	03:43
frogonwheels	Ok. then your tree is already at that point.	03:43
lkthomas	LOL	03:43
frogonwheels	lkthomas: does 'git status' show any modifications?	03:43
lkthomas	yes,	03:43
	← svetlyak40wt left	03:44
frogonwheels	lkthomas: did you make them?	03:44
	lkthomas: do you want to keep them?	03:44
lkthomas	"keep them" ?	03:44
frogonwheels	lkthomas: do you want to just get rid of those changes?	03:45
	→ wolftankk joined	03:45
lkthomas	I don't know what are you talking about, my objective is to reverse to specific version and compile	03:45
frogonwheels	lkthomas: how about !pastebin what the output of git status is ?	03:46
gitinfo	lkthomas: [!paste] Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.	03:46
josePhoenix	Hmm.	03:47
	Not sure how this happened but one of my files seems to have ended up in the master branch... and is no longer	03:47
	A db migration says it's been applied but does not exist on disk	03:47
	How would I go about looking for it?	03:48
	→ sangi joined	03:48
lkthomas	error: Entry 'ADL/adl_sdk.h' would be overwritten by merge. Cannot merge.	03:49
	trying to checkout older version	03:50
	how could I force merge ?	03:52
	← donri left	03:53
offby1	lkthomas: rm ADL/adl_sdk.h ; git merge whatever	03:53
frogonwheels	lkthomas: YOu probably just want to git reset --hard before you checkout the other version	03:54
lkthomas	heh, I did -f to force merge :)	03:54
frogonwheels	lkthomas: that will get rid of all differences between what's in your tree, and the version you have checked out	03:54
lkthomas	I redo it	03:55
	← elkng left	03:57
	→ ak5 joined	03:58
	→ ewet joined	03:58
lkthomas	http://pastebin.com/EY6b1eUa	03:59
	nevermind	03:59
	please ignore	03:59
ak5	hi #git, I'm still trying to wrap my head around the concepts behind git. I have a project based on a project hosted on github, that needs to stay uptodate with their release version. I cloned them, did checkout -b release origin/release and now have my own dev branch which is a branch off that release branch (their master doesn't interest me). Can I store all of this in my own gitolite server?	04:01
	← axl_ left	04:01
	→ flippo joined	04:02
lkthomas	thanks guys	04:02
	← bicyclesuv left	04:03
	← ewet left	04:03
SethRobertson	ak5: Yes	04:03
	→ ewet joined	04:04
	→ derpops joined	04:04
ewet	hi, is anyone aware of a simple way to use git as a minimal scm system? it basically be used to track some /etc stuff, some stuff in /home and /usr/local ... I don't know if putting .git in root is a good idea ...	04:05
offby1	ewet: it's dicey	04:05
	git doesn't preserve permissions (much), but they're crucial for many of those files	04:05
	there's a nice project called etckeeper that does some of what you want	04:06
milki	ewet: also !vcsh	04:07
gitinfo	ewet: https://github.com/RichiH/vcsh -- version control shell - manage dotfiles using git's fake bare repos to put more than one working directory into $HOME	04:07
milki	well, i guess its not /etc	04:07
	ewet: confman does svn for config files	04:07
	→ AlbireoX joined	04:07
milki	then theres also those management systems like puppet	04:07
	and chef	04:07
ewet	offby1: oh I think I remember seeing etckeeper	04:08
	milki: I was thinking chef and the likes would be too big but maybe ...	04:08
frogonwheels	ewet: dotfiles	04:08
	!dotfiles	04:08
gitinfo	There are various issues associated with keeping dot-files in git (permissions, avoiding having a .git in ~/ or /). One attempt to manage this is http://dotfiles.github.com/	04:08
milki	ya dunno	04:08
	i havent looked into them for simple things like dotfiles	04:09
	but that has piqued my interest now	04:09
	i need to learn how to use them anyways	04:09
offby1	I use plain git for stuff in my home directory. Got a crufty handmade script to fix up the symlinks.	04:10
	Got a condo made-a stone-a.	04:10
	← jesseFromYVR left	04:10
milki	o.O	04:10
	a condo made of stone?	04:10
ewet	frogonwheels: thanks, will look into it - github usually employs minimal solutions	04:11
milki	ive used rsync and havent noticed much in terms of permission issues	04:12
	maybe i should pay more attention to the files...	04:12
	rsync wont change permissions of the original file right?	04:12
	← WillMarshall left	04:13
cehteh	original as in source from where you copy?	04:13
	← alexisabril left	04:13
milki	destination	04:14
cehteh	for that it has different options and actually may change permisions	04:15
milki	hmmm	04:15
cehteh	and i wonder how it does with --link-dest	04:15
	← simesy_work left	04:15
milki	maybe i should verify the permission of my etc files then...	04:15
offby1	milki: you, sir/madam, are either not an American, or under the age of 40, or both.	04:15
cehteh	because i use that for my backups but didnt checked that	04:15
milki	offby1: most people say i live under several rocks	04:16
offby1	or that.	04:16
cehteh	milki: --fake-super comes also handy, when your FS supports xattrs	04:16
	← Akufen left	04:17
milki	whoa	04:17
	cooool	04:17
cehteh	doing backups as any non root user	04:17
milki	backups!?	04:17
cehteh	for me :)	04:17
offby1	http://en.Wikipedia.org/wiki/King_Tut_(song) if you don't mind it being spelled out	04:17
milki	sounds like a pop culture thing	04:18
	→ simesy_work joined	04:18
milki	yup, singer actor	04:18
	← BSaboia left	04:19
	← ISF left	04:19
	→ private joined	04:20
ewet	okay I'll carry your ideas home. i think i#ve been through this before ... thanks offby1, milki, frogonwheels	04:20
	private → Guest31345	04:21
	→ cooloney joined	04:21
	← cooloney left	04:21
	→ cooloney joined	04:22
	→ xxc_michael joined	04:22
	← black_13 left	04:22
	→ Parhs joined	04:28
	← cakehero left	04:29
	← ewet left	04:29
	← simesy_work left	04:29
	← nerp left	04:32
	→ SegFaultAX\|work joined	04:34
	← resistivecorpse left	04:35
	→ resistivecorpse joined	04:35
	← Parhs left	04:37
	→ pretty_function joined	04:37
	→ danlentz joined	04:38
	← madewokherd left	04:38
	← pretty_function left	04:38
	→ pretty_function joined	04:38
	→ beautifulmind joined	04:39
	← NfNitLoop left	04:40
	→ NfNitLoop joined	04:40
	→ Trioke_ joined	04:41
	← cooloney left	04:41
	← Trioke left	04:44
	← Trioke_ left	04:45
	← danlentz left	04:49
	→ hoschi joined	04:53
	→ jesseFromYVR joined	04:54
	← ReekenX left	04:54
	← imachuchu left	04:56
	← jesseFromYVR left	04:56
	→ Trioke joined	04:57
	→ bubbles10101 joined	04:57
	→ ReekenX joined	04:57
	← dreiss left	04:58
	→ project2501a joined	04:58
	→ simesy_work joined	04:59
	← simesy_work left	05:00
	→ simesy_work joined	05:00
	→ quazimodo joined	05:02
	← hyperair left	05:02
	← ReekenX left	05:03
	← _huoxito left	05:04
	← simesy_work left	05:05
	→ k-man joined	05:06
	→ ReekenX joined	05:06
k-man	i've got a small project i want to put on github, trouble is the git commit history is probably full of private info. I'd like to just create a fresh repo and put that on github	05:07
	→ thirdknife joined	05:07
k-man	should i just copy the files to a new directory and git init; git add?	05:07
EugeneKay	k-man - that is what I would do. If you want to be able to cherry-pick from the old history to the new(within the same repo) you can create an !orphan branch and then only push that one to github	05:08
gitinfo	k-man: To create an orphaned branch(unrelated to existing history): `git checkout --orphan newbranchname`. This will leave your index/worktree as-is(use `rm .git/index; git clean -dfx` to delete EVERYTHING). If you get 'error: unknown option `orphan`' see !orphan_old. For an empty/null commit see !orphan_null.	05:08
EugeneKay	But 'git commit -a -m "Import project FooBar"' is a lot easier ;-)	05:08
	→ Liquid-S_ joined	05:09
	← Liquid-S_ left	05:09
	→ Liquid-Silence joined	05:10
	← Liquid-Silence left	05:10
	→ Liquid-Silence joined	05:10
	← khmarbaise_ left	05:12
k-man	thanks EugeneKay	05:12
	← Quevin left	05:12
	→ hwrd\|work joined	05:12
	← flippo left	05:13
	← osmosis left	05:13
k-man	i don't think the history is really that interesting	05:13
	← derpops left	05:14
	← kryl99 left	05:16
	← Goplat left	05:18
	← undecim left	05:19
	→ shruggar joined	05:19
	← jargon- left	05:21
	→ kryl99 joined	05:22
	← gavin_huang left	05:22
	→ fornext joined	05:23
	→ thiago joined	05:23
	← AlbireoX left	05:23
	→ AlbireoX joined	05:24
	→ macrover joined	05:24
	← beautifulmind left	05:24
	→ cobra-the-joker joined	05:24
	→ simesy_work joined	05:25
	→ cakehero joined	05:25
	← aristidesfl left	05:25
	→ aristidesfl joined	05:27
ak5	so when I do checkout -b stable-branch origin/1.0-branch, and the next stable version comes out at 2.0-branch, can I rebase my branch stable-branch to origin/2.0-branch	05:27
	is that how I am supposed to do it?	05:27
	→ maxandersen1 joined	05:27
	→ apok joined	05:27
	→ pantsman joined	05:27
	← pantsman left	05:27
	→ pantsman joined	05:27
	→ beautifulmind joined	05:27
	← AlbireoX left	05:28
frogonwheels	ak5: that would certainly work. assuming your stable-branch stuff is not pushed anywhere.	05:29
ak5	frogonwheels: that is pushed to my own gitolite server	05:29
	also, can I do that with my local 'master' to keep it clean for me?	05:30
frogonwheels	ak5: if it is, you can still do it, but I would sggest a name change first.	05:30
	← maxandersen left	05:30
frogonwheels	ak5: for example you could git checkout -b stable-branch-2.0 && git rebase origin/2.0-branch	05:30
ak5	yes	05:31
	is there any way to do this with master?	05:31
	it would be super clean for me	05:31
	← Chib left	05:31
ak5	why do you suggest the name change?	05:31
frogonwheels	ak5: I'm reading between the lines a bit here, and making assumptions about waht you've done.	05:32
ak5	frogonwheels: I am actually playing with git to figure it out :D	05:32
frogonwheels	ak5: if you've pushed something to even a local repository, presumably with some of your own changes, then you may want to keep that as it is, and make a new branch with those same changes to the new upstream branch	05:33
	→ skul joined	05:33
frogonwheels	ak5: there are many, many ways to skin this particular cat.	05:33
ak5	frogonwheels: I will never have write access to this repo	05:33
	on github	05:33
frogonwheels	ak5: You may, 'cause you might just fork it into your own version of the github repo, and push it to your own forked version, and do pull requests..	05:34
	→ elkng joined	05:34
	→ _iron joined	05:34
ak5	frogonwheels: can you check it out? It is wordpress on github: https://github.com/WordPress/WordPress/tree/3.4-branch	05:34
frogonwheels	ak5: and you've make changes to it?	05:34
	or you want to?	05:34
ak5	I have not, but will	05:34
	that branch is their 'stable' version	05:35
	← patie left	05:35
ak5	'master' branch is for dev	05:35
	I want my master to be their stable and I will rebase as I go along (so if 3.5 comes out I rebase, etc.)	05:35
frogonwheels	ak5: 'master' is only a name. you can all yours ak5/master for example	05:35
ak5	i see	05:35
	→ Quevin joined	05:36
frogonwheels	ak5: if by 'master' you mean 'default branch' then you can change what the default branch is for a clone.	05:36
ak5	and if I want to change it later on?	05:36
frogonwheels	ak5: change the default branch you mean?	05:36
	← Quevin left	05:36
	→ donri joined	05:36
ak5	yes	05:36
	so if they move their stable version to a new branch, say 3.5	05:37
	I have a clone of 3.4 with changes	05:37
	I can rebase some way?	05:37
	← macrover left	05:37
frogonwheels	ak5: yep. you can rebase your changes. personally I'd use a new branchname for the 3.5.	05:38
	ak5: just because you've rebased a bunch of commits, doesn't mean you can't keep the original commits with a different (or the original) branch name	05:38
ak5	frogonwheels: can you walk me through this here? How do I clone something with a branch being default other than master	05:39
	→ cooloney joined	05:39
ak5	frogonwheels: I see	05:40
frogonwheels	ak5: just google gitolite change default branch	05:40
ak5	ok	05:40
	← quazimodo left	05:40
	→ jargon- joined	05:40
ak5	frogonwheels: is there any way to do it from github? checkout their 3.4 branch?	05:40
frogonwheels	ak5: when you clone, you can simply git checkout 3.4	05:41
	err.. git checkout 3.4-branch	05:41
ak5	I need to do git checkout -b MYNAME origin/3.4-branch for some reason, though	05:41
frogonwheels	ak5: cloning gives you a copy of the whole repo, with all history..	05:42
	ak5: if you do git checkout 3.4-branch then the firt time it will set up 3.4-branch to track origin/3.4-branch automagically	05:42
	→ anish[1] joined	05:42
frogonwheels	ak5: otherwise you can use git checkout -b mylocalname origin/3.4-branch sure..	05:42
ak5	frogonwheels: ok	05:43
	I am testing this :)	05:43
	→ skyf joined	05:43
	← ammbot__ left	05:44
	← harish_ left	05:44
	← aspotashev left	05:44
ak5	frogonwheels: so with git checkout 3.4-branch it doesn't track changes?	05:44
	from origin?	05:44
	→ harish joined	05:45
	← jdunck left	05:45
k-man	its amazing how much it makes you clean up your code when you decide to release it for the first time	05:45
ak5	ok it does	05:45
	ok, I think I get it now	05:45
	→ thierryp joined	05:45
	→ angelsl joined	05:46
	→ jdunck joined	05:46
	← thiago left	05:47
	→ spectrum1 joined	05:48
ak5	so now I can just create a new branch off of 3.4 and when I upgrade that branch to 3.5 with git checkout -b 3.5-branch && git rebase 3.5-branch my_branch_of_3.4-branch	05:48
	frogonwheels: is this correct?	05:48
	→ patie joined	05:49
	← elkng left	05:50
frogonwheels	ak5: i'd call it something like ak5/3.5-branch so git checkout my7_branch_of_3.4-branch && git checkout -b my_branch_of_3.5-branch && git rebase origin/3.5-branch	05:50
	→ hyperair joined	05:50
	→ jesseFromYVR joined	05:51
	← chaiz left	05:52
	← cobra-the-joker left	05:52
	→ cobra-the-joker joined	05:52
mikegit	Anyone know how to force Conflicts on merging local branches? Seems like it should be a simple option, but I can't seem to do it... looked into merge.drivers, etc... But, #1) I either want to manually review all merging as it's happening (no auto merging) OR at the very least see what changes occurred... I'm quite confused why this isn't an easy capability to turn off....	05:54
	← shruggar left	05:54
mikegit	(the auto merging, I mean)	05:54
	→ Lord_DeathMatch joined	05:54
milki	mikegit: is git diff not good enough?	05:55
_ikke_	milki: there is no such thing as automerging	05:55
	The computer is either merging, or it is not	05:55
mikegit	milki: well, by that point, isn't it already merged in? I mean I could put --no-commit flag I guess......	05:55
neataroni	lets say my local repo has everything that a remote repo does, but some extra stuff to- is there a way to pull from remote so that it gets rid of local stuff not in remote?	05:55
mikegit	Well, yea.. but, during "conflicts" it doesnt' merge, and I have to then use git mergetool to resolve that with p4merge, or meld or some other merging tool with a gui... etc..	05:56
_ikke_	neataroni: No, that's not what pull is for	05:56
milki	mikegit: you wont have conflict markers for things that dont conflict	05:56
neataroni	_ikke_: sorry, i dont mean pull necessarily, i just mean, is there a way to do that	05:56
_ikke_	neataroni: Why do you want / need that	05:56
mikegit	I just want it to not even try to merge things it thinks it can resolve... and just leave it up to me 100% of the time,... similar to situations where it already is marking certain things unresolvable and I have to take care of it anyway.	05:56
neataroni	_ikke_: i have a bunch of shit in my local repo that i dont want there	05:57
milki	mikegit: are you trying to review the merge first?	05:57
mikegit	milki: yes yes... I want to review the merge first ... exactly.... just like if I did this "git merge otherbranch" (then was warned of conflicts on some files) then I run "git mergetool" and resolve the conflicts...	05:57
milki	review tools like gerrit make you finalize the merge before reviewing	05:58
mikegit	I want all difference files to just be marked as "conflict" status or whatever you call it... so I can just use mergetool myself... I don't want git to auto-resolve at all..	05:58
milki	why cant you bring your branch to the state you want to merge?	05:59
mikegit	maybe I'm totally missing a key element here... but it boggles my mind there isn't a flag or something like "--no-auto-merge" or something...	05:59
	Tectu → Tectu\|fork	05:59
neataroni	_ikke_: is there a way to do what i want to do, or should i just manually delete the files?	05:59
milki	thats because thats not what merge does	05:59
_ikke_	mikegit: you want a 2 way merge instead of 3 way	05:59
milki	it WILL merge things that dont conflict and then show conflict markers for things it cant do	06:00
	so you dont want to use the merge command	06:00
	← _iron left	06:00
milki	you sort of want a tool that selectively applies diffs	06:00
mikegit	_ikke_: ahhhhh .... ok.. my eyes are opening to my failure in understanding Git .................... so I want a 2-way merge? how do you activate that? I finally got my p4merge all configured in .gitconfigure, etc.... never came across 2-way yet.	06:01
	searching docs now....	06:01
milki	analogo would be like a git add =[	06:01
	er	06:01
	-p	06:01
	hmmm	06:01
_ikke_	milki: afaik, git doesn't support 2-way merges	06:01
	mikegit: *	06:02
	neataroni: What branch are you talking about?	06:02
	→ jaseemabid joined	06:02
mikegit	ohhhhh... ok........ I think I see.............. if I have a "new branch" (blank ... empty.. etc) Then I can simply merge an existing branch into it and that might be considered 2-way ? But, 3-way means I'm merging 2 branches that have been worked on ... so, I think I still want 3-way merge..	06:02
neataroni	_ikke_: i dont know, i have the repo on the server, and a repo on github, i want to get the repo on the server to look like the repo on github	06:03
milki	mikegit: 3 way is 2 source brnaches into the current tree probably	06:03
_ikke_	3 way means it uses a common parent as base	06:03
milki	oo, that makes sense	06:04
	→ soee joined	06:04
mikegit	essentially it's like this... in one branch I have a file called "A.txt" and line #1 contains: "foo" but in a different branch line #2 contains: "bar" That should easily "auto-merge" without intervention... But I want intervention... I want it to let me manually merge those	06:04
_ikke_	mikegit: the whitespace in you text is a bit anoying	06:04
	your*	06:04
	← cooloney left	06:04
mikegit	_ikke_: sorry.. was an effort to make it clearer... will avoid the whitespace :)	06:04
milki	its an odd use of whitespace	06:05
	→ ThomasLocke joined	06:05
_ikke_	mikegit: git is built to avoid as much manual intervention	06:05
milki	our internal plaintext parsers dont squash whitespace together	06:05
_ikke_	Not sure if there is a mode that enforces conflicts	06:06
milki	never heard of it	06:06
	but i havent used merge only tools before -.-	06:06
	mikegit: what about 1. merge 2. git reset 3. git add -p?	06:07
mikegit	But, do you see what I mean... if I did a "git merge other branch" and they both had A.txt as a file, where one of them had line #1: "foo" and the other had line #1: "bar" there would definitely be a conflict and I could then run "git mergetool", but if the other branches had edits on different lines, it would just 'auto resolve' them...	06:07
_ikke_	milki: Well, the merge is then already done	06:07
milki	merge --no-commit	06:07
	then reset	06:07
mikegit	(sorry while I'm typing --- takes a while, and you have already possibly answered my question, reading now..)	06:07
milki	then theres no merge history recorded ya?	06:07
_ikke_	milki: I know what you try to do	06:07
	→ jbub joined	06:07
	→ leeN joined	06:08
_ikke_	mikegit: But in that case git already gives a conflict	06:08
mikegit	milki: contemplating your 1,2,3 suggestion above.... i'm trying to figure out each step to see if that solves it...	06:08
	(argh.. sorry for whitespace, it's a habit... trying to break)	06:08
milki	my habit is lots of newlines :P	06:08
	← OOPMan left	06:08
mikegit	milki: but wait..if I do the 1,2,3 steps you mentioned above, don't I lose the new incoming changes from the other branch?	06:09
_ikke_	I can only think of manually merging two files	06:09
milki	mikegit: its a soft reset	06:09
_ikke_	milki: But the actual merge is already done	06:09
milki	the working tree has the incoming changes + conflicts	06:09
	← SegFaultAX\|work left	06:09
milki	_ikke_: right	06:09
	which i think should be fine	06:09
_ikke_	yeah	06:09
milki	since the changes are now local	06:09
_ikke_	I get what you mean	06:10
	You can decide what changes to let it, and what changes to remove	06:10
milki	you will have both the "auto-merged" stuff + the conflicted stuff	06:10
_ikke_	Each diff is a result of a merge	06:10
	← cakehero left	06:10
_ikke_	Though it's not clear from what part of the merge each change came from	06:10
milki	the problem will then be how to make the commit merge	06:10
	er, merge-commit	06:11
mikegit	this situation has been asked a few times on stackoverflow..... either in the situation where you have a few "types" or exact filenames you just always want marked as "CONFLICT" so you can do mergetool... found an "almost" good answer, but I'm very confused on how to make a merge.<driver> ... this seems like it should be a straightforward option.. which is making me think I totally am missing the boat on concept..	06:11
milki	i dont know how you can add parents to a commit from cil	06:11
_ikke_	milki: Isn't that automatically done	06:11
milki	its done if you use merge yes	06:11
mikegit	and in my case, I don't want just "certain" types of files to always mark as Conflict, I want . (all).	06:11
_ikke_	milki: git looks at .git/MERGE_HEAD or something like that	06:11
	→ arvind_khadri joined	06:11
milki	but since there was aa conflict on the merge, it didnt record the commit with the parents yet	06:11
	and you are eseentially aborting the operation	06:11
ak5	so now I have something checked out from github and want to save my changes to gitolite (local)	06:12
milki	so im not sure if the next commit will record the merge or not	06:12
_ikke_	milki: like I said. git setups a file that tells it the next commit will be a merge commit	06:12
ak5	how dcan I make a remote be RO?	06:12
mikegit	might have found the answer.... not sure: http://stackoverflow.com/questions/12148827/disable-automatic-merge-git the title is "Disable automatic merge GIT"	06:12
	→ MaximLacrima joined	06:13
milki	_ikke_: hm, ill have to look into that	06:13
	→ flijten joined	06:13
_ikke_	milki: Nope, that is something different	06:13
milki	_ikke_: so if i create that file myself, it can make a merge commit?	06:13
mikegit	(been working on this for no less than 10 or 11 hours.... thanks for trying to assit me guys... I wouldn't be asking for your help unless I was absolutely going nuts --- which I am at this point).. darn maybe that stackoverflow isn't the right answer :(	06:13
	(again sorrry whitespace)	06:13
_ikke_	mikegit: Nope, that's for when pulling	06:13
milki	mikegit: its been mentioned before here with no solution	06:14
_ikke_	mikegit: like I said, automatic merging is a tautology	06:14
	it's either merging, or it's not merging	06:14
mikegit	argh... well technically, "pulling" is a "fetch, follwed by a merge" if I recall from the documentation right? so, a "merge" that is local is merely one branch to another (locally...) the action should be the same logically right?	06:14
_ikke_	mikegit: Yes, but the question is about avoiding the merge at all afaict	06:15
	mikegit: That question isn	06:15
	mikegit: That question isn't very clear at all	06:15
mikegit	wow, ther's a git cherry-pick command ..	06:15
_ikke_	mikegit: es	06:16
	→ tiglog joined	06:16
_ikke_	yes	06:16
	← jcao219 left	06:16
mikegit	yes, sorry.. what I mean is... "git pull" is a superset of commands containing fetch and merge, therefore I would imaging anything trying to answer a question about pulling could be used to answer the question I'm having about merely merging two local branches.	06:16
_ikke_	But that's more for copying certain commits on top of another branch	06:16
mikegit	imaging = imagine and anything = a stack overflow question	06:17
	(or any other forum)	06:17
	← rubious left	06:17
milki	mikegit: i think the best bet to get the exact behaviour you want would be to change the merge driver	06:17
_ikke_	mikegit: not necessarily, because your question is on a much deeper level	06:17
milki	the merge driver would just make all changes explicit conflicted states	06:17
	→ dc5ala joined	06:17
	→ eijk joined	06:17
_ikke_	Well, like I said earlier, a 2 way merge would do what you want	06:18
	→ resistivecorpse2 joined	06:18
_ikke_	because it has no base information, any change would be a conflict	06:18
mikegit	milki: yea.. I came across that logic too... so far --no-comit, --no-ff, merge.<driver> customization, and all these hacks... but can't find a decent tutorial on that merge.<driver> situation, keep leading down a dead end..	06:18
	← johnny_rose left	06:18
	← narfnarfnarf left	06:19
milki	ya cnat help you with the driver either	06:19
	you probably need to write a new program...	06:19
mikegit	_ikke_ can you give an example of a 2-way merge... I'm kinda confused.. the current branch, base branch, and other branch are 3-way correct?.. what's 2-way?	06:19
_ikke_	mikegit: 3 way doesn't say anything about the number of branches	06:19
	milki poofs	06:19
	← CollinPD_ left	06:19
_ikke_	mikegit: but the number of files the merge driver looks at	06:19
	→ koltroll joined	06:19
	→ CollinPDX joined	06:20
_ikke_	mikegit: Imagine merging two files	06:20
	← resistivecorpse left	06:20
	Tectu\|fork → Tectu	06:20
_ikke_	mikegit: You look at a line in file A, and at the same line in file B. You notice the lines differ. You have no way determining what line is the correct line	06:21
	so, you report a conflict	06:21
	← rchavik left	06:21
_ikke_	But then you think, hey, I know which file these files derived from	06:21
	the merge base	06:21
	So you look at file A, file B and merge base M	06:22
mikegit	_ikke_: <thinking>	06:22
_ikke_	You see that the line in both file A and M are the same, so you know A hasn't changed. but B and M are different. That means that only B has changed from M, and not A, so you know it's safe to say that B has the 'correct' result	06:23
mikegit	ahh possibly...	06:23
	but maybe it's not the correct result and I want to retain A	06:23
	(A's version)	06:23
	(of that line)	06:23
_ikke_	well, as far a merge logic goes, it's defined as the correct result	06:24
mikegit	therefore, I want each and every file that has any differences to let me inspect and decide as I go...	06:24
_ikke_	because in almost all of the cases, that is what you want	06:24
	→ papegaaij joined	06:24
_ikke_	mikegit: yeah, like I said, you just want to discard the merge base	06:24
	mikegit: a 2 way merge	06:24
	mikegit: But git doesn't support that by default	06:24
mikegit	I was starting to think I was totally missing the boat but numerous people want this too: "Disable automatic merge GIT" http://stackoverflow.com/questions/12148827/disable-automatic-merge-git that's another one...	06:25
	ahh ok.. does that require a custom merge.driver ?	06:25
_ikke_	to do it automatically, yeah	06:25
	But I don't think it's an easy thing to do	06:25
mikegit	the other thing to do I read somewhere ...	06:26
	is simply mark all files a "binary" type...	06:26
	→ AdrienBrault joined	06:26
_ikke_	mikegit: Yeah, I just read that	06:27
	Was about to suggest it	06:27
mikegit	so I tried that in the .gitattributes file (similar to .gitconfig I guess) and I entered this line "* -binary", tried ".txt -binary", also tried " merge=Unset" according to a man page I found regarding merge, if you set a certain file type in .gitattributes it will always regurn a non-Zero value indicating a conflict, then I can just run "mergetool" after	06:27
_ikke_	mikegit: But note that it just refrains from merging at all.	06:27
mikegit	but that doesn't seem to work. or I'm not setting it right... I'm finding conflicting info all over the place from old man pages, etc..	06:28
_ikke_	mikegit: just * merge=binary	06:28
mikegit	going to try that right now! I think I tried it, but not 100% sure I tried that exactly line as you typed it.	06:28
_ikke_	mikegit: But that still requires a lot of manual work	06:29
	→ jiangenj joined	06:29
mikegit	in your thoughts, do you think it will allow me to just run a mergetool afterwards?	06:29
_ikke_	mikegit: No	06:29
	gitinfo set mode: +v	06:29
_ikke_	Hmm	06:29
	let me think	06:29
	It might do	06:29
jiangenj	Hi, how to find the first common commit of two branches?	06:29
_ikke_	jiangenj: man git merge-base	06:29
gitinfo	jiangenj: the git-merge-base manpage is available at http://git-scm.com/docs/git-merge-base.html	06:29
mikegit	I just prefer 100% knowing what happens as it's combining two files.	06:29
	← LeMike left	06:29
_ikke_	mikegit: Well, binary just says: These files can't be merged, just mark them as conflicting	06:30
	mikegit: So it might just do what you want	06:30
mikegit	(checking now..)	06:30
	→ johnny_rose joined	06:31
frogonwheels	mikegit: you know, you can always just do the merge, and then review it.	06:31
	→ ipalaus joined	06:31
mikegit	1 files changed, 1 insertions(+), 0 deletions(-)	06:31
	it still did it... darn it..	06:31
frogonwheels	mikegit: by default, viewing a merge, only views those that conflicted	06:31
	you can always amend it if it isn't to your taste.	06:32
mikegit	frogonwheels: that was a potential plan "B" ... can you tell me how to do that? I tried --no-commit for the merge command and tried a "diff" but I don't think that worked as intended.	06:32
_ikke_	mikegit: Well, it's basically the other way around. You first merge the two files, and then remove the things you don't want	06:33
mikegit	I guess I can be satisfied with viewing the changes..... I would really just like to be able to use a GUI based merge/diff tool to just see what the other branch had and the current branch had before it merged...	06:33
	ahh but I want it to highlight the things that it did so I know where to focus my attention	06:33
	← intripoon left	06:33
	← JPT left	06:34
mikegit	I wish it would just let me mark everything as "conflicted" ... even though it could resolve it, I don't want it to.. if I was creating Git, I certainly would have added this feature .. been working with it for 48 hours so far, and absolutely think it's awesome other than this	06:34
	← ipalaus left	06:34
	→ intripoon joined	06:34
	→ setmeaway2 joined	06:35
mikegit	_ikke_: so you're saying "git merge --no-commit" and just open each file I'm worried about and edit before committing?	06:36
	"git merge --no-commit otherbranch" <--- forgot to put a branch name	06:36
	→ senny joined	06:36
	→ JPT joined	06:36
	← setmeaway left	06:36
	← sirdancealot7 left	06:37
	→ maleknet joined	06:37
	← AdrienBrault left	06:38
	→ reuf joined	06:39
_ikke_	mikegit: yeah	06:39
	mikegit: Well, the people who created git created it in mind to get as little conflict as possible	06:40
	mikegit: so adding this option would not be very sensical	06:40
	mikegit: And, nobody so far has needed it	06:40
mikegit	yes, but .. think about a world run by artificial intelligence.. occasionally it follows rules and totally fucks things up	06:40
	← johnny_rose left	06:40
mikegit	meaning... it might think it's algorithm for merging is correct... but human intervention would have avoided a bad "merge"..	06:41
frogonwheels	mikegit: my personal experience is that people f* merges up much more than gits automatic merges	06:41
mikegit	indeed, that is a point I can definately see occurring...	06:41
	thing is.. how do I review what it did merge? any idea how to highlight the differences?	06:42
frogonwheels	mikegit: Generally, the only times I have problems with merges are where git has requested me to resolve conflicts, and I've done a bad job of it.	06:42
	→ cobra-the-joker_ joined	06:42
frogonwheels	mikegit: git show HEAD	06:42
mikegit	I'm trying to figure out how to make a simple diff do it... and for that matter, how would I even get a list of files that were auto-resolved ?...	06:42
frogonwheels	mikegit: it will show you all the files that were merged	06:43
mikegit	all I get is "Merge branch 'otherbranch' into 'currentbranch'"	06:43
	that's with git show HEAD ...	06:43
	← cobra-the-joker left	06:43
frogonwheels	mikegit: then possibly no files were merged from both branches (ie the files are the same as either branch1 or branch2	06:43
mikegit	but it's not...	06:43
	→ drizzd joined	06:44
mikegit	trying again to tripply verify	06:44
	tripply is not a word is it... anyway, trying again	06:44
	← bapa left	06:44
	→ sirdancealot7 joined	06:44
mikegit	git show HEAD doesn't show the list of files changed or changes...	06:46
	just the comment of it merging one branch on another...	06:46
_ikke_	tripple	06:46
	→ aisbaa joined	06:47
	← ReekenX left	06:48
	← Synthead left	06:49
	← drizzd left	06:49
	→ LeMike joined	06:50
	← LeMike left	06:50
	→ und3f joined	06:50
	→ LeMike joined	06:50
	→ AMfish joined	06:50
	→ narfnarfnarf joined	06:51
	→ bapa joined	06:52
	→ derpops joined	06:52
	← maleknet left	06:52
mikegit	any idea how to not only not commit with '--no-commit' but also not automatically "add" the file to be tracked ?... it seems it adds it which prevents a "git difftool" from easily showing the changes that have been just made during a merge of a branch.	06:53
frogonwheels	mikegit: I'd just let the commit happen and then --amend it if it needs changing!	06:53
EugeneKay	mikegit - I think you're looking for 'git diff HEAD'	06:53
mikegit	but I can't figure out how to see the changes	06:54
	ohhhh ok trying that EugeneKay thanks	06:54
frogonwheels	git log -1 ?	06:54
EugeneKay	mikegit - the default is for diff to compare the index against the working tree. You need to tell it to compare the index agaisnt something else.... in this case, HEAD ;-)	06:54
	→ hubidubi joined	06:54
mikegit	so, I still want --no-commit right? then do the 'git diff HEAD'	06:55
	?	06:55
	← cobra-the-joker_ left	06:59
	→ quazimodo joined	07:00
	→ ipalaus joined	07:00
	← bapa left	07:01
	→ skorgon joined	07:01
	← skorgon left	07:01
	→ skorgon joined	07:01
	→ bapa joined	07:01
	→ maleknet joined	07:02
	→ dhruvasagar joined	07:03
mikegit	Ok, the 'git diftool HEAD' works perfectly for inspecting the changes that occurred during the merge... as long as I run it with --no-commit	07:03
	← jave left	07:04
	→ BadDesign joined	07:05
	← BadDesign left	07:05
	→ BadDesign joined	07:05
	→ wwwjfy_ joined	07:05
	← wwwjfy left	07:05
	→ Element9 joined	07:05
	← hyperboreean left	07:05
	← williamherry left	07:05
mikegit	milki, _ikke_, EugeneKay, and everyone else, thank you very much for your help.	07:06
	← maleknet left	07:07
	← bapa left	07:07
	← tchan left	07:08
	← keltvek left	07:08
	→ mishok13 joined	07:09
	→ ampz joined	07:09
	→ jave joined	07:09
	← aisbaa left	07:09
	→ bapa joined	07:09
	← Fandekasp left	07:10
	→ dragon3_ joined	07:10
	← mikegit left	07:10
	→ suy joined	07:10
	→ aisbaa joined	07:11
	→ devsharpen joined	07:11
	→ keltvek joined	07:13
	svetlyak40wt_ → thebot_	07:13
	→ maleknet joined	07:13
	thebot_ → svetlyak40wt	07:14
	→ giallu joined	07:15
	← bapa left	07:15
	→ Parhs joined	07:15
	← Parhs left	07:15
	→ Parhs joined	07:15
	→ bapa joined	07:15
	→ thyseus joined	07:16
	→ lb joined	07:16
	← lb left	07:16
	→ lb joined	07:16
	← sirdancealot7 left	07:17
	← harish left	07:19
	← Lgb left	07:20
	→ sirdancealot7 joined	07:20
	→ tchan joined	07:21
	→ whitman joined	07:21
	→ Lgb joined	07:23
	← akiress left	07:24
	← skyf left	07:24
	→ alexstanford2 joined	07:25
	→ charon joined	07:25
	← charon left	07:26
	→ charon joined	07:26
	← alexstanford left	07:26
	wwwjfy_ → wwwjfy	07:26
	← j0ran left	07:26
	→ j0ran joined	07:26
	← simesy_work left	07:27
	→ chaiz joined	07:27
	← derpops left	07:29
	← sirdancealot7 left	07:30
	→ meyering joined	07:30
	← zhouxiukun left	07:31
	← ampz left	07:31
	← danmackay left	07:32
	← _dzonder left	07:32
	→ rob_w joined	07:32
	← gxk left	07:33
	→ psoo joined	07:33
	← tiglog left	07:34
	→ gavin_huang joined	07:34
	→ danmackay joined	07:35
	← bapa left	07:35
	→ bapa joined	07:36
	← JakeSays left	07:38
	→ JakeSays joined	07:39
	← suy left	07:39
	→ suy joined	07:39
	→ sirdancealot joined	07:43
	→ TheHaven joined	07:43
	← beautifulmind left	07:44
lb	is it possible in git to just merge subfolers in a repo?	07:45
	so e.g. i do a "git fetch origin"	07:45
	→ hyperboreean joined	07:45
EugeneKay	lb - no, but you can fake it by doing a merge, then using reset on the folders you don't want merged.	07:46
lb	then i have my changes , bu i just want to merge the changes in the subfolder foo/bar	07:46
	← dr_lepper left	07:46
lb	ah ok thanks EugeneKay	07:46
EugeneKay	If I was less lazy I'd do a writeup on this. We seem to get this question every other day or so.	07:46
lb	^^	07:46
	but a checkout of the subfolder should work right?	07:46
EugeneKay	Sure.	07:47
	← quazimodo left	07:47
lb	git checkout 87234hu23 -- foo/bar	07:47
	ok thanks :D	07:47
EugeneKay	.trigger_edit merge_selective git does not support merging only certain files - it is all or nothing. You can use --no-commit and then 'git reset -- foo/ bar/' all files/dirs you do not want to merge to fake this behaviour.	07:48
gitinfo	EugeneKay: Okay.	07:48
EugeneKay	good 'nuff for now.	07:48
	→ dr_lepper joined	07:48
	← dr_lepper left	07:48
	→ dr_lepper joined	07:48
lb	:)	07:48
	← chaiz left	07:50
	← arvind_khadri left	07:51
	→ alkino joined	07:52
	← apok left	07:53
	→ timj joined	07:54
	→ florin joined	07:55
	florin → Guest35450	07:56
	→ brtdv joined	07:56
	→ dreiss joined	07:56
	← aruiz left	07:56
	← timj1 left	07:57
	← TheHaven left	07:57
	→ TheHaven joined	07:57
	→ chisler joined	07:58
	→ jkremser joined	07:58
	← pantsman left	07:59
	→ simesy_work joined	07:59
ak5	a git repo has a certain folder I do not want anything to do with. can I git clone; git rm $folder ; rm -r $folder ; echo $folder > .gitignore ; git pull without re pulling that folder?	07:59
	← jdunck left	07:59
	→ gerryvdm_mbp joined	07:59
	← gerryvdm_mbp left	07:59
	→ gerryvdm_mbp joined	07:59
wereHamster	no	08:00
EugeneKay	No.	08:00
ak5	ok, can I do something else?	08:00
	← jkremser left	08:00
_ikke_	ak5: !xy	08:01
gitinfo	ak5: This sounds like an "XY Problem" http://mywiki.wooledge.org/XyProblem So let's step back for a minute. What are you actually trying to achieve? Why are you doing it this way?	08:01
ak5	that folder has code that my own submodule solves better :)	08:01
	→ marthinal joined	08:02
EugeneKay	Is the folder in question a submodule?	08:02
_ikke_	Can't you ignore it yourself?	08:02
	→ _ivar_ joined	08:03
ak5	_ikke_: I guess so, but when I deploy this (it's a website) i'd have to manually remove it each time	08:03
	→ quazimodo joined	08:03
ak5	EugeneKay: no	08:03
	← simesy_work left	08:04
	→ LimeBlast joined	08:04
_ikke_	ak5: Don't you have a deploy script or something?	08:05
	→ dpino joined	08:07
SicoAnimal	when I do git submodule most show heads/master which is obviously saying that it is on the master branch, but some of them show things like "v1-24-g7c817fc". Anyone know what this means? That submodule is actually on the master branch, but `git rev-parse v1-24-g7c817fc` gives the right commit hash which master is pointing to	08:08
	← Lord_DeathMatch left	08:08
	← hyperboreean left	08:08
	→ aruiz joined	08:09
_ikke_	SicoAnimal: You know that submodules don't check out branches, but commmits?	08:09
	→ hyperboreean joined	08:10
	→ shruggar joined	08:10
	→ _Qman joined	08:10
	→ robustus joined	08:11
	← JPeterson left	08:11
	← intripoon left	08:11
	→ JPeterson joined	08:12
	→ intripoon joined	08:13
ak5	_ikke_: I do now	08:13
	LP	08:13
SicoAnimal	_ikke_: a submodule that i just added is checked out on the master branch	08:13
_ikke_	SicoAnimal: Yeah, but not by definition	08:14
	git submodule update tends to check out the commit instead of the branch	08:14
	← holo left	08:14
	← spaceplu- left	08:16
	→ dsirijus joined	08:16
	← tapout left	08:16
	← niax left	08:16
	→ spacepluk joined	08:17
SicoAnimal	_ikke_: still dont see where the v1-24-g7c817fc is coming from	08:17
_ikke_	SicoAnimal: man git describe	08:17
gitinfo	SicoAnimal: the git-describe manpage is available at http://git-scm.com/docs/git-describe.html	08:17
	→ niax joined	08:18
_ikke_	SicoAnimal: It means 24 commits on top of tage v1	08:18
	s/tage/tag/	08:18
	← JEEB left	08:18
	← The-Compiler left	08:18
	← bapa left	08:18
	→ devinrhode2 joined	08:18
	→ JEEB joined	08:19
	← Bilge left	08:19
	← JEEB left	08:19
	← chrisward left	08:19
	← _aeris_ left	08:19
	→ chrisward joined	08:19
	→ graeme joined	08:20
	→ _aeris_ joined	08:20
	→ JEEB joined	08:20
	→ The-Compiler joined	08:20
	→ the_cybersphinx joined	08:21
	→ Bilge joined	08:21
	→ tapout joined	08:21
	→ dr_balor joined	08:21
	← hwrd\|work left	08:22
dr_balor	If I have a remote branch remotes/origin/development, can git tell me it's URL so that I can "git push $URL :development"?	08:22
	← JEEB left	08:22
	→ hinst joined	08:23
_ikke_	dr_balor: does it need to be automated?	08:23
	dr_balor: Why not use git push origin :development?	08:23
	← AMfish left	08:23
	→ JEEB joined	08:23
	← JEEB left	08:24
dr_balor	_ikke_: I'm just reading the man page and it says I need a URL. I'll try that	08:24
_ikke_	dr_balor: origin is a so called remote, and it's basically a shortcut for the url	08:24
dr_balor	_ikke_: thanks.	08:25
	→ JEEB joined	08:25
	→ irqq joined	08:27
	→ trodrigues joined	08:28
	→ arvind_khadri joined	08:28
bjornars	I've got a remote git@git... repo and a revision. Is there any (easy) way to remotely get some commit info without actually maintaining an up-to-date clone of the repo?	08:29
	← trodrigues left	08:29
	← brtdv left	08:30
	→ kpreid joined	08:30
	→ tjadc joined	08:30
	← torbjorn left	08:30
frogonwheels	bjornars: not really. you can get a snapshot if the server support it, but what kind of info are you trying to get?	08:31
_ikke_	bjornars: What kind of commit info?	08:31
	→ QKO\|Work joined	08:32
	← QKO\|Work left	08:32
	→ QKO\|Work joined	08:32
QKO\|Work	hello	08:32
	I have major issue	08:32
	I'm using svn through git	08:32
_ikke_	QKO\|Work: !enter	08:33
gitinfo	QKO\|Work: The enter key is not a punctuation mark. Please use fewer lines, with complete sentences on them.	08:33
	← neataroni left	08:33
QKO\|Work	and when I merge two branches in git, the target branch will get the svn branch from the source branch	08:33
frogonwheels	_ikke_: ahh.. I've wanted that tip before. I think in #vim it is 'cr'	08:33
bjornars	frogonwheels, _ikke_: commiter and commit-message mainly	08:33
QKO\|Work	.	08:34
_ikke_	bjornars: Than you have to fetch from the remote	08:34
frogonwheels	bjornars: or use some other interface to interact with it	08:34
_ikke_	bjornars: The only thing you can get from a remote without fetching is references	08:34
jast	git-svn + git merges ain't pretty. sad but true.	08:35
bjornars	it's not possible to just fetch one object using some arcane plumbing command?	08:35
_ikke_	bjornars: Nope	08:35
QKO\|Work	jast: how can I fix the remote it's pointing at	08:35
	→ Fandekasp joined	08:35
QKO\|Work	?	08:35
jast	bjornars: no. the protocol is restricted to fetching by refs.	08:35
	if upload-archive is enabled on the server, you can use git archive to fetch trees (with all referenced objects) from a remote, though	08:36
	→ gxk joined	08:36
jast	and if an object has a symbolic tag on it, I think it might be possible to fetch that, too	08:36
	QKO\|Work: by not using 'git merge'. git-svn determines the upstream branch from the first 'git-svn-id' line it finds in the commit log. since git-svn will destroy merge commits anyway, you might consider using git merge --squash instead of merging normally. of course that isn't terribly nice, either, but you have to pick your battles when it comes to git-svn.	08:37
	← Aaaarg left	08:39
bjornars	jast: damn.. thanks for the answer	08:40
	→ hwrd\|work joined	08:40
	→ jkremser joined	08:41
jast	if you want to fetch anything else, you'll have to build your own transport mechanism	08:41
	(gitweb can deliver blobs, for instance)	08:41
frogonwheels	bjornars: that's not a bad solution to use gitweb ..	08:44
	→ bwwrd joined	08:45
	← devinrhode2 left	08:45
	→ jarr0dsz joined	08:46
	→ i42n joined	08:47
	← maleknet left	08:48
bjornars	frogonwheels: not a bad idea, i'm looking info that	08:49
	seems doable	08:49
	← babilen left	08:51
	→ mmc1 joined	08:51
	→ FernandoBasso joined	08:55
	← dreiss left	08:56
k-man	its amazing how much it makes you clean up your code when you decide to release it for the first time#avr	08:56
	bah - mistype - sorry	08:56
_ikke_	That's why you should release early	08:56
	→ samphippen joined	08:57
lb	RERO	08:58
QKO\|Work	jast: tnx	08:59
	→ simesy_work joined	08:59
	→ fram joined	08:59
	← JEEB left	08:59
	→ JEEB joined	09:01
	← jbub left	09:01
	→ williamherry joined	09:02
	→ raatiniemi joined	09:03
	← simesy_work left	09:04
	← chisler left	09:04
	→ chisler joined	09:04
	→ srand joined	09:05
srand	I have cloned a repositry with https, but now git keeps asking me for my pasword. I thought changing https with ssh in .git/config's url parameter would seal the deal, but after changing and trying to pull I get a permission denied error (remote hung up unexpectedly)	09:06
_ikke_	srand: What is the current url?	09:07
srand	url = https://jvaelen@bitbucket.org/tgijbels/gs.git	09:07
	→ zenx joined	09:07
	→ tvw joined	09:07
_ikke_	srand: Have you setup ssh keys?	09:08
	srand: Is that your own repo?	09:08
srand	_ikke_: yes	09:08
_ikke_	srand: to what question?	09:08
	→ cooloney joined	09:08
	← thirdknife left	09:08
phryk	What would be the best course for installing gitolite on an OSX server?	09:09
srand	the second, I thought I had an ssh identiy though, but the issue probably lies there	09:09
phryk	Also how would I go about migrating the repositories from one gitolite to said OSX server?	09:09
	→ maleknet joined	09:09
	← Liquid-Silence left	09:09
	← jesseFromYVR left	09:09
	← tchan left	09:10
sitaram	phryk: start with the documentation; it has everything you need to know	09:11
	the gitolite master TOC at http://sitaramc.github.com/gitolite/master-toc.html	09:11
	for part 2 of your question, look for the word "existing" in that link above	09:11
	→ achadwick joined	09:12
phryk	sitaram: The recommended way of installing gitolite is just compiling it locally without any package management or similiar stuff?	09:12
EugeneKay	It's perl; there really isn't a compile step.	09:13
	→ rham joined	09:13
phryk	Ah right then.	09:13
EugeneKay	There are rpm/debs of it available, but they tend to be old. I half-wonder if sitaram would accept a set of RPM makefiles	09:14
rham	how do I stop git from trying to use ipv6?	09:14
_ikke_	rham: git itself doesn't use ipv6	09:14
rham	most commands have a -4 option	09:15
phryk	rham: Sounds like you need to set some config option for ssh…	09:15
williamherry	how to specify the location os id_sra when use git clone?	09:15
_ikke_	rham: it's either curl or ssh that uses it	09:15
rham	_ikke_: how do I stop git from trying to get curl to use ipv6?	09:15
_ikke_	rham: via ~/.curlrc	09:15
rham	dafuq?	09:15
	→ cybersphinx joined	09:16
EugeneKay	man curl ;-)	09:16
	← dr_lepper left	09:17
	← dragon3_ left	09:17
	→ Lord_DeathMatch joined	09:17
	← Lord_DeathMatch left	09:18
	→ dragon3_ joined	09:18
	→ Lord_DeathMatch joined	09:18
_ikke_	echo "-4" >> ~/.curlrc should do	09:18
	→ chimay joined	09:18
	→ dr_lepper joined	09:19
	← the_cybersphinx left	09:19
phryk	How do I find out the version of my gitolite installation? The only interesting thing a quick grep through src revealed was "gitolite_rc.pm:$current_data_version = '2.0';". Does that mean I have gitolite-2.0 ?	09:20
sitaram	EugeneKay: I don't mind accepting a set of RPM makefiles and putting them in a contrib directory	09:21
	phryk: no; the best way is "ssh git@host info" using a valid user key	09:21
	failing that, look for a file called "VERSION" somewhere (probably in ~/.gitolite)	09:22
	← srand left	09:23
	SeoZ → SeoZ-work[AWAY]	09:23
	→ lng joined	09:24
rham	thanks	09:24
	← rham left	09:24
phryk	sitaram: Ah, found ~/gitolite/conf/VERSION :)	09:24
lng	Hi! I fetched and rebased, but having "! [rejected] develop -> develop (non-fast-forward)" when pushing, why?	09:25
	← TheHaven left	09:25
	→ TheHaven joined	09:25
_ikke_	lng: !rewrite	09:26
gitinfo	lng: [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to jump through hoops (and you have to tell them to), so it's infinitely better to just move on without rewriting. That said, you can use `git push -f` to force your new history through (may get rejected, though). See http://git-scm.com/docs/git-rebase.html#_recovering_from_upstream_rebase	09:26
CareBear\	lng : you rebased too far back	09:26
_ikke_	lng: !repro	09:26
gitinfo	lng: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.	09:26
	→ chovy joined	09:26
chovy	i have a post-recieve hook on another server that is failing...how can I debug this?	09:27
	→ thirdknife joined	09:27
lng	_ikke_: I don't rewrite anything	09:27
_ikke_	chovy: You can add echo statements. You can see the output on the client side	09:27
	lng: rebase == rewrite	09:28
lng	oh	09:28
_ikke_	lng: But you probably rebased the branch you just pulled	09:28
	fetched*	09:28
	→ dean[w] joined	09:28
lng	_ikke_: I fetched first	09:28
chovy	_ikke_	09:28
	ok	09:28
lng	then git rebase develop	09:29
	→ juvenal joined	09:29
chovy	i needed to run npm install on my machine. i guess i need to put that in the post commit hook	09:29
_ikke_	lng: On what branch were you?	09:29
	← Guest31345 left	09:29
	→ jasmine25 joined	09:29
lng	_ikke_: develop	09:30
	→ Squarism joined	09:30
	→ ReekenX joined	09:30
lng	_ikke_: rebasing was successful	09:30
_ikke_	lng: !repro	09:30
gitinfo	lng: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.	09:30
_ikke_	rebasing develop while on branch develop doesn't do anything	09:31
	← hwrd\|work left	09:31
lng	_ikke_: git rebase analytics	09:32
	← jasmine25 left	09:32
_ikke_	So you were on develop, and you did git rebase analytics?	09:33
lng	yea	09:33
	← dean[w] left	09:33
	← raatiniemi left	09:33
	→ cooloney_ joined	09:34
	← setmeaway2 left	09:34
_ikke_	why did you do the rebase?	09:34
lng	to have a flat history	09:35
	← jaseemabid left	09:35
lng	pushed	09:36
	git rebase origin/develop	09:36
	after that	09:36
	← maleknet left	09:36
	← cooloney left	09:37
ak5	why do I not get the tags that are on github when I clone the repo?	09:37
	also, how do I get them	09:37
	→ roxlu joined	09:38
_ikke_	git fetch --tags	09:38
	ak5: git clone by default only gets the refs from refs/heads	09:39
	not refs/tags	09:39
ak5	I see	09:39
	← roxlu left	09:39
ak5	can I now checkout to a certain tag?	09:39
	← sluther left	09:39
_ikke_	ak5: yes, but watch out for !detached	09:40
gitinfo	ak5: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	09:40
	→ rchavik joined	09:40
	← rchavik left	09:40
	→ rchavik joined	09:40
ak5	I see	09:40
	awesome	09:40
	← aristidesfl left	09:40
	→ adac joined	09:40
_ikke_	ak5: So you best can checkout a branch based on the tag	09:41
	git checkout -b <new_branch> <tag>	09:41
lng	_ikke_: thank you	09:41
	→ adamben joined	09:41
adac	is it possible if I checkout a git repository (A) to tell git to check out yet another repostitory (B) into one of A's folders?	09:41
	→ kanupatar joined	09:42
kanupatar	hi guys	09:42
	any idea on this error?	09:42
FauxFaux	adac: !subpro	09:42
gitinfo	adac: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely seperate. Otherwise your best options are "!submodule" "!gitslave" and "!subtree" Try typing those commands into this IRC channel.	09:42
kanupatar	repo init -u git://codeaurora.org/platform/manifest.git -b ics_chocolate -m M8260AAABQNLZA30170.xml --repo-url=git://codeaurora.org/tools/repo.git Get git://codeaurora.org/platform/manifest.git codeaurora.org[0: 199.106.109.189]: errno=Connection refused fatal: unable to connect a socket (Connection refused)	09:42
	← samphippen left	09:42
FauxFaux	kanupatar: Does "git clone git://codeaurora.org/platform/manifest.git" do the same thing?	09:42
kanupatar	FauxFaux: please wait	09:43
adac	FauxFaux, thanks	09:43
	!submodules	09:43
gitinfo	[!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://book.git-scm.com/5_submodules.html	09:43
kanupatar	FauxFaux: yes same thins	09:43
	FauxFaux: yes same thing	09:43
ak5	_ikke_: git fetch origin --tags exits without any message	09:43
	and I get no tags in .git/refs/tags	09:44
	→ maleknet joined	09:44
	→ johnny_rose joined	09:44
FauxFaux	kanupatar: Firewalls? That command works fine for me, same ip: 199.106.109.189.	09:44
	→ torjus_ joined	09:44
_ikke_	ak5: what does git tag return?	09:45
ak5	_ikke_: ... lots of tags	09:46
_ikke_	ak5: Then you have the tags	09:46
kanupatar	FauxFaux: ohh..i am connected through proxy	09:46
ak5	where are they stored?	09:46
	← TheHaven left	09:46
kanupatar	FauxFaux: can you check my first address?	09:46
_ikke_	ak5: Depends on the kind of tag	09:46
ak5	I see	09:47
	ok	09:47
	well thanks I guess :)	09:47
	→ TheHaven joined	09:47
	→ babilen joined	09:48
	→ gusnan joined	09:49
_ikke_	ak5: Note that git clone will get the tags that are referenced by a branch	09:50
	← kanupatar left	09:50
	→ Jippi joined	09:51
	← Jippi left	09:51
	→ raatiniemi joined	09:53
	→ chris64 joined	09:53
	→ dean[w] joined	09:55
	→ samphippen joined	09:55
ak5	I see, thats why git clone <repo> --branch <tag> works	09:57
	→ beautifulmind joined	09:57
_ikke_	ak5: Well, then you are explicitly requesting a reference	09:58
	But yeah	09:58
	← FernandoBasso left	09:58
ak5	cool git is pretty awesome	09:58
_ikke_	But I believe you are on a detached HEAD then	09:58
ak5	I really want to play with it so it speeds up my development time	09:58
	thats fine for me	09:58
_ikke_	--branch can also take tags and treat them like detached	09:58
	HEAD.	09:59
	→ simesy_work joined	09:59
ak5	i will just do git branch	09:59
	← simesy_work left	10:04
	← marlun left	10:11
	← fornext left	10:13
	← jdyin left	10:17
	← jiangenj left	10:18
	← Guest35450 left	10:20
	← maleknet left	10:20
	← Imaginativeone left	10:22
	← qwertz_ left	10:23
	→ jbub joined	10:23
	→ maleknet joined	10:24
	← aaronmoodie left	10:24
	→ OOPMan joined	10:24
	→ osxorgate joined	10:25
	← osxorgate left	10:25
	← acrocity_ left	10:30
	→ fornext joined	10:30
	← raatiniemi left	10:31
ak5	_ikke_: I have cloned a github repo then added that to local gitolite. When I clone from gitolite I am missing the other remote, can I save it some way?	10:31
FauxFaux	No, remotes aren't transferred as part of clone. You can ship a script that peopl ecan run to mirror your remotes, if you want.	10:32
ak5	I see, does such a script exist already?	10:32
	← maleknet left	10:32
	← ricky left	10:32
FauxFaux	..it only has to run "git remote add github git://github.com/foo/bar"	10:32
	← kpreid left	10:32
Parhs	hello dudes	10:32
	what does this mean ? mode change 100644 => 100755 web/bundles/webprofiler/images/security.png	10:32
FauxFaux	It means the mode changed.	10:33
_ikke_	Parhs: the x bit in particular	10:33
alkino	chmod	10:33
Parhs	i see	10:33
	← zamba left	10:33
	→ ricky joined	10:33
_ikke_	git only tracks the executable bit	10:34
ak5	FauxFaux: if I want to rebase my local code on a new tag in the github repo, I can just checkout that tag on github and rebase, right?	10:35
	→ zamba joined	10:35
FauxFaux	ak5: a) don't hilight people. b) !tias	10:35
gitinfo	ak5: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://sitaramc.github.com/1-basic-usage/tias.html may help with git-specific TIAS.	10:35
ak5	no need to store the info in gitolite, or transfer it, I'll just write a script that does git rebase after setting up the repo	10:35
	→ jceb joined	10:36
	→ gerryvdm_mb joined	10:37
	← samphippen left	10:37
	→ maleknet joined	10:38
	→ Innocentus joined	10:38
	← dsirijus left	10:38
	← teotwaki left	10:39
	← johnny_rose left	10:39
	← xxc_michael left	10:39
	← zenx left	10:40
	← gerryvdm_mbp left	10:40
	← LeMike left	10:41
	← juvenal left	10:42
	→ fluxdude joined	10:44
	→ raatiniemi joined	10:46
	→ samphippen joined	10:48
	→ NetJunky joined	10:48
	→ LeMike joined	10:48
	← LeMike left	10:48
	→ LeMike joined	10:49
	← graeme left	10:49
	← LeMike left	10:49
	gitinfo set mode: +v	10:49
NetJunky	Good day everyone!	10:49
	→ LeMike joined	10:50
	← LeMike left	10:50
	← hyperair left	10:51
	→ acrocity_ joined	10:51
	→ LeMike joined	10:52
	→ nedbat joined	10:52
	→ flavius joined	10:55
	← samphippen left	10:57
	→ chaiz joined	10:58
	→ simesy_work joined	10:59
	→ samphippen joined	11:01
	← shruggar left	11:03
	← simesy_work left	11:04
	← OOPMan left	11:06
	→ witul joined	11:06
txomon\|nqas	hi NetJunky	11:08
	→ arietis joined	11:08
	← chimay left	11:10
	→ chimay joined	11:10
	← gerryvdm_mb left	11:11
	→ gerryvdm_mbp joined	11:11
	← gerryvdm_mbp left	11:11
	→ gerryvdm_mbp joined	11:11
	→ Akufen joined	11:11
	← ak5 left	11:13
txomon\|nqas	how may I delete remote's remotes?	11:13
	I did a --mirror push and now I want to delete the branch	11:14
_ikke_	txomon\|nqas: what?	11:14
txomon\|nqas	remote* I pushed accidentally	11:14
_ikke_	You want to delete a branch on a remote?	11:14
	→ burzum joined	11:14
txomon\|nqas	_ikke_, imagine you have 3 remotes, being tracked. If you --mirror push, it will have all those remotes	11:16
	I want to delete them	11:16
	→ rwestphal joined	11:16
cmn	you don't have the remotes, you have what used to be remote-tracking branches, just remove them like any other	11:16
txomon\|nqas	I have the remotes and the remote-tracking branches	11:17
	http://pastebin.ubuntu.com/1269080/	11:17
	I want to delete those javier/ origin/ refs	11:18
	(with all their branches)	11:18
cmn	that doesn't show that you have the remotes	11:18
	so remove then like any other	11:18
txomon\|nqas	but I want to remove them in the remote	11:18
	not in my computer	11:19
burzum	hi	11:19
gitinfo	burzum: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	11:19
_ikke_	txomon\|nqas: They're called refs (references)	11:19
cmn	txomon\|nqas: right	11:19
	do that then	11:19
burzum	how can i get a list of commit ids that are not in another branch? I have develop and master and I want to know wich commits are not in master yet. Its like a diff of commit ids what i want.	11:19
txomon\|nqas	cmn... how? I have tried git push origin :javier/*	11:19
	but doesn't work	11:19
cmn	use the full names	11:20
txomon\|nqas	_ikke_, refs are the branches or the remotes?	11:20
	← rchavik left	11:20
txomon\|nqas	cmn so, one by one	11:20
cmn	branches are refs	11:20
_ikke_	txomon\|nqas: a branch is a re	11:20
	txomon\|nqas: a branch is a ref	11:20
cmn	or use a loop	11:20
	or see if push --prune works	11:20
_ikke_	a remote is a shortcut to another repository	11:20
txomon\|nqas	ok	11:21
	→ florin joined	11:21
	florin → Guest46753	11:22
_ikke_	and a remote tracking branch is a type of branch git automatically creates	11:22
	adhawkins-away → adhawkins	11:22
txomon\|nqas	cmn, doesn't exist --prune option	11:22
_ikke_	git remote --prune	11:22
txomon\|nqas	_ikke_, good to know it	11:22
_ikke_	But that only works if the remote doesn't have that branch anymore	11:22
	txomon\|nqas: But what is it exactly what you want to achieve?	11:23
nevyn	git push remote :branch	11:23
cmn	txomon\|nqas: it does	11:23
	→ trashi joined	11:23
	← wwwjfy left	11:24
	→ lausi joined	11:25
	→ Grephix joined	11:28
	← Grephix left	11:28
txomon\|nqas	well, I did it on hand	11:28
	→ Grephix joined	11:28
	gitinfo set mode: +v	11:29
trashi	hello, i try to clone a git repository without the history. i tried --depth=1 but there were at least to commit messages from the original repository after cloning. could anybody help?	11:29
	→ rgs103 joined	11:29
	← rgs103 left	11:29
txomon\|nqas	trashi, git is not svn	11:29
trashi	*two commit messages	11:29
cmn	depth indicates how many commits leading from the tip you get	11:29
	that's what it does	11:29
_ikke_	trashi: maybe man git archive is a better option	11:31
gitinfo	trashi: the git-archive manpage is available at http://git-scm.com/docs/git-archive.html	11:31
	← reuf left	11:31
trashi	hm ok, i will take a look .. thanks for help	11:31
txomon\|nqas	trashi, what do you want to do?	11:31
trashi	clone a big project (drupal) without the history	11:31
txomon\|nqas	then you are not trying to clone	11:31
cmn	but why?	11:31
txomon\|nqas	you are trying to get the master branch	11:32
trashi	nope ... not the master branch	11:32
txomon\|nqas	what ever, one branch	11:32
trashi	want to checkout 7.x and maybe later yust switch to 8.x or master	11:32
_ikke_	git archive gives you a copy of the working tree	11:32
	without having to clone a repository	11:32
trashi	also within the references to other branches?	11:33
txomon\|nqas	trashi, in git or you have all the repo, or there is no repo	11:33
trashi	ok	11:33
cmn	txomon\|nqas: that's not accurate	11:33
	→ BSaboia joined	11:33
trashi	so i will try and read s.th. about git archive ... thanks for your help guys!	11:34
	→ nizeguy joined	11:34
	→ sgambino joined	11:34
cmn	if the remote site doesn't support archive, --single-branch --depth can be a good approximation	11:34
	as long as you just want to be a consumer	11:34
	→ MikeyV27 joined	11:35
_ikke_	cmn: Is git archive something that's new?	11:36
	→ OOPMan joined	11:36
cmn	no	11:36
_ikke_	what might be a reason that it's not supported?	11:36
cmn	but the remote site has to enable a remote archival	11:36
_ikke_	explicitly?	11:36
cmn	yeah	11:36
_ikke_	how do they do that? Can't find something in the config	11:37
	← cooloney_ left	11:37
	→ xxc_michael joined	11:38
cmn	hm, I can't find skimming it, I remember there being an option somewhere	11:38
	but e.g. github doesn't let you	11:38
_ikke_	Well, they can either explicitly deny it, or haven't implemented it	11:38
cmn	git has it implemented for a while	11:39
	← BSaboia left	11:39
	← lausi left	11:40
	← raatiniemi left	11:40
	← trashi left	11:40
	← svetlyak40wt left	11:40
cmn	_ikke_: found it, man git daemon	11:41
gitinfo	_ikke_: the git-daemon manpage is available at http://git-scm.com/docs/git-daemon.html	11:41
cmn	you need to --enable-service it	11:41
	→ dpk joined	11:41
CareBear\	cmn : since what version?	11:41
_ikke_	So it only counts for git-daemon?	11:42
cmn	what since what version?	11:42
CareBear\	cmn : is --enable-service available	11:42
	← no_maam left	11:42
	→ juvenal joined	11:42
CareBear\	cmn : I have no git git	11:43
cmn	it's --enable=<service> sorry	11:43
	→ no_maam joined	11:43
_ikke_	--enable=upload-archive	11:43
cmn	but I'm pretty sure it's been there for a long time, let me check git	11:43
_ikke_	but via ssh it's allowed by default, right?	11:44
	git just invokes upload-archive on the remote	11:44
cmn	by default depends on what you're using, normal logins and gitolite do support it by default	11:44
	github doesn't let you	11:45
	CareBear\: the part about describing the services has been in the manpage since 2006	11:45
	← wolftankk left	11:46
	← papegaaij left	11:47
	← dragon3_ left	11:48
	← gavin_huang left	11:48
wereHamster	cmn: you don't get it, do you? People don't read man pages. Even if you tell them.	11:49
cmn	I'm a hopeless romantic	11:49
	→ papegaaij joined	11:50
	→ _huoxito joined	11:50
alkino	they often are really badly written	11:51
	imho	11:51
cmn	make them better	11:51
alkino	apropos is far better :$	11:52
cmn	that makes no sense whatsoever	11:52
alkino	cmn: i'm a programmer not a good writer	11:52
_ikke_	since when is apropos a manual?	11:52
cmn	then you don't get to complain	11:52
wereHamster	become a better writer.	11:52
alkino	_ikke_: it's not the good name	11:53
	sorry	11:53
_ikke_	info you mean?	11:53
alkino	yaeh ;)	11:53
cmn	that's just as much nonsense as saying apropos	11:54
alkino	xD	11:54
	i'm not a good troller	11:54
	and I need to work	11:54
	o/	11:54
_ikke_	obviously	11:54
	→ cannonball joined	11:54
	→ GTK joined	11:54
	→ BSaboia joined	11:55
	← dv310p3r left	11:56
	← nedbat left	11:57
	← GTK left	11:58
	→ sephii joined	11:59
	→ wwwjfy joined	11:59
sephii	hey there, is it normal that the post-commit hook output goes to stderr instead of stdout?	11:59
	→ simesy_work joined	11:59
	→ pfFredd joined	12:00
csmrfx	wereHamster: man man	12:00
	← gitinfo left	12:03
	← simesy_work left	12:04
	→ cilly joined	12:04
_ikke_	yay, gitinfo one	12:04
	→ gitinfo joined	12:04
	ChanServ set mode: +o	12:04
_ikke_	ah, back	12:04
	→ gavin_huang joined	12:06
	← diegoviola left	12:06
	→ qwertz_ joined	12:07
	→ pfFred joined	12:07
	← pfFredd left	12:10
	→ hyperair joined	12:10
	← pfFred left	12:12
	← juvenal left	12:12
	→ revagomes joined	12:12
	← gavin_huang left	12:12
	→ SkAzZ joined	12:12
	← samphippen left	12:13
	→ gavin_huang joined	12:14
	→ tinti joined	12:15
	← loops left	12:16
	→ geekbri joined	12:20
	← Milossh left	12:20
	← alunduil left	12:20
	← sangi left	12:21
	← adac left	12:21
	← gavin_huang left	12:23
	→ erichynds joined	12:25
	← GodEater left	12:25
	→ ajw0100 joined	12:25
	→ Milossh joined	12:25
	→ romac joined	12:25
	← romac left	12:26
	→ pfFredd joined	12:27
	→ gavin_huang joined	12:27
	← kermit left	12:28
	→ GodEater joined	12:29
	← GodEater left	12:29
	→ GodEater joined	12:29
totte	I'm reading about managing websites with git and most tutorials seem to use a post-receive hook that puts the latest push into a separate directory which is the actual content directory. Wouldn't simply some "deny from all" rules for .git* in the Apache configuration do the trick?	12:30
	I mean, why not use the directory where the actual content is hosted as a git repository as well?	12:30
cbreak	server repositories (where you can push to) are bare	12:31
	they should not HAVE a working directory	12:31
	← gavin_huang left	12:31
_ikke_	totte: Better invest time to learn a proper deploy tool	12:32
	← torjus_ left	12:33
	→ vasanth1 joined	12:34
	→ tchan joined	12:34
	← tchan left	12:34
	→ tchan joined	12:34
	→ pfFred joined	12:34
	→ adac joined	12:35
	→ gavin_huang joined	12:36
	→ jds joined	12:36
	← pfFredd left	12:36
totte	cbreak: I'll have to read more about bare repositories, thanks.	12:37
	← erichynds left	12:38
	→ jaseemabid joined	12:38
_ikke_	!bare	12:38
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	12:38
totte	_ikke_: Yeah, but I'm just playing around with a bunch of HTML pages for now. I'll keep that in mind though.	12:38
	← sontek left	12:39
	← j0ran left	12:39
	→ j0ran joined	12:39
	← thirdknife left	12:39
totte	_ikke_: Neat, thanks!	12:39
	← dr_balor left	12:39
	→ diverdude joined	12:40
	→ glennpratt joined	12:41
rob_w	so i do have a linux kernel git .. with various branches cloned from a hw manufacture .. now i want a branch which is kernel.org 3.3 version .. can one guide me to that ?	12:41
nevyn	rob_w: so there's a v3.3 tag right?	12:41
	→ samphippen joined	12:41
	→ dr_balor joined	12:42
	→ thirdknife joined	12:42
nevyn	git checkout v3.3 && git branche -b myv3.3	12:42
rob_w	when i do git branch -a .. . i only see my hw manufacture branches	12:42
nevyn	rob_w: linus tags he doesn't make branches for releases.	12:42
	→ pfFreddd joined	12:43
nevyn	git tags\|grep v3.3	12:43
rob_w	ah ok	12:43
nevyn	well he does.. but nevermind.	12:43
rob_w	kk	12:43
	← sonnym left	12:43
rob_w	seem is miss those tags .. so i assume my repo is not uptodate in htat senes	12:44
nevyn	so you said you had a linux kernel git	12:44
	← acrocity_ left	12:44
	→ legumbre_ joined	12:44
nevyn	you cloned from kernel.org right?	12:44
diverdude	How can i see the location of the master?	12:44
rob_w	not from there	12:44
diverdude	like, where code is being sent when i do git push origin master	12:44
	where is master?	12:44
	← MaximLacrima left	12:45
rob_w	diverdude, your local master	12:45
nevyn	so master is a local branch you're pushing to a remote branch called the same thing	12:45
diverdude	rob_w: ? no, i mean the one i cloned from	12:45
nevyn	rob_w: so add kernel.org as a remote.	12:45
	rob_w: in particular you probably want:	12:45
	← pfFred left	12:45
	→ acrocity_ joined	12:45
cmn	diverdude: master is in your repo	12:45
	→ juvenal joined	12:46
diverdude	cmn: i did git clone someURL, i guess someURL is the master	12:46
	← Twey left	12:46
rob_w	diverdude, then someURL will be your "origin"	12:46
cmn	guessing doesn't make it true	12:46
diverdude	rob_w: ahhh ok. origin then. how do i see url of origin?	12:47
	→ Vert joined	12:47
FauxFaux	git remote -v	12:47
	→ Twey joined	12:47
	← williamherry left	12:48
	← samphippen left	12:48
nevyn	rob_w: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable	12:49
rob_w	nevyn, somehting like git remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable	12:49
	→ derpops joined	12:49
nevyn	that'll get you the tags for v3.3	12:49
	yep	12:49
rob_w	great	12:49
nevyn	then git remote update	12:49
	← thirdknife left	12:49
rob_w	i can do this while sitting in any local branch ?	12:49
nevyn	sure.	12:50
	so git remote update is a fetch of all remotes	12:50
	you could do git fetch linus	12:50
cmn	and submodules	12:50
	→ kreature joined	12:50
	← Milossh left	12:50
nevyn	if you don't want to fetch the other remotes.	12:51
	← dpk left	12:51
kreature	how can I ignore (with a gitignore file) a subdirectory but not a specific subdirectory in that subdirectory? :-)	12:51
nevyn	oh CRAP.	12:51
	nevyn just remembered he said he'd do stupid git tricks for tomorrows infrastructure coders meetup	12:51
	← bwwrd left	12:52
	← catsup left	12:53
	→ samphippen joined	12:54
	→ hellopat joined	12:55
	→ guardian joined	12:55
	← gavin_huang left	12:55
diverdude	hmm i dont get this. If i have a repo X and do change to file A belonging to X, do git commit -a -m "..."; git push origin master; and in other server i have done git clone the-same-origin-as-repoX-origin, and now do git fetch, shouldn't the file A in th e2 cloned repos be the same?	12:55
guardian	hello	12:55
	can I use git clone --reference with a reference between on a different volume (but on the local machine)? or there's no point doing it?	12:56
	← iori left	12:56
	→ pandeiro joined	12:56
	→ gavin_huang joined	12:57
	→ bartek joined	12:59
	→ simesy_work joined	12:59
oddmunds	diverdude: you don't change the local files by fetching	12:59
	→ raatiniemi joined	13:00
oddmunds	(someone correct me if i'm wrong)	13:00
	→ jesseFromYVR joined	13:00
adhawkins	oddmunds: Correct. You'll need to merge origin/master into local master	13:00
	Or git pull if local master is tracking origin/master	13:00
kreature	how can I ignore (with a gitignore file) a subdirectory but not a specific subdirectory in that subdirectory?	13:01
adhawkins	Someone wanted this recently. Can't remember the answer I'm afraid!	13:02
	← derpops left	13:02
	← Trioke left	13:03
	← xxc_michael left	13:03
	→ beautifulmind1 joined	13:03
	→ xxc_michael joined	13:03
	→ catsup joined	13:03
	← diverdude left	13:03
	← jaseemabid left	13:04
	→ jtanguy joined	13:04
	→ t0oL joined	13:04
jtanguy	hello here	13:05
gitinfo	jtanguy: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	13:05
adhawkins	The expressions aren't particularly intuitive	13:05
	I think it was cmn that answered	13:05
	← beautifulmind left	13:05
	← simesy_work left	13:05
	← samphippen left	13:05
	← varialus left	13:05
	→ varialus joined	13:05
cmn	kreature: unignore it	13:05
	→ jackh joined	13:06
jtanguy	is it possible to get the commit which introduced a file into a specific branch?	13:06
	→ freeed joined	13:06
	→ diverdude joined	13:07
kreature	cmn: I'm trying but I can't seem to find the right pattern. I've got a directory www/template which I want to ignore the contents of, except for the /www/template/new directory, which I want to track all contents for	13:07
	→ samphippen joined	13:08
	→ thirdknife joined	13:08
	→ shruggar joined	13:08
	→ dragon3_ joined	13:08
	← shruggar left	13:09
	← jds left	13:09
	→ shruggar joined	13:09
	→ macabre joined	13:10
kreature	found it: www/template/*/ and !www/template/new	13:11
	the wildcards were not immediately obvious	13:11
cmn	that wildcard doesn't work in git	13:12
	www/template/*\n!www/template/new should work	13:12
	wildmatches aren't supported by the ignore patterns	13:12
	← sephii left	13:12
	← gavin_huang left	13:13
	→ jperry2_ joined	13:13
	← Esa_1 left	13:13
	← lb left	13:13
	→ lb joined	13:13
	→ chuckharmston joined	13:14
	→ AaronMT joined	13:14
kreature	cmn: that doesn't work for me	13:14
	→ Fullmoon joined	13:14
	→ skyf joined	13:14
kreature	my suggestion does work however	13:14
cmn	with the disadvantage that it's not doing what it looks like it should be doing	13:14
	!repro	13:15
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.	13:15
	← TheHaven left	13:15
	→ HavenMonkey joined	13:15
	← hoschi left	13:15
	→ gavin_huang joined	13:16
adhawkins	My .git/config contains the following:	13:16
	http://pastebin.com/PB8dqKFq	13:16
	git push also tries to push master. I only want it to push gh-pages	13:16
	Can I just delete the 'branch "master"' section?	13:16
	→ Davey joined	13:17
	→ dv310p3r joined	13:17
	← freeed left	13:17
	← kreature left	13:18
cmn	adhawkins: read push.default man git config	13:18
gitinfo	adhawkins: the git-config manpage is available at http://git-scm.com/docs/git-config.html	13:18
adhawkins	Thanks	13:18
	→ alunduil joined	13:19
	→ spyzer joined	13:19
	← Lgb left	13:20
	→ freeed joined	13:20
	→ lyddonb joined	13:20
	← lyddonb left	13:20
spyzer	hey everyone, something weird is happening with my repo. My commit history shows that i committed and pushed a new directory to server. Even when I do git reset HEAD~2 and do git pull then also that directory gets added	13:21
	But on the server that directory doesn;t exists	13:21
	so others are unable to pull it	13:21
	→ trungqtran joined	13:22
spyzer	OOPS	13:22
	please don;t ready the above	13:22
	→ drougge joined	13:22
spyzer	:P	13:22
adhawkins	Any idea why I get this when I push tags?	13:23
	← spyzer left	13:23
	→ Lgb joined	13:23
adhawkins	http://pastebin.com/m2rkUBBX	13:23
_ikke_	Have you recreated an existing tag?	13:23
adhawkins	Not deliberately.	13:24
	If I delete it locally and fetch again, will that work?	13:25
	← chimay left	13:25
	→ TomyLaptop joined	13:26
	← TomyLaptop left	13:26
cmn	read what git is telling you to read	13:26
	→ TomyLobo joined	13:26
TomyLobo	hi	13:27
	→ ehsan joined	13:27
adhawkins	That seems to have done it.	13:27
TomyLobo	git commit is all grey and dull on my linux laptop. it's so colorful and exciting on my windows machine with msysgit. how do i change my linux git to be the same?	13:28
	← raatiniemi left	13:28
adhawkins	cmn: I was just pushing a tag, so was surprised why it was talking about a fast-forward.	13:28
cmn	it's the same thing	13:28
	→ TeckniX joined	13:28
cmn	TomyLobo: man git config see the color options	13:29
gitinfo	TomyLobo: the git-config manpage is available at http://git-scm.com/docs/git-config.html	13:29
adhawkins	Yes, but I didn't deliberately change the tag. I guess I must have done a while ago.	13:29
cmn	or someone else did	13:29
TomyLobo	cmn, oh i'm talking about git commit	13:29
	← letharion left	13:29
cmn	then you're probably not talking about git commit	13:29
TomyLobo	i assume the thing msysgit is vim	13:29
	i assume the thing msysgit uses is vim	13:30
cmn	it's vi, i believ	13:30
	but that's nothing to do with git	13:30
TomyLobo	it's syntax highlighting for git	13:30
cmn	set your editor to one you like and tell it to do syntax highlighting	13:30
	← beautifulmind1 left	13:30
cmn	it's not for git	13:31
TomyLobo	it's vi(m) syntax highlighting for git	13:31
	→ beautifulmind joined	13:31
TomyLobo	for git-commit, git-rebase and git-config too i think	13:31
	it has as much to do with git as that autocompletion script that's flying around somewhere	13:32
cmn	so?	13:33
	→ daethorian joined	13:33
	→ lyddon joined	13:33
	← thiderman left	13:34
	→ daniel_- joined	13:35
	→ pfFred joined	13:35
	← pfFreddd left	13:36
	← jtanguy left	13:36
	← fluxdude left	13:36
	← dpwright left	13:37
	→ fisted_ joined	13:38
cmn	tell git to use an editor you like an tell it to highlight	13:38
	→ dpwright joined	13:38
	← dr_balor left	13:38
npws_marc	Checking out files: 100% (4814/4814), done.	13:38
	Switched to branch 'development'	13:38
	i've never seen that before :o what's that mean?	13:39
_ikke_	npws_marc: What did you execute?	13:39
npws_marc	just changed to the development branch	13:39
cbreak	npws_marc: that means that SOMEONE (looks at npws_marc) switched to the development branch	13:39
npws_marc	i mainly meant the first part	13:39
	where it announced it was checking out files	13:40
cmn	it's a progress output	13:40
	← tureba left	13:40
	← fisted left	13:40
	→ tplaner_ joined	13:40
	← The-Compiler left	13:41
_ikke_	Probably because it takes longer than a certain time	13:41
	← soee left	13:42
TomyLobo	nm, simply copied all git-specific stuff from msysgit/share/vim to my ~/.vim[rc]	13:43
	→ nedbat joined	13:43
TomyLobo	and i was right, it's vim, not vi	13:43
	→ tureba joined	13:43
	→ derpops joined	13:43
	← nizeguy left	13:44
	← arietis left	13:44
	← daniel_- left	13:47
	→ daniel_- joined	13:47
	← daniel_- left	13:47
	← pretty_function left	13:48
	← HavenMonkey left	13:49
	→ daniel_- joined	13:49
	← daniel_- left	13:49
	→ daniel_- joined	13:49
	→ lyddon__ joined	13:50
	← lyddon__ left	13:50
	← lyddon left	13:50
	← beautifulmind left	13:51
	← daethorian left	13:51
	→ solofight joined	13:51
	→ The-Compiler joined	13:52
	→ lyddon joined	13:53
	← lyddon left	13:53
	→ letharion joined	13:53
	← samphippen left	13:53
	← meyering left	13:55
	← VadtecWk left	13:56
	← wwwjfy left	13:56
	→ Mode-M joined	13:57
	← danmackay left	13:57
	← chris64 left	13:57
	→ VadtecWk joined	13:57
	→ chris64 joined	13:58
	→ mkadin joined	13:58
	→ danmackay joined	13:58
	← maleknet left	13:59
	← xiangfu left	13:59
	→ simesy_work joined	13:59
	← lng left	14:00
	← chris64 left	14:00
	← dv310p3r left	14:01
cmn	fine, so it's full-blown vim	14:03
	→ thiago joined	14:04
	← simesy_work left	14:04
	→ jaseemabid joined	14:04
cmn	it's bound to cause you less trouble if you follow the instructions, rather than copying what may or may not be relevant	14:04
	← OOPMan left	14:05
	→ Anders_J joined	14:05
	← DeviceZer0 left	14:06
	→ erichynds joined	14:06
	← VadtecWk left	14:06
jMCg	Hey folks -- can someone help me check this out: http://www.openssl.org/gitweb.cgi?p=openssl.git;a=summary ?	14:07
	← danmackay left	14:07
cbreak	check out?	14:07
FauxFaux	They don't give a clone url on that page, so you need to find it elsewhere, jMCg.	14:07
cbreak	they do	14:08
jMCg	FauxFaux: awesome.	14:08
cbreak	but it's incomplete	14:08
	← The-Compiler left	14:08
jast	it's an incomplete URL	14:08
cbreak	try somehost/gitweb.d/openssl.git	14:08
jast	might wanna try this: git clone http://www.openssl.org/gitweb.d/openssl.git	14:08
	→ VadtecWk joined	14:08
FauxFaux	Google returns mirrors of it.	14:08
jMCg	I've tried all the combinations.	14:08
cbreak	I'd try ssh:// first :) or git://	14:08
	→ chimay joined	14:08
FauxFaux	Or #openssl. ;)	14:08
	→ The-Compiler joined	14:08
	← The-Compiler left	14:08
jMCg	git clone git://www.openssl.org/openssl.git	14:09
	\o/	14:09
	→ danmackay joined	14:09
	→ Milossh joined	14:09
jMCg	Awesome, thanks!	14:09
	← dhruvasagar left	14:09
	→ samphippen joined	14:10
	→ johnny_rose joined	14:10
	→ The-Compiler joined	14:10
	← The-Compiler left	14:10
	→ DeviceZer0 joined	14:10
	→ tham joined	14:10
cbreak	there's also http://repo.or.cz/w/mirror-openssl.git	14:10
	→ Trioke joined	14:11
	← tjadc left	14:11
	← john3 left	14:13
	→ john3 joined	14:14
	→ dv310p3r joined	14:14
	→ The-Compiler joined	14:15
	→ chris64 joined	14:15
	← ehsan left	14:16
	→ jds joined	14:16
	← ThomasLocke left	14:16
	→ stewbydoo joined	14:18
	→ dnstbr joined	14:18
	→ xiangfu joined	14:18
	← spectrum1 left	14:18
	← cilly left	14:18
	→ The-C0mpiler joined	14:18
	← The-Compiler left	14:19
	← The-C0mpiler left	14:19
	→ The-Compiler joined	14:20
	→ FeurFrei joined	14:20
	→ cakehero joined	14:20
	← The-Compiler left	14:20
	→ wwwjfy joined	14:21
	→ The-Compiler joined	14:21
	→ lyddonb joined	14:23
	→ pfFreddd joined	14:23
	← pfFred left	14:23
	→ talexb joined	14:23
	← Guest46753 left	14:24
	→ jan2471 joined	14:24
	← diverdude left	14:25
	← _Qman left	14:25
	← roger_raymond left	14:26
	→ roger_raymond joined	14:26
	← lyddonb left	14:27
	← jesseFromYVR left	14:27
	→ daethorian joined	14:27
	← jan2471 left	14:27
	→ jan247 joined	14:28
jan247	if i want to put a git repo inside a git repo, and i don't exactly need to track it (ala submodule). what are my options? adding that subproject to .gitignore doesn't seem to work	14:28
	i don't like having to commit to the main project everytime the submodule is updated.	14:29
haarg	adding it to .gitignore should work	14:29
_ikke_	haarg: nope	14:29
	that doesn't work	14:29
	git doesn't ignore tracked content, and submdules are tracked	14:29
	← jceb left	14:30
	→ dzonder joined	14:30
_ikke_	jan247: If you don't like that, than using submodules is not what you want	14:30
	→ robotmay joined	14:30
haarg	uh what	14:30
jan247	yup. i don't want to use submodules	14:30
	← dean[w] left	14:30
haarg	adding it to .gitignore will work	14:30
	jan247: if you already added it as a submodule, you need to remove the submodule first	14:31
	then using gitignore will work	14:31
	→ pfFred joined	14:32
haarg	removing submodules is rather painful if i remember correctly though	14:32
_ikke_	!submodule_rm	14:32
gitinfo	[!submodules_rm] You want to delete submodules? Excellent choice! All commands are in the superproject. Edit/delete .gitmodules to remove the submodule. Then `rm -rf submodulepath; git rm -f --cached submodulepath; git commit -am "Removed submodules!"` Inspect .git/config for "submodule" entries to remove. Inspect .git/modules for caches to remove "!gitslave" or "!subtree" (type them!) might be alternatives	14:32
jan247	nope. i haven't added it in a submodule. however, putting the folder_name/ in the .gitignore tells me that the folder is modified	14:32
	← jbub left	14:32
_ikke_	ignoring submodules doesn't work	14:33
jan247	with 'untracked content'	14:33
	→ jn_ joined	14:33
	← erichynds left	14:34
	→ lyddonb joined	14:34
	← pfFreddd left	14:34
jan247	hm. soo. any options?	14:34
	← lyddonb left	14:34
lb	is there any nice option in git that you determine before a merge if there will be conflicts?	14:35
	→ AlbireoX joined	14:35
mmattice	just merge into a temp branch	14:35
	← psoo left	14:35
	← BadDesign left	14:35
	→ ShadeTornado joined	14:36
lb	mmattice, i know :/ my co worker is an svn guy and just want something similar to "svn status -u"	14:36
	→ rgsteele joined	14:36
lb	i found git diff --name-status --diff-filter=M BRANCH	14:36
	→ Raging_Hog joined	14:36
	← arvind_khadri left	14:37
	← gavin_huang left	14:37
_ikke_	That just shows modified files	14:37
haarg	jan247: if it tells you the folder is modified, then it has been added as a submodule	14:37
	→ AlbireoX`Laptop joined	14:38
	← AlbireoX left	14:38
	→ chrisgeorge joined	14:38
jan247	damn. ok. fresh repo anyway. trying again. tnx	14:38
lb	_ikke_, am i right, that only modified files could produce confilcts?	14:38
_ikke_	No	14:38
	← FeurFrei left	14:39
_ikke_	You can possibly add a new file in two branches, which will cause a conflict	14:39
	← Maccer left	14:39
	→ axl_ joined	14:39
_ikke_	Or you can modify in one and modify in another branch	14:39
	← jackh left	14:39
lb	svn shows in "svn status - u " if the file has a conflict against the repo version. is their any equivalent in git that shows me that too?	14:39
	← cagedwisdom left	14:39
lb	some diff option maybe?	14:40
	← johnny_rose left	14:40
esc	how can i see the log for a file that was merged with subtree-merge	14:40
bremner	git status -s	14:40
	→ Maccer joined	14:40
	← mkadin left	14:41
bremner	lb^	14:41
	Adys_ → Adys	14:41
bremner	lb: oh, you want something before the merge?	14:41
lb	bremner, jup ;)	14:41
	→ mgue-mobile joined	14:41
	← dragon3_ left	14:41
bremner	that's pretty much impossible, I think	14:41
lb	something like a merge --dry-run doesn't exist ? :/	14:41
	← xxc_michael left	14:41
	→ john2496 joined	14:41
bremner	well, merge --abort does.	14:42
lb	the workflow is temp branch, test merge , delete temp branch?	14:42
mmattice	lb: why would it when you can easily create a temporary branch whenever you want?	14:42
	→ mkadin joined	14:42
bremner	well, you don't _need_ the temp branch	14:42
lb	mmattice, again, i use temp branches ;) it's my svn worshipping co worker who doesn't :D	14:42
bremner	but it does make things simpler, maybe	14:42
	← papegaaij left	14:42
mmattice	unless you're just checking for conflicts and don't want to keep it	14:43
lb	bremner, ok i will force choke him until he uses temp branches	14:43
	thanks though	14:43
bremner	yay!	14:43
jan247	tnx haarg	14:44
bremner	lb: anything that you can do on a temp branch, you can do with reset, but there is more room to screw things up when not using a temp branch. So for someone uncomfortable with git, temp branch is probably better.	14:44
lb	bremner, yeah, i used told him to do so and he resignated :D	14:45
	lb is full of win	14:45
lb	(i wont tell him about reset, he would screw up ;) )	14:45
	← Lord_DeathMatch left	14:45
	→ Lord_DeathMatch joined	14:46
	→ florin_ joined	14:46
	← timj left	14:46
	← gerryvdm_mbp left	14:47
	→ gerryvdm_mbp joined	14:47
	← gerryvdm_mbp left	14:47
	→ gerryvdm_mbp joined	14:47
	← mkadin left	14:48
	← xiangfu left	14:49
	← flijten left	14:50
	← lyddon_ left	14:50
	→ ehsan joined	14:51
	→ mkadin joined	14:52
	← rwestphal left	14:52
	← axl_ left	14:53
	→ axl_ joined	14:54
	→ tjadc joined	14:54
	→ cat_five joined	14:56
	→ Parhs8 joined	14:56
cat_five	hi. is anyone willing and able to show me how to figure out when my files got out of sync? just discovered a whole class missing from my testing environment code from a commit over a month ago	14:57
	← whitman left	14:57
	→ zenx joined	14:57
cat_five	i've figured out which commit it was, but i don't know why or how to get it back in sync!	14:58
_ikke_	cat_five: define back in sync?	14:58
	← Parhs left	14:58
	→ lyddon joined	14:59
cat_five	_ikke_: in sync with the code base on my machine here and on the production server	14:59
	→ simesy_work joined	14:59
cat_five	i just discovered this one missing class, now i'm nervous there could be other discrepancies	14:59
	i'm treating my local code here as canonical, if that answers your question	15:00
	→ g0bl1n joined	15:00
	→ cagedwisdom joined	15:00
	→ OOPMan joined	15:00
	→ tyoc213 joined	15:01
	→ Vile joined	15:01
tyoc213	Hi there, the other day I have do a git reset --hard, now I see that I have a HEAD and I was commiting to "develop" so how I do it now?	15:01
lb	tyoc213, !head	15:02
gitinfo	tyoc213: [!HEAD] HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it serves a different function: it tells clients which branch to checkout initially after cloning. HEAD is not something that exists separately for every branch; that's a common misunderstanding. It also is not the newest commit in the repo (which is hard to define in a DVCS anyway)	15:02
	→ abstrusenick joined	15:02
	← OOPMan left	15:02
tyoc213	thx lb, so if I "merge" it with develop it will be gone?	15:03
	→ OOPMan joined	15:03
lb	tyoc213, no	15:04
	← simesy_work left	15:04
lb	tyoc213, is always there	15:04
	→ etcetera joined	15:05
	→ arturaz joined	15:05
	← Fullmoon left	15:05
	→ ehsan_ joined	15:05
	→ TheFuzzb_ joined	15:05
	← TheFuzzball left	15:05
	← TheFuzzb_ left	15:06
	← thiago left	15:06
	→ Fullmoon joined	15:06
	← ehsan left	15:07
	← juvenal left	15:07
	← LeMike left	15:07
cat_five	so, can anyone help me piece together what went wrong?	15:08
	← ipalaus left	15:08
_ikke_	I'm bound to go home	15:08
cat_five	i suspect it was modifying files upstream	15:08
lb	cat_five, please give more information.	15:08
	→ TheFuzzball joined	15:08
lb	how to you deploy your code?	15:08
	← dr_lepper left	15:08
	← Fullmoon left	15:08
	→ dr_lepper joined	15:09
	← dr_lepper left	15:09
	→ dr_lepper joined	15:09
cat_five	at this point i've been committing locally and then pulling a copy onto a test environment	15:09
	which is then pulled into production if it works	15:09
	from my local code, not from the sandbox	15:09
	→ apok joined	15:09
	→ LeMike joined	15:09
	→ juvenal joined	15:09
	FauxFaux hands cat_five git status and git ls-files	15:09
	← LeMike left	15:09
	→ ipalaus joined	15:09
cat_five	so currently the production code and my local code seem (?) to be identical, but the sandbox has been out for apparently over a month	15:10
	→ BadDesign joined	15:10
lb	cat_five, so check the SHA from all 3 places and you can be sure that your production is sane	15:10
	← juvenal left	15:10
	→ kermit joined	15:10
	→ LeMike joined	15:10
	← LeMike left	15:10
	← Maxdamantus left	15:10
	→ private joined	15:11
	→ Maxdamantus joined	15:11
PerlJam	cat_five: the sandbox is on the same branch as your local system?	15:11
	private → Guest38386	15:11
cat_five	that… is a good question PerlJam	15:11
	→ jesseFromYVR joined	15:11
cat_five	[no_idea_dog.jpg]	15:12
	→ LeMike joined	15:12
cat_five	i believe it is now, but can't guarantee it has always been	15:12
	← LeMike left	15:12
	← jaseemabid left	15:13
	→ LeMike joined	15:13
cat_five	what are the ramifications of pulling across branches?	15:13
	← LeMike left	15:13
	→ ixti joined	15:13
PerlJam	cat_five: Just that you'd pull, git would say it updated, but the working copy mightn't change.	15:14
	→ LeMike joined	15:14
	→ scelis joined	15:14
	← LeMike left	15:14
qwertz_	cat_five, wouldn't that "across branches" thing be rather merging?	15:14
	→ sheriffk joined	15:14
	← jesseFromYVR left	15:14
	→ alexisabril joined	15:14
	← pandeiro left	15:15
cat_five	what i mean is if i pull from the sandbox, which is on master, from my dev machine which is currently on testing, without specifying which branch to pull from	15:15
	it pulls from whatever is current on the remote, right?	15:15
	does that then merge into what is current locally?	15:15
	→ LeMike joined	15:15
	← sheriffk left	15:15
lb	cat_five, !pull	15:15
gitinfo	cat_five: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	15:15
	← LeMike left	15:15
cat_five	ya	15:15
scelis	I think recent versions of "git pull --rebase" is conflicting over submodule changes a lot more than it used to. 'git status' gives me: https://gist.github.com/b04c7d17a8912aeaaf1c Note that I only changed "MOKit". What is the best way to proceed from here? I want the eventual rebase to use the version of MOKit that I passed.	15:16
qwertz_	cat_five, i think if do not track a specific branch, you fetch and then merge remote/master	15:16
	→ beneggett joined	15:16
qwertz_	not sure though	15:16
	SirCmpwn → SirCmpwn_	15:17
cat_five	ok, how do i check my sha's?	15:17
	→ pandeiro joined	15:17
	→ LeMike joined	15:17
	← LeMike left	15:18
	→ yoklov joined	15:18
	→ LeMike joined	15:18
	→ CannedCorn joined	15:18
	← LeMike left	15:18
qwertz_	cat_five, again not shure, but can't you just stash your changes, checkout a branch again and then apply the stash and commit what seems appropriate?	15:19
	→ kpreid joined	15:19
lb	cat_five, you can "git show HEAD"	15:19
	← dpino left	15:20
	→ martinklepsch joined	15:20
	→ LeMike joined	15:20
scelis	in fact, that git status output looks to me like a bug	15:20
	← LeMike left	15:20
scelis	Dependencies/MOKit should be listed as a conflict. I shouldnt see the "no conflicts" message.	15:20
	→ fortin joined	15:20
	← hyperair left	15:20
	← Innocentus left	15:20
	→ LeMike joined	15:21
	← LeMike left	15:21
cat_five	ok cool, so dev and prod are in sync	15:22
fortin	hi folks. Going to migrate from svn to git, I'm trying to understand if is it possible to have a git repository starting from an svn branch (i.e. directory). I'd like to split the source svn into multiple git repositories	15:22
cat_five	sandbox is out	15:22
	← CannedCorn left	15:22
PerlJam	fortin: anything is possible : )	15:23
	er :-)	15:23
fortin	PerlJam: yeah, wrong word :)	15:23
cat_five	i realize since it's a testing environment i could easily start over with this repo, but i'd really like to use this opportunity to learn about what to do when Bad Things happen	15:23
FauxFaux	fortin: It's trivial to convert a branch into a seperate repository. Probably best to start from a git svn clone -s of the svn repo, if it's small enough that that will terminate, then pull the new git branches (which are mirrors of the svn branches) out into repos?	15:24
fortin	s/if it is possible/how to/g	15:24
FauxFaux	(A repo is just a name for a collection of branches.)	15:24
cat_five	re: qwertz_, the commit that put me out of sync happened over a month ago, it is not the latest commit by a long shot	15:24
	→ Destos joined	15:24
PerlJam	fortin: what FauxFaux said basically	15:24
fortin	FauxFaux: ok nice tnx. I'm waiting for the clone to end right now	15:24
FauxFaux	You did run it with -s (or similar), right?	15:25
	→ svetlyak40wt joined	15:25
	→ sirdancealot4 joined	15:25
fortin	FauxFaux: actually I'm using svn2git, that I see it does a git-svn fetch	15:25
FauxFaux	Well, you should probably check that it results in actual branches, instead of one fat project.	15:26
fortin	oh ok	15:26
	→ SirCmpwn joined	15:27
	→ soc42 joined	15:27
fortin	well I'll wait for that and check it out. If no branches than I'll go for clone -s	15:27
	→ ejb joined	15:28
	← mgue-mobile left	15:30
ejb	Can anyone tell me why this pre-commit-msg hook isn't inserting the message ("Sup?") into the message file?	15:31
	→ kenperkins joined	15:32
ejb	The file is .git/hooks.pre-commit-msg and +x	15:32
	.git/hooks/pre-commit-msg *	15:32
	→ martinjlowm joined	15:32
	← cat_five left	15:33
	← Maxdamantus left	15:33
	← lb left	15:34
	← mkadin left	15:34
	→ kevwil joined	15:34
	← ReekenX left	15:35
	→ Maxdamantus joined	15:35
	→ mkadin joined	15:38
ejb	Doh. The hook is prepare-commit-msg not pre-commit-msg	15:38
	→ LeMike joined	15:40
	← LeMike left	15:40
	← dc5ala left	15:41
	← letharion left	15:41
	→ spiffytech joined	15:41
	→ SegFaultAX\|work joined	15:41
	→ LeMike joined	15:42
	← LeMike left	15:42
	← samphippen left	15:43
	cthuluh_ → cthuluh	15:43
	→ Fullmoon joined	15:43
	← etcetera left	15:43
	← Fullmoon left	15:44
	→ LeMike joined	15:44
	← LeMike left	15:44
	→ Fullmoon joined	15:44
	← Fullmoon left	15:44
	← hubidubi left	15:44
	gitinfo set mode: +v	15:45
spiffytech	Can someone please verify this? I have a commit on branches 'dev' and 'staging'. I want to take the commit out of staging until the next time I merge dev into staging.	15:45
	`git revert` on staging would remove it, but when staging and dev are merged together it wouldn't come back. So I need to cherry-pick the reversion commit from staging into dev and then revert the reversion commit. Sound right?	15:45
	→ LeMike joined	15:45
	→ MajObviousman joined	15:45
MajObviousman	hallo folks. Whoa, busy channel	15:45
	← LeMike left	15:45
	→ Fullmoon joined	15:46
	→ torjus_ joined	15:46
MajObviousman	does anybody here have experience with running git inside a chroot?	15:46
RichiH	MajObviousman: just ask your question	15:46
	though there should be nothing special about chroot	15:46
MajObviousman	should be, yes	15:47
	← jperry2_ left	15:47
	← Fullmoon left	15:47
MajObviousman	I can't get git to fetch via https, even though I gave it curl and libcurl in the chroot	15:47
	and expat too, recently	15:47
	→ LeMike joined	15:47
MajObviousman	and I've verified I can fetch pages with https from github from inside the chroot	15:47
	← LeMike left	15:47
MajObviousman	so am I missing other tools that it wants?	15:48
	→ jdunck joined	15:48
	→ LeMike joined	15:48
	← LeMike left	15:48
	→ rwestphal joined	15:48
MajObviousman	I have comparison strace outputs from inside and outside the chroot	15:49
	← drougge left	15:49
	← irqq left	15:49
	← mishok13 left	15:50
	← OOPMan left	15:50
	← JaredMiller left	15:50
	→ JaredMiller joined	15:51
	→ patatras joined	15:52
cmn	what's the actual problem you're seeign?	15:52
	← plopix left	15:52
	→ jaseemabid joined	15:53
	← aisbaa left	15:53
	← adamben left	15:54
	← axl_ left	15:54
MajObviousman	fatal: Unable to find remote helper for 'https'	15:54
	→ axl_ joined	15:55
	← fortin left	15:55
	← patatras left	15:55
	← skul left	15:55
MajObviousman	and I specifically compiled git --with-curl and --with-expat	15:55
	← senny left	15:56
	← rob_w left	15:56
cmn	apparently not	15:56
MajObviousman	so I guess the question is, what's the mechanism by which git makes the call into curl?	15:56
	← Mode-M left	15:56
cmn	it uses function calls, like for every other library	15:56
	← solofight left	15:58
	← dnstbr left	15:58
	→ adamben joined	15:59
	← yoklov left	15:59
	→ simesy_work joined	15:59
	← florin_ left	16:00
	← SegFaultAX\|work left	16:00
	→ letharion joined	16:01
	→ rgr joined	16:01
	← gerryvdm_mbp left	16:02
	→ skyf_ joined	16:02
	← AlbireoX`Laptop left	16:02
	← QKO\|Work left	16:03
	→ AlbireoX joined	16:03
	← JSharpe left	16:03
	← jds left	16:03
	← beneggett left	16:03
	→ JSharpe joined	16:04
	← simesy_work left	16:04
mgorbach	Anyone able to help with some submodules? We're tryign to re-point our submodules to github from our internal servers.	16:05
	→ jds joined	16:05
	← skyf left	16:05
mgorbach	I've update .gitmodules, and run git submodule sync, then git submodule init. But the submodules seem to be created with empty URLs: Submodule 'ThirdParty/HockeySDK-Mac' () registered for path 'ThirdParty/HockeySDK-Mac'	16:06
	← reshtnk7 left	16:06
_ikke_	mgorbach: git submodule init does nothing	16:06
	← cantoma left	16:06
	→ OOPMan joined	16:06
_ikke_	Well	16:06
	Either sync does nothing or init does nothing	16:06
cmn	that's not what that's telling you	16:07
mgorbach	Then, when I try to update I get: fatal: Needed a single revision	16:07
	Unable to find current revision in submodule path	16:07
	← AlbireoX left	16:07
	→ _iron joined	16:08
cmn	that means that the commit it's pinned at isn't available from the repository you pointed it to	16:08
	→ reshtnk7 joined	16:08
	← bartek left	16:08
	→ sq-one joined	16:09
	→ AlbireoX joined	16:09
	→ TheJH joined	16:09
	→ mneorr joined	16:10
	← adac left	16:10
	→ Synthead joined	16:10
	← daniel_- left	16:10
	→ hwrd\|work joined	16:10
	→ swiety joined	16:10
	→ jbub joined	16:11
	← robotmay left	16:11
	← ajw0100 left	16:12
	← adamben left	16:12
	← skorgon left	16:14
	→ beneggett joined	16:14
	→ SegFaultAX\|work joined	16:14
	← Element9 left	16:14
	→ dougcorrea joined	16:14
	→ DoctorMonocular joined	16:15
	← martinklepsch left	16:15
	→ ReekenX joined	16:16
	→ ajw0100 joined	16:16
DoctorMonocular	hey everyone, I'm pretty new to git and I'm having trouble doing a pull on a remote server from github -- when I do pull it asks me for a password, and I enter it (and I know it's correct), but the response is always 401 unauthorized. I'm at a loss for how to trouble shoot this	16:16
	← TheJH left	16:16
_ikke_	DoctorMonocular: Is it your own repository?	16:17
cmn	make sure you're spelling the url correctly	16:17
	→ pppaul joined	16:17
DoctorMonocular	_ikke_ it's a github repo that I have access to, but it's not actually on my account	16:18
	I push and pull from/to my local all the time	16:18
PerlJam	DoctorMonocular: you don't typically use passwords to access repos on github	16:18
cmn	of course you do	16:18
_ikke_	PerlJam: Via https you do	16:18
DoctorMonocular	yeah, it's just on the server that I have to, and I'm not 100% clear about why	16:18
	← i42n left	16:18
	← torjus_ left	16:18
DoctorMonocular	I'm sure it has to do with no key being on there	16:18
PerlJam	ah, true.	16:18
_ikke_	PerlJam: https doesn't know public private keys	16:18
DoctorMonocular	and yeah, it's pulling via https	16:19
	PerlJam isn't completely awake yet	16:19
cmn	having a key wouldn't help you if you're using http	16:19
	→ marhaban joined	16:19
DoctorMonocular	well I can use either, whatever solves the issue, but right now it's set for https	16:19
	adhawkins → adhawkins-away	16:19
DoctorMonocular	I don't know if this is helpful, but: root@TG-Web:/var/www/html# git pull origin master	16:19
	Password:	16:20
	error: The requested URL returned error: 401 while accessing https://jdstraughan@github.com/JDStraughan/tguard.git/info/refs	16:20
	fatal: HTTP request failed	16:20
	← pppaul left	16:20
DoctorMonocular	sorry I spammed the channel, expected that to come out more compactly	16:20
	→ dubteam2000 joined	16:20
	→ boombatower joined	16:20
sitaram	uggh; why are you doing git stuff as root?	16:20
cmn	double-check the spelling	16:20
	← LimeBlast left	16:20
	→ balchd joined	16:21
DoctorMonocular	actually now that I'm looking at it, it seems like I'm trying to log in as jdstraughan@github	16:21
	but I'm not him	16:21
_ikke_	Why is it accessing /info/refs?	16:21
	← nullbit left	16:21
_ikke_	isn't that part of the dumb protocol?	16:21
DoctorMonocular	I changed the user name and email to mine	16:21
FauxFaux	Isn't that the "you've got a disasterously old git client installed" error?	16:21
	git --version	16:21
cmn	_ikke_: yes and no	16:21
	gitinfo set mode: +v	16:21
DoctorMonocular	1.7.0.4	16:21
dubteam2000	hello all, can someone help me please? I don't know hot to rebase on github	16:22
	I have this repository on github https://github.com/danut007ro/youtube-dl	16:22
cmn	FauxFaux: the error would be a different one, this is correct for a 401, as git is requesting that path	16:22
dubteam2000	and I want to merge it inside https://github.com/rg3/youtube-dl	16:22
	I did a pull request here https://github.com/rg3/youtube-dl/pull/454	16:22
	← jds left	16:22
dubteam2000	but that guy said "Could you rebase your work so that it is a single commit, without merges and unrelated commits?"	16:23
DoctorMonocular	so as you can see, I have no idea what I'm doing. I'm pretty new to git, and have no idea how to set this stuff on a remote server at all. the server guy is gone, it falls to me 8/	16:23
	← narfnarfnarf left	16:23
dubteam2000	how do I do that? :)	16:23
	← candybar left	16:23
	← sirdancealot4 left	16:23
	→ solofight joined	16:24
	← thirdknife left	16:24
	→ narfnarfnarf joined	16:24
Kronuz	Please, I need some help here… I just recently upgraded my Mac with the new Xcode command line tools (4.5.1) and now I'm getting a request to "Merge branch…" every time I do a pull… what can be wrong?	16:24
	→ aselder joined	16:24
DoctorMonocular	I'm reasonably sure the url is correct, the code has been pulled to this server before, in the past	16:24
Kronuz	I do a reset --hard and then pull, and still I get that	16:24
	← dougcorrea left	16:24
Kronuz	…or is it that it simply never used to ask me for a commit message for merges?	16:25
	← solofight left	16:25
Kronuz	but now why is it?	16:25
cbreak	possible	16:26
	I think the new git will open an editor for merge commits	16:26
	← mmc1 left	16:26
cbreak	if you don't know of a good commit message, then maybe you should not merge in the first place :)	16:26
	gitinfo set mode: +v	16:27
balchd	Hi, anyone know about username case conflict in git svn clone? Problem details here: https://gist.github.com/99d5db8e307d03fc2706	16:27
	← t0oL left	16:27
	← alkino left	16:27
	← cybersphinx left	16:27
dubteam2000	can someone direct me at least to somewhere where I can find more info on solving my problem? I'm sure it's pretty simple	16:27
	→ cilly joined	16:28
bremner	dubteam2000: see !book	16:28
gitinfo	dubteam2000: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	16:28
	← jdunck left	16:28
balchd	!book	16:29
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	16:29
DoctorMonocular	ok, Iseem to have lost the people who were helping me before. Let me just ask one more question -- if git is trying to pull from https://jdstraughan@github.com/JDStraughan/tguard.git/info/refs how can I get it to pull from https://[something-else]@github.com/JDStraughan/tguard.git/info/refs	16:29
	?	16:29
	→ the_cybersphinx joined	16:29
	→ pppaul joined	16:29
Kronuz	cbreak, is it possible to make it work the way it used to?	16:29
dubteam2000	ok, I will surely read a book to write down 2 commands, lol	16:29
	thanks anyway	16:29
	← dubteam2000 left	16:29
	→ williamcotton joined	16:29
Kronuz	(by skipping that message for merges during pull)	16:29
cbreak	Kronuz: hmm? you don't want to give a reason for why you merge?	16:30
	sounds dumb.	16:30
	why do you merge then?	16:30
Kronuz	…since now I'll get a bunch of "merged" messages	16:30
	← skyf_ left	16:30
Kronuz	I'm simply pulling changes	16:30
raek	dubteam2000: is the change you want the maintainer to pull a single commit?	16:30
	← gusnan left	16:30
bremner	sigh, he left before we could yell at him	16:30
cbreak	yeah, and?	16:30
	pulling is fetching and merging	16:30
raek	heh	16:30
	← jkremser left	16:30
Kronuz	and it was cleaner… didn't have to add a new message every time	16:30
	← hwrd\|work left	16:30
	→ pfFreddd joined	16:31
Kronuz	:/	16:31
cbreak	you have to add a message	16:31
	either you, or git	16:31
	and you can write better messages than git	16:31
	you can use -m to specify one	16:31
Kronuz	I didn't have to, and those messages weren't there at the first place anyway, I don't remember git adding "Merged" messages on every pull I did	16:31
	← pfFred left	16:31
	← mkadin left	16:32
Kronuz	but that last message it requested me to add does show in the log	16:32
cbreak	then your memory is flawed	16:32
	git has always merged when you tell it to merg	16:32
	→ solofight_ joined	16:32
Kronuz	oh, no wait!	16:32
	it's true, it always seem to have added the message	16:32
	:P	16:32
cmn	DoctorMonocular: tell it to pull from that other place, see man git remote set-url	16:32
gitinfo	DoctorMonocular: the git-remote manpage is available at http://git-scm.com/docs/git-remote.html	16:32
Kronuz	just never realised it	16:32
	cbreak, so it's a new feature it now always simply opens the editor to request a merge message?	16:34
	→ bartek joined	16:34
cbreak	I think so	16:34
Kronuz	(I'm now using git v1.7.10.2)	16:34
	oh	16:34
	ok then :)	16:34
	→ thiago_ joined	16:34
	← stewbydoo left	16:34
	← solofight_ left	16:34
	→ cybersphinx joined	16:34
Kronuz	…I just thought it was an error or something was wrong the first couple times	16:34
	→ juvenal joined	16:36
	→ Shusshu joined	16:36
	← angelsl left	16:37
SeySayux	How do I tell git not to check in a symbolic link as a link, but to actually include the contents of the linked file/directory?	16:37
	→ intransit joined	16:37
	intransit → JesseW	16:37
CareBear\	SeySayux : unsure if that can be done	16:38
	← spiffytech left	16:38
	← marhaban left	16:38
SeySayux	Oh well.	16:38
CareBear\	SeySayux : you would effectively have something different committed vs. what's in the repo then	16:38
	→ daniel_- joined	16:38
	← daniel_- left	16:38
	→ daniel_- joined	16:38
CareBear\	s/repo/workdir	16:38
	← the_cybersphinx left	16:38
	SeySayux hardlinks the directory	16:38
CareBear\	maybe you want a !submodule ?	16:38
gitinfo	git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://book.git-scm.com/5_submodules.html	16:38
	→ hobodave joined	16:39
SeySayux	The things I'm symlinking are not git projects, so no.	16:39
CareBear\	what are they?	16:39
	← Shusshu left	16:39
	→ pfFred joined	16:39
	→ jdunck joined	16:39
	← pfFreddd left	16:40
	thiago_ → thiago	16:40
SeySayux	Syntax highlighting files for a programming language for which I have a cloned repo	16:40
	← john_anderson left	16:40
CareBear\	why do they go into the workdir?	16:40
	← juvenal left	16:40
	→ thirdknife joined	16:41
SeySayux	I'm linking them into my .vim directory, which I track in a git repo and push to github	16:41
	← Synthead left	16:41
CareBear\	can you reference them in the system dir instead?	16:41
	→ _md joined	16:41
esc	SeySayux: maybe you want to look at vcsh	16:42
	→ hyperair joined	16:42
	← devsharpen left	16:43
	→ skyf joined	16:43
cbreak	just copy the files	16:43
	→ juvenal joined	16:43
CareBear\	cbreak++	16:43
	→ j416 joined	16:44
cbreak	if you want git to track file content, then git will write file content when you tell git to clone, reset --hard or similar	16:44
	← balchd left	16:44
cbreak	so your symlinks would vanish anyway.	16:44
SeySayux	I could hardlink the directory?	16:45
devth	can git tell me which commit diffs have not been merged or cherry-picked in another branch? i think i used to know how to do this :/	16:45
	← sq-one left	16:46
	→ etcetera joined	16:46
	← dr_lepper left	16:47
_ikke_	devth: man git cherry	16:47
gitinfo	devth: the git-cherry manpage is available at http://git-scm.com/docs/git-cherry.html	16:47
	← jan247 left	16:47
devth	that's right. thanks.	16:47
cbreak	SeySayux: most filesystems don't support directory hardlinks	16:47
SeySayux	cbreak: Mine does	16:47
cbreak	well, then go ahead	16:48
	git won't notice :)	16:48
	→ hotovson joined	16:48
	→ Mode-M joined	16:48
	→ cheriv__ joined	16:49
	← cheriv__ left	16:49
	← chaiz left	16:49
	→ cheriv_ joined	16:49
	← tyoc213 left	16:50
	→ tewecske joined	16:51
	← maxandersen1 left	16:51
	← suy left	16:51
	→ ncr100 joined	16:52
	→ maxandersen joined	16:52
	← maxandersen left	16:52
	→ maxandersen joined	16:52
	← microcode left	16:52
	← achadwick left	16:52
	← hotovson left	16:53
	→ microcode joined	16:53
	→ bzitzow joined	16:53
	→ erichynds joined	16:56
	→ nightcrawler786 joined	16:56
	→ btree joined	16:56
	→ jnl joined	16:56
erichynds	hi. how do I revert a entire merge (that was done with --no-ff if it matters) a number of commits ago?	16:56
SeySayux	Hard links work perfectly, thanks :)	16:56
	→ hotovson joined	16:57
	← tvw left	16:57
erichynds	do i need to specify each commit in the merge?	16:57
	→ mityaz joined	16:58
	→ snearch joined	16:58
	→ jperry2_ joined	16:59
	→ hwrd\|work joined	16:59
	→ simesy_work joined	16:59
	← letharion left	17:00
	← snearch left	17:00
	→ snearch joined	17:00
	← shruggar left	17:01
	→ mishok13 joined	17:02
	→ hwrd\|wor_ joined	17:02
	← hwrd\|work left	17:02
cmn	erichynds: https://github.com/git/git/blob/master/Documentation/howto/revert-a-faulty-merge.txt	17:02
erichynds	gracias	17:03
	→ lyddon_ joined	17:03
	← hotovson left	17:03
	→ hotovson joined	17:04
	← soc42 left	17:04
	← simesy_work left	17:04
	← hotovson left	17:05
	← bnovc left	17:05
	→ hotovson joined	17:05
	← g0bl1n left	17:06
	→ irqq joined	17:06
	→ bnovc joined	17:07
	← bnovc left	17:07
	→ bnovc joined	17:07
	← lyddon_ left	17:07
	→ skorgon joined	17:08
	← mityaz left	17:08
	→ Synthead joined	17:08
	← alegen left	17:08
	→ manithree joined	17:08
	→ adac joined	17:08
	→ rob_w joined	17:08
	← kanru left	17:09
	← pfFred left	17:10
	→ pfFred joined	17:11
	← thirdknife left	17:11
	→ kanru joined	17:12
	← Maxdamantus left	17:12
	→ Maxdamantus joined	17:13
	→ letharion joined	17:13
	→ g0bl1n joined	17:14
	→ codewrangler joined	17:14
	← _md left	17:14
	← swiety left	17:15
	← BadDesign left	17:15
	← Milossh left	17:16
	← jperry2_ left	17:16
	→ jperry2_ joined	17:16
	← naquad left	17:17
	→ steveoliver_mobi joined	17:17
	← giallu left	17:17
	steveoliver_mobi → steveoliver\|mobi	17:18
	→ kumbayo joined	17:18
	← pfFred left	17:18
	← steveoliver\|mobi left	17:18
	→ BadDesign joined	17:19
	→ haydenmuhl joined	17:19
	← chovy left	17:19
	→ Xizor joined	17:20
	← derrekito left	17:20
	← babilen left	17:21
	t0mcat → diminoten	17:21
	→ derrekito joined	17:24
	→ osmosis joined	17:24
	→ ajacom joined	17:25
ajacom	How can I use an ftp server as my remote for git ???	17:26
	In windows	17:26
	→ stewbydoo joined	17:26
	→ aristidesfl joined	17:27
milki	i havent heard of an ftp protocol for git	17:27
	← kevwil left	17:27
	→ rockets joined	17:27
	← mneorr left	17:27
	← zastern left	17:27
	→ X1z0r joined	17:28
cmn	there is.. sort of	17:28
	ajacom: don't do that	17:28
ajacom	isn't there a way to sync bitbucket or github etc with an ftp server ??	17:28
cmn	tha makes no sense, !xy	17:28
gitinfo	This sounds like an "XY Problem" http://mywiki.wooledge.org/XyProblem So let's step back for a minute. What are you actually trying to achieve? Why are you doing it this way?	17:28
ajacom	i'm just starting a new project. my client gave me ftp access.	17:29
	← ReekenX left	17:29
ajacom	but i want to use git and and pushes to remote	17:29
	i'm used to it	17:29
cmn	ftp access to what?	17:29
ajacom	besides, i want to work on local as well	17:29
	to the server for development	17:29
	← Xizor left	17:29
bremner	is this some web thing?	17:30
cmn	you can't "develop" over ftp	17:30
	← abstrusenick left	17:30
ajacom	cmn i know. but i sometimes use filezilla to edit on the go	17:31
	i want to have the whole project on local now and work with using git pushes	17:31
	→ alegen joined	17:31
EugeneKay	ajacom - !deploy	17:31
gitinfo	ajacom: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html	17:31
cmn	so you download files and edit them, you don't need to change that	17:31
EugeneKay	ajacom - and please use SFTP or rsync-over-ssh.... anything except insecured FTP.	17:32
ajacom	ah...	17:32
	But alright, so	17:32
	there's no way of having the remote repository be an ftp server like I thought	17:32
EugeneKay	No, not with git itself.	17:32
	→ hoschi joined	17:33
bremner	there are some hacks around. google for "git-ftp"	17:33
	no idea if/how-well they work	17:33
ajacom	i'm not sure i want to do that on windows	17:33
cmn	do what?	17:33
ajacom	try to use git-ftp	17:33
	← fram left	17:33
	→ deadmund joined	17:34
cmn	you don't want to do that anywhere	17:34
deadmund	How can I remove files from my git repo but keep the old versions in the tree? That is, I want to record the deleting of the file. git rm wants to remove from the cache I think.	17:34
milki	deadmund: see --cached	17:35
cmn	man git rm --cached	17:35
gitinfo	the git-rm manpage is available at http://git-scm.com/docs/git-rm.html	17:35
	→ robotmay joined	17:35
deadmund	I want the opposite of cached. I want to remove the file in the working tree (and from future commits) but leave the history of changes in the paste commits (the index?)	17:36
cmn	no	17:36
milki	deadmund: git rm doesn ot touch the history	17:36
deadmund	milki: thanks :)	17:36
	hahah "no"	17:36
	→ felipec joined	17:37
milki	deadmund: it will only touch your index and your working tree	17:37
deadmund	I guess git rm -f <file>	17:37
	→ drougge joined	17:37
cmn	why -f?	17:37
milki	you dont need -f	17:37
deadmund	because there are changes in there that I want to ignore	17:37
milki	o	17:37
deadmund	right?	17:37
milki	will if it complains without the f, then ya	17:37
deadmund	ok	17:37
	thanks	17:37
milki	:P	17:37
deadmund	yeah, now 'status' looks how I want: several files modified and the file in question marked as 'deleted'	17:38
	→ eletuchy joined	17:38
deadmund	thanks! :)	17:39
	← deadmund left	17:39
	← svetlyak40wt left	17:39
	← Vile left	17:40
	← TeckniX left	17:41
	← drougge left	17:42
	← arturaz left	17:42
	← JaredMiller left	17:43
	→ Fullmoon joined	17:44
	← zenx left	17:44
	← Fullmoon left	17:45
	→ nickpresta joined	17:46
	→ mmc1 joined	17:47
	→ mcluskydodallas joined	17:48
	← aselder left	17:49
	← mcluskydodallas left	17:49
	← robotmay left	17:49
	→ ncd\|leeN joined	17:49
	← jaseemabid left	17:50
	← wwwjfy left	17:50
	→ JaredMiller joined	17:50
	→ HG` joined	17:51
	→ babilen joined	17:51
	← leeN left	17:53
	→ aselder joined	17:54
	→ ampz joined	17:54
	→ drizzd joined	17:54
	→ tockitj joined	17:55
	→ TeckniX joined	17:55
	→ dreiss joined	17:55
tockitj	how to discard all commits i have made locally and revert to origin git log	17:55
	← melee left	17:56
	adhawkins-away → adhawkins	17:57
MajObviousman	git fetch && git rebase origin/branch && git reset HEAD	17:57
	← thierryp left	17:57
	→ Fullmoon joined	17:57
	← JaredMiller left	17:57
	← ampz left	17:57
	→ kevwil joined	17:58
	→ JaredMiller joined	17:58
	← JaredMiller left	17:58
	→ giallu joined	17:58
	→ JaredMiller joined	17:58
	→ ampz joined	17:58
	← rue left	17:58
	→ rue joined	17:59
	→ simesy_work joined	17:59
	← BadDesign left	17:59
	→ abaratican joined	18:00
	→ BadDesign joined	18:00
FauxFaux	git stash && git checkout -Bmaster '@{u}'	18:00
	← ipalaus left	18:01
	→ torjus_ joined	18:01
abaratican	I want to version control certain parts of my home directory, and I want to have to explicitly add every file I wish to version. However, as an unfortunate side effect, I can go 30-levels deep into my home folder and do a git command and it assumes I want to know about my home folder.	18:02
	← btree left	18:02
bremner	abaratican: maybe !vcsh would help you	18:03
gitinfo	abaratican: https://github.com/RichiH/vcsh -- version control shell - manage dotfiles using git's fake bare repos to put more than one working directory into $HOME	18:03
abaratican	I tried getting around this via renaming the .git folder and making: alias hgit="git --git-dir=~/.othergit --work-tree=~", but then git submodule operations are erroring (rest works)	18:03
	← rue left	18:03
bremner	although, there are still some issues with submodules, unless git is very up to date	18:04
	← simesy_work left	18:04
	→ cirenyc joined	18:04
	← cilly left	18:05
	← g0bl1n left	18:06
MajObviousman	so, I was missing a development packae on the system building git, and instead of it telling me, the configure script was just silently washing over it and not compiling the parts that needed the lib	18:06
	← hwrd\|wor_ left	18:07
RichiH	abaratican: are you using submodules in $HOME or in the subdirectories?	18:07
	← adamm left	18:08
	← atomx left	18:08
	← apok left	18:10
	← kermit left	18:11
	→ rue joined	18:11
	← rue left	18:11
	← Lord_DeathMatch left	18:11
	→ rue joined	18:12
	→ i42n joined	18:12
	← tjadc left	18:12
	← aselder left	18:12
	→ adamm joined	18:14
cmn	MajObviousman: that's traditional way	18:14
	← chimay left	18:14
	→ Chillance joined	18:14
	→ btree joined	18:14
	← snearch left	18:15
	→ sq-one joined	18:15
	← btree left	18:15
	← tham left	18:16
	→ cilly joined	18:18
bremner	did the configure script print something out about missing libraries?	18:20
	I bet it did.	18:20
	→ Sigma joined	18:20
abaratican	RichiH: subdirectories that I want to version with $HOME (specifically a vim addon in .vim/bla...)	18:20
	← chrisgeorge left	18:21
abaratican	I've yet to look into bremner's suggestion though; work distractions.	18:21
	→ whitman joined	18:21
	→ guampa joined	18:21
	→ chrisgeorge joined	18:22
	← marthinal left	18:22
	→ pantsman joined	18:23
	← kevwil left	18:24
	← torjus_ left	18:24
	← TomyLobo left	18:24
	→ rue_XIV joined	18:27
	→ lacrymology joined	18:27
	← dv310p3r left	18:27
	← bartek left	18:27
	← acrocity left	18:28
	← acrocity_ left	18:29
	← nedbat left	18:29
	→ hwrd\|work joined	18:29
	→ nedbat_ joined	18:29
RichiH	abaratican: if you have questions about vcsh: i am the author	18:30
	abaratican: and, submodule support notwithstanding, it's better to use mr for such use cases	18:30
	imo	18:30
	← hwrd\|work left	18:30
	→ acrocity joined	18:30
	← rue left	18:31
	→ huismon joined	18:31
	→ the_cybersphinx joined	18:32
	→ khmarbaise joined	18:32
	← huismon left	18:32
	← _huoxito left	18:32
	→ nate_h joined	18:32
	← donri left	18:32
nate_h	hey is there a way to check if there is a remote change without pulling ?	18:32
	→ hwrd\|work joined	18:32
nate_h	like a noop pull?	18:32
canton7	nate_h, you probably meant fetch	18:33
cmn	man git remote show	18:33
gitinfo	the git-remote manpage is available at http://git-scm.com/docs/git-remote.html	18:33
canton7	man git-ls-remote	18:33
gitinfo	the git-ls-remote manpage is available at http://git-scm.com/docs/git-ls-remote.html	18:33
	← jbub left	18:33
	← SkAzZ left	18:33
	← JackWinter left	18:33
canton7	well yeah - two interpretations of your question. if you want to see if there are changes without transferring any data, ls-remote. if you want to fetch changes and inspect them without merging them in, fetch then remote show / log / etc	18:34
	← ivan\ left	18:34
	→ psoo joined	18:34
	← cybersphinx left	18:36
	← axl_ left	18:37
	→ bartek joined	18:37
	→ arvind_khadri joined	18:39
	→ apok joined	18:39
	→ ivan\ joined	18:39
lectrick	Hey when you're solving a rebase conflict, is HEAD the branch you started out on, or is HEAD the branch you're rebasing to?	18:39
	(if youre are in a (no branch) state)	18:40
milki	i think its latter	18:40
FauxFaux	HEAD is the work in progress, which starts at the one you're rebasing on top of, obviously.	18:41
milki	the branch you started off doesnt matter because you are reapplying the commits	18:41
	→ dv310p3r joined	18:41
	← joeytwiddle left	18:41
	→ svetlyak40wt joined	18:41
	→ adamben joined	18:43
	→ ki9a joined	18:44
	→ kevwil joined	18:44
	gitinfo set mode: +v	18:45
ki9a	I have a fairlyy large git tree (on windows) that internally has source and Source as a dir. GIT itself has no trouble dealing with that but I want it all in Source; is there a good way to merge these two dirs?	18:45
bremner	ki9a: use your favourite merge tool, then commit the changes	18:46
	→ worstadmin joined	18:46
EugeneKay	I scream every time I find two folders who differ only by capitalization	18:47
	Also, !GIT	18:47
gitinfo	Git is not an acronym. Writing it in all caps is heresy and will be punished by Subversion or SCCS for more grievous offences. It's "git" or "Git". Thank you for your help in making the world a better place.	18:47
	→ medusaXX joined	18:48
	→ daniel_-_ joined	18:48
	→ nitrix joined	18:48
	gitinfo set mode: +v	18:48
	→ starlays joined	18:48
medusaXX	hi	18:48
gitinfo	medusaXX: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	18:48
	← daniel_- left	18:49
starlays	it is possible to search trough commits for a given to see when was changed last time?	18:49
	← SegFaultAX\|work left	18:49
medusaXX	what does this mean? ! [remote rejected] master -> master (branch is currently checked out)	18:49
	→ thirdknife joined	18:49
medusaXX	i cannot push	18:49
	→ Vile joined	18:49
medusaXX	error: failed to push some refs to 'ssh://par......	18:49
	← nedbat_ left	18:50
	← thirdknife left	18:50
	← project2501a left	18:50
	→ thirdknife joined	18:50
FauxFaux	medusaXX: Seems clear; what do you not understand? !faq non-bare	18:51
gitinfo	medusaXX: Pushing to non-bare repositories is discouraged; more details available at http://jk.gs/gitfaq#non-bare	18:51
	→ project2501a joined	18:51
	← irqq left	18:51
	← nickpresta left	18:51
	→ nedbat joined	18:51
	→ irqq joined	18:51
	← babilen left	18:52
	← trungqtran left	18:53
	→ joeytwiddle joined	18:53
	→ babilen joined	18:53
medusaXX	ok i'm confused but i will have to some basic docs... seems git is not so easy	18:54
	→ candybar joined	18:55
MajObviousman	it's easy for simple cases, but it can rapidly scale into difficult	18:55
cmn	medusaXX: you're trying to do something that is explicitly forgiven	18:55
	forbidden, even	18:55
	before that line, git must have shown you a long explanation as to why, also see !bare	18:56
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	18:56
medusaXX	ok thanks	18:56
	→ rubious joined	18:57
	→ arietis joined	18:57
	→ simesy_work joined	18:59
	→ cylence joined	18:59
	→ Squarism2 joined	19:00
	← Squarism left	19:00
	→ samuel02 joined	19:00
	← fornext left	19:01
	→ trungqtran joined	19:01
	→ melee joined	19:02
	← HG` left	19:02
	← thirdknife left	19:03
	← yann\|work left	19:04
	← simesy_work left	19:04
	→ mislav joined	19:04
	← ameoba left	19:04
	→ devinrhode2 joined	19:04
	→ alansaul joined	19:05
	← hotovson left	19:07
	← vmiklos left	19:07
	→ Sky[x] joined	19:08
medusaXX	hm how can i turn an existing non-bare repository into a bare one?	19:09
	Tectu → tectu	19:09
	← ncd\|leeN left	19:09
	→ hotovson joined	19:09
	→ marthinal joined	19:10
manithree	I'm considering setting up my new git server with mod_authnz_ldap and using Git::Hooks and check-acls.pl to replace gitosis	19:10
	If possible, I would like to keep GROUPSPEC and acl files in git, so I'm wondering if someone has already put together some tools/utils to do that	19:10
medusaXX	sorry. that was in the faq section.	19:10
	← anish[1] left	19:10
	← witul left	19:10
	← narfnarfnarf left	19:11
manithree	Or is that a bad idea?	19:11
mislav	Are there plumbing commands for inspecting git remotes? e.g. to get list of remotes, including URLs that have been processed with `insteadOf` settings.	19:11
	`git remote -v` is useful but is listed as porcelain not plumbing	19:11
	← adamm left	19:11
	→ aselder joined	19:11
	→ witul joined	19:12
	→ aspotashev joined	19:12
	← hyperair left	19:12
	← aselder left	19:12
	→ sluther joined	19:14
	← Guest38386 left	19:15
	→ _md joined	19:16
	→ hyperair joined	19:16
cmn	git-remote is how you handle remotes	19:18
	→ yann\|work joined	19:20
	← Lgb left	19:20
	← aspotashev left	19:21
	← xplat left	19:21
mislav	cmn: Sorry, I haven't stated my use case: it's for scripts. I want to refrain from using porcelain commands as much as possible (I had issues with porcelain commands changing format and breaking scripts in the past). git-remote is porcelain	19:22
	← babilen left	19:22
	→ rohan32 joined	19:22
	← svetlyak40wt left	19:22
	→ adamm joined	19:22
mislav	but I guess its output is enough machine-readable that I can use it from scripts. just hope it won't change.	19:22
	→ svetlyak40wt_ joined	19:22
	→ Lgb joined	19:22
	← rgsteele left	19:23
	→ samphippen joined	19:23
	→ babilen joined	19:23
	→ vbd1 joined	19:24
	→ TheJH joined	19:24
	← cylence left	19:24
cmn	you can use git-config or a library	19:25
	→ shruggar joined	19:25
	← AlbireoX left	19:25
	gitinfo set mode: +v	19:27
vbd1	can I ask here a question to git extensions?	19:27
	← ki9a left	19:28
bremner	you can try.	19:28
	← wagle left	19:29
	← X1z0r left	19:29
vbd1	I start to setup a repositories for large projects (e.g. static websites). When i commit files ~>2.000 git-extensions hangs. Should I stage smaller packages?	19:29
	← Droolio left	19:29
bremner	2.000 what	19:30
	you mean more than 2000 files?	19:30
	← ixti left	19:30
vbd1	yes more than 2.000 files. The projects consists of ~ 200.000 files.	19:31
	→ kermit joined	19:31
vbd1	trying to commit it via command line well hang sometimes too.	19:32
	→ MikeyV27_ joined	19:32
milki	theres a . instead of a , o.O	19:32
bremner	are the files large? 2000 doesn't seem so many.	19:32
	well, europe vs US	19:32
milki	ooo	19:33
vbd1	every file is between 2kb and 50kb.	19:33
bremner	at least germans use ,	19:33
	→ ameoba joined	19:33
bremner	hmm. And repository is on the local machine, no funny network file systems?	19:33
vbd1	It's on a ssd.	19:34
bremner	Strange. What OS?	19:34
	→ aselder joined	19:34
vbd1	windows 7	19:34
	64 bit	19:34
	← marthinal left	19:34
	→ diegoviola joined	19:34
bremner	hmm. I guess it might be windows specific, I have no experience there.	19:35
	← MikeyV27 left	19:36
vbd1	np. have to dig inside...	19:36
	thank you.	19:36
	← MikeyV27_ left	19:36
	← medusaXX left	19:37
	← vbd1 left	19:37
	← hotovson left	19:37
	← chrisgeorge left	19:39
esc	!logs	19:39
gitinfo	[!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html	19:39
	→ mneorr joined	19:39
abaratican	!mr	19:39
	→ chrisgeorge joined	19:40
abaratican	RichiH: "it's better to use mr in such cases"... mr?	19:40
	oh nvm i see a link to it on the vcsh page	19:41
	→ hotovson joined	19:41
	← rgr left	19:42
	← adac left	19:42
	← arvind_khadri left	19:42
	← tureba left	19:42
	→ vmiklos joined	19:43
	→ AlbireoX joined	19:43
	← sluther left	19:44
	← trungqtran left	19:44
	← Yuuhi```` left	19:44
	← hotovson left	19:45
	→ tureba joined	19:45
	← kermit left	19:46
	→ wagle joined	19:48
	← rubious left	19:50
	→ pfFredd joined	19:51
	adhawkins → adhawkins-away	19:51
	← BSaboia left	19:51
	→ dr_lepper joined	19:52
	← dr_lepper left	19:52
	→ dr_lepper joined	19:52
	← ampz left	19:52
	← lacrymology left	19:53
	→ aspotashev joined	19:53
	← hobodave left	19:53
	→ timj joined	19:54
	← Sigma left	19:55
	→ patrick99e99 joined	19:56
	← lamont left	19:57
patrick99e99	hi, so when I do git rebase master on another branch, and it shows conflicts in a file that I don't care about-- meaning I want that file to just be however it was on master.. What do I do to make that happen? I tried just adding the file and then after the rebase finished, I tried to do git checkout filename .. but it still shows the <<<<<<<< in the file...	19:57
	how can I say "replace that file with what's on origin/master" ?	19:57
Aaeriele	since it's a rebase, "git checkout --ours <filename>"	19:59
	→ paradoxquine joined	19:59
	← kevwil left	19:59
	→ dpk joined	19:59
	→ simesy_work joined	19:59
Aaeriele	if it were a regular merge, it'd be --theirs instead	19:59
	→ trungqtran joined	20:00
paradoxquine	hi! how does one fetch and merge for all branches that have a remote tracking branch set up all in one command?	20:00
patrick99e99	Aaeriele: that did not work.. the file has <<<<<<< HEAD in it from either --ours or --theirs	20:00
	→ dnstbr joined	20:01
	← hoschi left	20:01
	← TeckniX left	20:01
	→ userbard joined	20:01
	→ lamont joined	20:01
	← erichynds left	20:01
	← mneorr left	20:03
	← simesy_work left	20:03
mislav	patrick99e99: maybe you committed that file with "<<<<<<<" conflicts unresolved. this is possible.	20:05
	so now no checkout will help you. it's a botched rebase. you'll have to start over	20:05
patrick99e99	mislav: no.. I just did git rebase master, and then when it said there was a conflict, I just did git add <file with conflicts>	20:05
	→ AdrienBrault joined	20:05
	← JesseW left	20:05
mislav	patrick99e99: and you were sure to take the conflicts out of that file? because `git add` doesn't automatically solve conflicts.	20:05
	you have to take care of them in your editor/IDE	20:06
	← aruiz left	20:06
patrick99e99	mislav: no.. I didn't remove the conflicts, because like I said, I just wanted to pull the latest version off origin to replace the one with conflicts	20:06
	which is what I want to do now...	20:06
	I want to get the one off origin to replace this one	20:06
mislav	you want to reset your current branch to the state as it has on origin?	20:07
	losing all your local changes? git reset --hard origin/mybranch	20:07
	→ ampz joined	20:07
	→ srayner joined	20:09
	→ jceb joined	20:09
	→ ipalaus joined	20:10
	→ TeckniX joined	20:10
	→ lb joined	20:10
	→ tewecske1 joined	20:10
	→ axl_ joined	20:11
	← tewecske left	20:12
	← Fullmoon left	20:12
	→ goshawk joined	20:13
patrick99e99	mislav: no.. I just want to reset the a file (the one with conflicts) from what is on origin	20:13
	→ LeMike joined	20:14
mislav	patrick99e99: git reset origin/mybranch -- myfile && git checkout HEAD myfile	20:14
	something along those lines.	20:14
	← tgummerer left	20:14
	→ yoklov joined	20:14
	→ tgummerer joined	20:15
	← jceb left	20:15
patrick99e99	<<<<<<< HEAD is still in the file...	20:15
	I guess I am just going to switch to master and manually copy the file somewhere else and then switch back to my branch and move the file there and overwrite the one there..	20:16
	→ SegFaultAX\|work joined	20:16
patrick99e99	i just wish I knew how to tell git to automatically do that.	20:16
	← Raging_Hog left	20:16
	← whitman left	20:18
ajacom	a question: branch, edit, commit, merge <- in that workflow, do the branches still exist after merging them? if I use "dev" and "master" for example, will merge leave me only with "master", lose all my log and branch history, and i'll have to create 'dev' again ?	20:18
cmn	merge doesn't delete branches	20:18
ajacom	ah, alright, thanks	20:19
	← mislav left	20:19
ajacom	cmn: by the weay	20:19
haarg	and even if it did, you wouldn't lost your history	20:19
	← Anders_J left	20:19
haarg	s/lost/lose/	20:19
ajacom	I found beanstalkapp.com for what i was asking earlier	20:19
	automatically deploys to ftp	20:20
haarg	the history of dev would become part of the history of master	20:20
	← robustus left	20:22
	← _iron left	20:22
	→ eijk_ joined	20:22
	← lb left	20:23
	← eijk left	20:24
	← shruggar left	20:26
	→ zastaph joined	20:26
	← LeMike left	20:26
	→ gumnos joined	20:27
	← skyf left	20:28
	→ jimmyeatworld joined	20:29
	← srayner left	20:30
	← i42n left	20:30
	→ BSaboia joined	20:31
	← sjuxax left	20:31
	→ gusnan joined	20:34
gary_b	1. run git am updates.patch 2. gives me errors http://pastebin.com/kKm3mQc9 3. run git apply --reject --whitespace=fix updates.patch 4. no .rej files, i add one file with git gui 5. run git am --resolved 6. its fixed	20:34
	why would the above work (the 1 file i added was the one marked changed in git gui)?	20:35
	← geekbri left	20:36
	← adamm left	20:36
	← starlays left	20:37
	→ sirdancealot2 joined	20:38
	← timj left	20:38
	→ husnainlatif joined	20:39
	→ aaronmoodie joined	20:39
gary_b	id like to know a little more about what git magically does with this one:)	20:40
	→ pfFred joined	20:41
	→ Fullmoon joined	20:42
	← stewbydoo left	20:42
	← chisler left	20:43
	→ adamm joined	20:43
	← pfFredd left	20:44
	→ gtrak joined	20:44
	← Davey left	20:46
	← kumbayo left	20:46
	→ timj joined	20:48
	→ Davey joined	20:49
	← _md left	20:49
	← husnainlatif left	20:50
	← AlbireoX left	20:51
	← ehsan_ left	20:51
	← thiago left	20:51
	→ AlbireoX joined	20:51
	→ ehsan joined	20:51
	← legumbre_ left	20:51
	→ shruggar joined	20:53
	← drizzd left	20:53
	← AlbireoX left	20:55
	← lamont left	20:56
	← pfFred left	20:57
	← alexisabril left	20:57
	← mishok13 left	20:58
	← freeed left	20:59
	→ simesy_work joined	20:59
	← ajacom left	20:59
	→ rcu joined	21:00
	← cannonball left	21:01
	← bubbles10101 left	21:01
	→ v0n joined	21:01
	→ bubbles10101 joined	21:02
	← timj left	21:02
	← bubbles10101 left	21:02
	→ bubbles10101 joined	21:02
	tectu → Tectu	21:03
	← tinti left	21:03
	← simesy_work left	21:04
	← bartek left	21:04
	← und3f left	21:04
	← rwestphal left	21:05
	← ology left	21:05
	← koltroll left	21:05
	→ thiago joined	21:06
	← yoklov left	21:06
	← Squarism2 left	21:07
	→ lamont joined	21:07
	← sq-one left	21:07
	← melee left	21:08
	→ kidd1329 joined	21:08
	→ jaseemabid joined	21:08
	→ srayner joined	21:09
	← rcu left	21:09
	← cirenyc left	21:10
	→ mneorr joined	21:10
	← babilen left	21:10
	→ babilen joined	21:11
	→ Element9 joined	21:12
	← v0n left	21:13
	← irqq left	21:13
	→ v0n joined	21:13
	→ todd_dsm joined	21:13
	← revagomes left	21:15
	→ IP_Prob joined	21:16
	→ YoMomma joined	21:17
	gitinfo set mode: +v	21:18
IP_Prob	Hi. I'm relatively new to git. I'm trying to work with a "dev" branch on github. Does anyone have a couple minutes to help me out?	21:18
	← manithree left	21:18
wereHamster	!ask	21:18
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	21:18
	← TheJH left	21:19
	→ superjoe joined	21:20
superjoe	I'm in the middle of a merge because I did git stash pop and there are conflicts	21:20
	← aspotashev left	21:20
superjoe	I want git to chill the fuck out and let me make commits	21:20
	← edoceo left	21:20
superjoe	how do I do that?	21:20
	← goshawk left	21:20
IP_Prob	!ask Hi. I'm relatively new to git. I'm trying to work with a "dev" branch on github. Does anyone have a couple minutes to help me out?	21:20
superjoe	leave the conflicts be - I don't want to commit those files yet	21:20
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	21:20
	→ Sonderblade joined	21:21
rudi_s	superjoe: git reset will abort the merge (but leave the conflict markers).	21:21
superjoe	perfect, thanks	21:21
rudi_s	You have to take care of them sooner or later.	21:21
	← jn_ left	21:21
rudi_s	Git won't warn you if you git add them!	21:21
	np	21:21
	← samuel02 left	21:22
	→ Chibby_ joined	21:22
	→ samuel02 joined	21:22
	← juvenal left	21:23
	→ akiress joined	21:23
IP_Prob	So let's say I've forked a repository on github, and the new repository is at http://github.com/user/project	21:23
	← DeviceZer0 left	21:23
IP_Prob	Then I clone this repository using git-gui.	21:24
	Now I'm supposed to put a file into a directory named "media", but this directory only exists in the "dev" brance.	21:24
	*branch	21:24
superjoe	you're "supposed" to?	21:24
	is this a homework assignment?	21:24
	← zastaph left	21:24
	← hellopat left	21:24
IP_Prob	Not homework.	21:24
rudi_s	!book	21:24
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	21:24
IP_Prob	the people who hired me to make the file want me to put it into that directory.	21:25
rudi_s	IP_Prob: ^ Have a look at Pro Git and its explanation of git branches.	21:25
	(Short answer is git checkout dev; git add path/to/file; git commit; git push)	21:25
IP_Prob	Can this be done with the git-gui, or only via command line?	21:26
	→ DeviceZer0 joined	21:26
rudi_s	I've never used git-gui, so I don't know. But I guess there's a change branch (or checkout) command in git-gui.	21:26
IP_Prob	thanks for the link, by the way, but it seems I just read that page before coming here.	21:27
	I'll give it a shot in the command line. Brb.	21:27
rudi_s	IP_Prob: Pro Git is a book with a few hundred pages, I doubt you have read that so quickly ;-)	21:27
IP_Prob	Just the part on branches, I mean.	21:27
rudi_s	Oh. That should explain it.	21:28
	← derpops left	21:28
	→ bapa joined	21:29
	← tplaner_ left	21:29
	← mneorr left	21:30
	← talexb left	21:30
IP_Prob	Blah. I can't even get into git from my windows command line.	21:31
	← samuel02 left	21:31
IP_Prob	I wish I could just put these files on a thumb drive and mail it to them :(	21:31
	→ dijonyummy joined	21:32
cbreak	install git.	21:32
	it's a command line program	21:32
IP_Prob	Oh, wait. I found git bash.	21:32
	I was trying to use git from the shell.	21:33
cbreak	that works too	21:33
	← pandeiro left	21:33
cbreak	depending on wether you checked that box at installation time	21:33
	← chris64 left	21:33
	← svetlyak40wt_ left	21:34
	→ LucasTizma joined	21:34
	→ chris64 joined	21:34
	← shruggar left	21:36
	→ Anders_J joined	21:37
	← hwrd\|work left	21:39
	← guampa left	21:40
	← nedbat left	21:40
	→ ology joined	21:40
	→ ventsislav joined	21:40
IP_Prob	I can't believe I'm spending hours learning a command line utility just so I can send these people a file.	21:41
	So, do I need to do --recursive to make sure I get all the branches?	21:41
cbreak	no	21:42
	that's for submodules	21:42
	← jperry2_ left	21:42
cbreak	git branch -a to show all branches	21:42
	git checkout name to check out a branch	21:42
	→ guampa joined	21:42
	→ hwrd\|work joined	21:43
IP_Prob	Thanks. To be fair, I'll probably have to learn how to use this eventually. It's not a waste of time in the long term, it just feels that way in the short term.	21:43
	← tewecske1 left	21:43
	← ampz left	21:43
cbreak	if you're a developer, then you won't get far without some kind of scm :)	21:44
	and git's the best of them :)	21:44
	← userbard left	21:45
	← JSharpe left	21:45
	→ JSharpe joined	21:46
esc	git++	21:46
ology	git++ indeed	21:47
thorbjornDX	git makes everything easier	21:47
	← Nugget_ left	21:48
	→ Nugget joined	21:48
	→ zodiak joined	21:49
	→ hays joined	21:50
zodiak	hey guys and gals, how the heck do I get out of 'fatal: You are in the middle of a cherry-pick -- cannot amend.' ?	21:50
	I have never seen this before in git	21:50
cbreak	you cherry picked	21:50
	and there was probably a conflict	21:50
	and you have not yet resolved that with a commit	21:50
	you can abort it with git reset --hard HEAD (probably) :)	21:50
	or commit I guess	21:50
IP_Prob	Ah, branch downloaded, or checked out, or whatever, and I can now see it in my local file system.	21:51
	← alunduil left	21:51
cbreak	checkout is local only	21:51
	← eijk_ left	21:51
cbreak	no downloading involved	21:51
	→ madewokherd joined	21:55
	← cyphase left	21:55
	← BadDesign left	21:56
	← john2496 left	21:56
	← tdowg1 left	21:57
	→ aspotashev joined	21:58
	← Mode-M left	21:59
	← jimmyeatworld left	21:59
	→ simesy_work joined	21:59
	→ unseensoul joined	22:00
canton7	zodiak, git cherry-pick --abort is the newer, more correct way to abort a cherry-pick	22:01
	← chrisgeorge left	22:01
	← simesy_work left	22:01
zodiak	canton7, danke.. that's the ticket	22:02
	← skorgon left	22:02
	← diago left	22:02
	← ventsislav left	22:02
	→ thirdknife joined	22:02
	→ simesy_work joined	22:02
	→ HardDisk_WP joined	22:02
HardDisk_WP	hi	22:02
gitinfo	HardDisk_WP: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	22:02
HardDisk_WP	i accidentally commited my telephone number, but didn't push the commit	22:02
	how do I "delete" the commit?	22:02
cbreak	commit --amend it out	22:02
	or git reset --soft the commit away	22:03
	→ chrisgeorge joined	22:03
HardDisk_WP	git reset --soft doesnt work, the commit still appears in git log	22:04
canton7	or see !fixup	22:04
gitinfo	So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	22:04
	← martinjlowm left	22:04
cbreak	HardDisk_WP: you have to reset to HEAD~ of course...	22:04
	how do you think git knows how much history to nuke? :)	22:05
	← Destos left	22:05
HardDisk_WP	uh wait, won't this destroy my changes?	22:05
cbreak	not with --soft	22:05
	only if you happened to type --hard instead	22:06
HardDisk_WP	cool	22:06
	thanks	22:06
cbreak	naturally, commit --amend is easier	22:06
HardDisk_WP	cbreak, and another thing, I want to insert into the files something like the svn revision-id	22:07
	can i do this in git, too?	22:07
	← macabre left	22:07
	← unseensoul left	22:07
canton7	HardDisk_WP, see man gitattributes, ident and 582817	22:08
gitinfo	HardDisk_WP: the gitattributes manpage is available at http://git-scm.com/docs/gitattributes.html	22:08
	→ cyphase joined	22:08
canton7	s/582817 export-subst	22:08
	← babilen left	22:08
cbreak	HardDisk_WP: usually a bad idea	22:08
	← mmc1 left	22:09
	← ajw0100 left	22:10
HardDisk_WP	ok	22:10
	← hwrd\|work left	22:10
	→ nedbat joined	22:10
	→ babilen joined	22:10
	← Sky[x] left	22:10
	← simesy_work left	22:11
	→ hwrd\|work joined	22:12
	← yann\|work left	22:14
	rohan32 → rohan32\|afk	22:15
	← rob_w left	22:15
	← hinst left	22:16
	← srayner left	22:18
	← aspotashev left	22:18
	→ jan247 joined	22:19
	→ ultrixx joined	22:19
ultrixx	hi! what is a team provider?	22:20
felipec	is anybody else having problems with gitrss.q42.co.uk?	22:21
	← jan247 left	22:21
	→ jan247 joined	22:21
	← jan247 left	22:21
ultrixx	i would like to install a git plugin for eclipse and there are packages like jgit and egit. the latter is a "team provider" that uses jgit. could anybody explain that to me please?	22:23
	→ simesy_work joined	22:23
cbreak	I have no idea what a team provider is	22:23
	← Element9 left	22:24
ultrixx	ok that makes me feel better ;-)	22:24
	thanks	22:24
	→ ISF joined	22:24
	← mastro left	22:24
	→ constant joined	22:25
	→ eijk_ joined	22:26
constant	is there a way to verify that a git repository isn't corrupt?	22:26
	← Akufen left	22:26
	← AdrienBrault left	22:26
cbreak	you can try git fsck	22:26
	→ yann\|work joined	22:26
constant	cbreak: trying that	22:26
cbreak	don't know if that rehashes and verifies all its packs	22:27
	but it does something at least :)	22:27
constant	hehe okay	22:28
	→ opus joined	22:28
	→ ajacom joined	22:29
constant	cbreak: okay, git fsck turned up some problems	22:30
	fwiw, I was trying to rsync git dirs around	22:30
	and I'm pretty sure some got list	22:30
	given the size of of the tree, is there a faster way then fsync to figure out which files are missing?	22:31
cbreak	rsync is not usually a problem	22:31
	← arielpts- left	22:31
constant	dangling blob f101619be940d0e2eb7f03cf009dcf5cf21b025b	22:31
	dangling tree 4c2101d2e0cbf622af5a3d737ec98eba26ec39e0	22:31
	...	22:31
cbreak	unless you changed the source	22:31
	dangling things are no problem	22:31
constant	no, I didn't	22:31
	oh?	22:31
	→ arielpts joined	22:31
	← arielpts left	22:31
constant	what does that mean? things that should be garbage collected?	22:31
	→ aspotashev joined	22:31
cbreak	they will get garbage collected eventually	22:31
constant	cbreak: is there a way to say across the network: 'are these two git repos the same' ?	22:32
	→ arielpts joined	22:32
	← arielpts left	22:32
	← ShadeTornado left	22:32
constant	maybe mtree might help	22:32
	constant things	22:32
constant	* thinks	22:32
cbreak	the same?	22:32
	→ bartek joined	22:32
cbreak	just compare the output of git ls-remote	22:32
constant	identical, have the same set of commits	22:32
	constant tries	22:32
	→ arielpts joined	22:32
	← arielpts left	22:32
constant	cbreak: what do you mean?	22:32
	→ arielpts joined	22:33
	← arielpts left	22:33
cbreak	if ls-remote output is the same, then they have the same history	22:33
	that doesn't mean that they have the same data store content	22:33
constant	one is local?	22:33
	→ arielpts joined	22:33
	← arielpts left	22:33
cbreak	some might have other pack files, different garbage, ...	22:33
constant	ok	22:33
	constant got confused by -remote	22:34
cbreak	git ls-remote .	22:34
	for the local one	22:34
	← Vile left	22:34
	→ arielpts joined	22:34
	← arielpts left	22:34
	← cworth left	22:34
	→ Vile joined	22:35
constant	cbreak: hang on	22:35
	→ arielpts joined	22:35
	← arielpts left	22:35
	→ xplat joined	22:35
	→ arielpts joined	22:35
	← arielpts left	22:35
	→ arielpts joined	22:36
	← arielpts left	22:36
	← pantsman left	22:36
	← chrisgeorge left	22:36
	→ arielpts joined	22:36
constant	cbreak: awesome - it seems to be identical - thanks	22:36
	→ Imaginativeone joined	22:36
	← thiago left	22:37
	← arielpts left	22:37
constant	cbreak: except: error: unable to find d0fd194fd6c74a8fe333eb68698337eef16273fc	22:37
	when I do 'git checkout .'	22:37
	→ Destos joined	22:37
cbreak	checkout .?	22:37
	→ arielpts joined	22:38
	← arielpts left	22:38
cbreak	what are you trying to do?	22:38
constant	I have the .git files	22:38
	I want to get the working copy	22:38
cbreak	git clone	22:38
	→ arielpts joined	22:38
	← arielpts left	22:38
constant	notice: HEAD points to an unborn branch (testingmem) --> from git fsck	22:38
	→ arielpts joined	22:39
	← arielpts left	22:39
constant	cbreak: why can't I 'checkout' into an empty folder?	22:39
cbreak	so either you inited a fresh repository	22:39
	or you did git checkout --orphan	22:39
constant	I did neither	22:39
cbreak	git checkout is a branch switching command	22:39
	it's used to switch branches	22:39
constant	ok	22:39
	→ arielpts joined	22:39
	← arielpts left	22:39
cbreak	switching branches is done in git repositories	22:39
	not in empty folders	22:39
constant	ok	22:39
	→ ultrixx_ joined	22:39
constant	cbreak: the reason I thought that would work	22:40
	→ arielpts joined	22:40
	← arielpts left	22:40
cbreak	if you want a working copy, use git clone	22:40
constant	is because if you remove a file, and want it back, you can use git checkout	22:40
	← pppaul left	22:40
cbreak	or git init a repo and then fetch history	22:40
	that's git checkout in file mode	22:40
	← bubbles10101 left	22:40
cbreak	only works inside repositories too	22:40
	→ arielpts joined	22:40
RichiH	!mr	22:40
	→ thiago joined	22:40
RichiH	hmm	22:40
	→ bubbles10101 joined	22:41
RichiH	!mr is a tool to manage Multiple Repositories, see http://joeyh.name/code/mr/	22:41
	← v0n left	22:41
	RichiH stabs the bot a bit	22:41
RichiH	abaratican: see the link above	22:41
	!help	22:41
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.	22:41
	← ultrixx_ left	22:42
	→ Freeder joined	22:42
RichiH	.trigger_new mr a tool to manage Multiple Repositories, see http://joeyh.name/code/mr/	22:43
	← ultrixx left	22:43
RichiH	.trigger_edit mr a tool to manage Multiple Repositories, see http://joeyh.name/code/mr/	22:43
gitinfo	RichiH: Okay.	22:43
RichiH	good good	22:43
	← john3 left	22:43
Freeder	hi.. will apologize up front for the n00bness. My local git repo is now out of synch with the main repo. How should I go about getting my local matched back up, w/o affecting the main repo?	22:43
cbreak	git fetch theremote	22:44
	then merge or rebase what ever you want	22:44
Freeder	well, that second part is where I need help, I guess	22:44
	← bartek left	22:44
Freeder	what does fetch do, versus merge?	22:44
	I thought fetch would synch it up	22:44
cbreak	fetch gets history from the remote	22:45
	merge merges stuff into the current branch	22:45
Freeder	ah	22:45
	→ hellopat joined	22:45
	→ crazydip joined	22:45
cbreak	you probably want to do a git pull --rebase	22:45
	which does both a fetch and a rebase	22:45
Freeder	so if I want to merge from remote->local ....?	22:45
	I'm just very worried I will end up overwriting the remote with my screwed up local stuff	22:45
cbreak	if you want to merge, you'd use just git pull	22:46
	which is fetch + merge	22:46
	← bubbles10101 left	22:46
cbreak	both will not modify anything but your local repository	22:46
Freeder	ok, great	22:46
cbreak	if you want to modify anything outside, you will have to push	22:46
Freeder	will look at those options for a bit	22:46
cbreak	(push is the opposite of fetch)	22:46
Freeder	you would think it would be opposite of pull!	22:46
	heh	22:46
cbreak	you're not the first who thought that	22:47
Freeder	ok, thanks again for the help	22:47
	will see how far I can get	22:47
cbreak	np	22:47
	← chris64 left	22:48
Freeder	ok, pull did it	22:48
	great	22:48
	→ john3 joined	22:49
	← JaredMiller left	22:50
	→ oxidative joined	22:50
	← Destos left	22:50
	→ kermit joined	22:50
	← scelis left	22:51
	rohan32\|afk → rohan32	22:52
	← ajacom left	22:53
	← j416 left	22:55
	← project2501a left	22:56
	→ Destos joined	22:56
	→ private joined	22:56
	private → Guest19433	22:56
	→ project2501a joined	22:57
	→ pfFredd joined	22:59
	← thirdknife left	23:00
	→ thirdknife joined	23:00
	← trungqtran left	23:00
	← dnstbr left	23:01
	→ zastern joined	23:01
	← gusnan left	23:01
	← jarr0dsz left	23:01
	→ jcao219 joined	23:02
	← eijk_ left	23:02
	← alexstanford2 left	23:03
	← jaseemabid left	23:03
	→ alexstanford joined	23:04
	← rockets left	23:04
	→ jalama joined	23:05
	← alansaul left	23:06
	← psoo left	23:07
	← Chillance left	23:07
	→ hotovson_ joined	23:08
	→ reuf joined	23:08
	← monokrome left	23:10
	← crazydip left	23:11
	→ monokrome joined	23:11
	→ marhaban joined	23:12
	← devth left	23:14
	→ mikepack joined	23:16
	← hwrd\|work left	23:16
	→ bubbles10101 joined	23:19
	← axl_ left	23:19
	← simesy_work left	23:20
	→ axl_ joined	23:20
	← chuckharmston left	23:20
	→ rockets joined	23:21
	← rockets left	23:22
	← gtrak left	23:22
	← zastern left	23:24
	→ simesy_work joined	23:25
	← jalama left	23:26
	← simesy_work left	23:26
	→ lethjakman_work joined	23:27
lethjakman_work	hey, I'd like to use git for a website, is there any way I can not have the .git inside of a directory?	23:28
	← giallu left	23:30
	← pfFredd left	23:31
	→ daniel_- joined	23:32
	→ alunduil joined	23:33
	→ hwrd\|work joined	23:34
	← daniel_-_ left	23:34
	→ goshawk joined	23:34
	← SirCmpwn left	23:35
	← SegFaultAX\|work left	23:38
	← cakehero left	23:38
ejb	Is there a git command I can use to only show new/modified lines of files (without '+' or other symbols prefixing)?	23:38
	← Davey left	23:39
thiago	ejb: a simple sed script on the output of diff would do it	23:39
	→ timj joined	23:39
thiago	git diff \| sed -n '/^+/{s///;p}'	23:40
	← beneggett left	23:40
	← DjMadness left	23:41
RichiH	lethjakman_work: look at apache config; there is a way to hide certain patterns	23:41
	hiding .git, .svn, etc is rather common	23:41
	SirCmpwn_ → SirCmpwn	23:41
	← reuf left	23:42
ejb	thiago: thank you. Unfortunately that lets the name of the file through	23:42
	→ acrocity_ joined	23:43
	ejb needs to learn the ways of `sed`	23:43
	→ simesy_work joined	23:43
	→ kerrick joined	23:44
	← CollinPDX left	23:44
	← TeckniX left	23:44
	→ CollinPDX joined	23:44
	← aspotashev left	23:44
	→ aspotashev\| joined	23:44
	← gumnos left	23:45
thiago	awk '/^+/ && doprint { print substr($0, 2) } /^@/ { doprint = 1 } /^---/ { doprint = 0 }'	23:45
	will fail if you have removed lines starting with dash-dash	23:45
	← todd_dsm left	23:46
	← samphippen left	23:46
	← devinrhode2 left	23:47
	← kermit left	23:47
	EugeneKay hands sitaram a Guinness	23:48
	← bubbles10101 left	23:48
ejb	thiago: can you explain that a bit? does ^@ set doprint=1?	23:48
	← marhaban left	23:49
thiago	it's "condition { code }"	23:49
	← Freeder left	23:49
thiago	if (condition) { code }	23:49
	← hachque left	23:50
	← simesy_work left	23:50
	→ hachque joined	23:50
	→ tinti joined	23:50
	← adamben left	23:52
	→ adamben joined	23:54
	← hachque left	23:55
	← aselder left	23:55
	→ simesy_work joined	23:56
	→ rchavik joined	23:56
	← rchavik left	23:56
	→ rchavik joined	23:56
	→ worstadmin_ joined	23:58
	← worstadmin_ left	23:59

Logs Search ←Prev date Next date→

Channels Documentation