IRCloggy #git 2012-05-17

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-05-17
	← panpainter left	00:00
	← beatak left	00:00
	← pppaul left	00:00
	→ pppaul joined	00:01
	← Goplat left	00:02
	→ ConstantineXVI joined	00:02
	→ jackh joined	00:02
	← dr_lepper left	00:03
	→ kukks joined	00:04
	← kukks left	00:04
	→ kukks joined	00:04
	← anth0ny left	00:05
	← enigmus left	00:06
	← gtrak left	00:06
	← ispeak left	00:07
	→ enigmus joined	00:07
	→ dsantiago joined	00:09
	→ acl__ joined	00:09
	← acl_ left	00:10
	→ nesneros joined	00:10
	→ masterkaen joined	00:10
k-man	was there a --recurse-submodules option that got changed to --recursive?	00:10
	← kaen left	00:10
	→ ISF joined	00:11
	→ MistuhKurtz joined	00:12
	acl__ → acl_	00:13
	→ dv310p3r joined	00:14
	← nadavoid left	00:14
	→ imachuchu joined	00:15
	← pppaul left	00:15
	→ pppaul joined	00:16
	→ newbie999 joined	00:17
	← davidbanham left	00:18
	→ Goplat joined	00:18
	→ dcarper joined	00:21
	← soreau left	00:25
	← Targen left	00:25
	← dcarper left	00:25
	← pppaul left	00:26
	← fukushima left	00:27
	← nesneros left	00:27
	→ pppaul joined	00:27
	→ nesneros joined	00:28
	← vervic left	00:31
	← txomon left	00:31
	→ cbreak joined	00:33
	→ vervic joined	00:34
	← wo0f left	00:35
	→ wo0f joined	00:35
	→ enmand joined	00:37
	→ chrisgeorge joined	00:38
	→ soreau joined	00:39
	← kenperkins left	00:39
	← chrisgeorge left	00:40
	→ johnanderson joined	00:42
	← timj1 left	00:42
	← optixx left	00:42
	→ doug joined	00:43
doug	ok, this branch has gone on too long. how can i split the last 20 commits off it into another branch?	00:43
	← dreiss left	00:44
	← pppaul left	00:44
	→ rurufufuss joined	00:44
doug	i.e. take the last 20 commits off branch a and make them branch b that branched off branch a 20 commits ago	00:44
	removing them from branch a	00:45
soreau	I created a patch with git commit -a -m "message" && git format-patch origin but the date/time is Mon Sep 17 00:00:00 2001. My system date/time is correct, what is the problem?	00:45
	→ optixx joined	00:45
soreau	the date in the patch is wrong	00:45
bob2	doug, make a branch	00:45
	doug, then reset a to point at -20	00:45
	→ pppaul joined	00:45
	← harish left	00:46
	→ wo0f1 joined	00:46
	← wo0f left	00:47
soreau	even when I create a new patch, it's the exact same date/time	00:47
	→ mythmon joined	00:47
bremner	origin is a branch?	00:47
mythmon	How could I show the differences between a file in one branch with a different file in another branch?	00:48
	← jackh left	00:48
doug	bob2++	00:48
	← doug left	00:48
bob2	diff + git show I Guess	00:48
	→ krnl joined	00:49
	→ solussd_ joined	00:51
mythmon	the problem is that a coworker of mine hacked for quite a while on a branch, it was based on rather old code. then he merged in master manually, but I don't know which version he merged in.	00:51
EugeneKay	mythmon - checkout the file, use vanilla 'diff'	00:51
mythmon	and when I say 'merged in' I don't mean git merge, I mean I bet he copy/pasted code etc etc	00:51
	sigh. Alright, thanks.	00:51
kpreid	mythmon: git diff branch1:file branch2:file	00:53
	→ hellopat joined	00:53
	← pppaul left	00:53
mythmon	kpreid++	00:53
	awesome, thank you.	00:53
	→ pppaul joined	00:53
kpreid	in general <tree-ish>:<path> is a syntax recognized by git	00:54
mythmon	I haven't run in to that before, so that is very helpful	00:54
kpreid	also useful with git show for retrieving individual files	00:54
	← abetaha left	00:54
kpreid	(that oyu don't want to just overwrite like git checkout would)	00:55
mythmon	my method was going to be checking out different versions of the tree, and copy files out to /tmp and diffing them there.	00:55
kpreid	if you had to, that would better be done diff -u <(git show branch1:file) <(git show branch2:file)	00:56
	(well, <(...) is a bashism)	00:56
mythmon	right	00:56
	neat.	00:56
kpreid	but luckily git diff does the right thing	00:56
mythmon	like I said, I didn't know about treeish:path before, so thats cool.	00:56
kpreid	the manpage for git rev-parse is worth a look	00:57
	it documents all such notations	00:57
mythmon	alright. I was going to go hunt for that man page, as I wanted to be able to... do something I forgot now.	00:57
	Anyways, I will give it a read.	00:58
	← pppaul left	00:58
	→ imachuch1 joined	00:58
kpreid	also, if you like web browsers better than man(1), try git help --web rev-parse	00:58
	→ pppaul joined	00:58
mythmon	<3 CLI	00:58
	← maletor left	00:59
soreau	Why are my patches being created with wrong date/time, fixed to Mon Sep 17 00:00:00 2001?	00:59
	← imachuch1 left	01:00
kpreid	With what command are you creating them?	01:00
	← SkAzZ2 left	01:00
soreau	<soreau> I created a patch with git commit -a -m "message" && git format-patch origin but the date/time is Mon Sep 17 00:00:00 2001. My system date/time is correct, what is the problem?	01:01
kpreid	git-format-patch(1): "The patch produced by git format-patch is in UNIX mailbox format, with a fixed "magic" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"	01:01
	← imachuchu left	01:02
kpreid	presumably you use it as a mail draft and give it a real timestamp when sent	01:02
soreau	ah, all my patches have been like this and I never noticed	01:02
	guess it's not a problem	01:03
	→ xiangfu joined	01:03
	← pppaul left	01:04
	→ imachuchu joined	01:04
	← jstout24 left	01:04
	← johnanderson left	01:05
	→ hachque joined	01:05
	→ marhaban joined	01:05
imachuchu	sorry I couldn't say this earlier, but git difftool can be used instead of git diff to use an external tool (like vimdiff)	01:05
	→ pppaul joined	01:05
	→ strobert joined	01:06
	← edude03 left	01:06
	← mikepack left	01:07
	← pheaver left	01:08
	← marhaban left	01:08
mythmon	imachuchu: thanks.	01:08
	plain diff has given me enough information, but I do like me some vimdiff.	01:08
imachuchu	mythmon: np, sorry I couldn't chip in earlier	01:09
	→ diegoviola joined	01:09
imachuchu	mythmon: and diffing tree objects (commits, branches, tags, stashes, local changes) is bread and butter for making good commits	01:10
	mythmon: so I thought it worth throwing out there	01:10
mythmon	imachuchu: i wish I could get my team mates to listen to that :)	01:10
	→ davidbanham joined	01:11
	← pppaul left	01:11
imachuchu	mythmon: let them see you doing it, let them watch you take changes from multiple different branches, different states of the code, meld them into one coherent history, and they will want the same	01:12
	← berserkr left	01:12
mythmon	imachuchu: well, it won't matter soon. its for university senior design, and we are almost done with the proejct.	01:12
	but it has been clear that they have been treating git and github like FTP.	01:12
	→ pppaul joined	01:13
mythmon	anyways, I shouldn't rant.	01:13
imachuchu	mythmon: I was there not too long ago, we used svn and it got abandoned since it was so painful to use	01:13
	← aristidesfl left	01:13
	← solussd_ left	01:13
	→ abetaha joined	01:13
imachuchu	mythmon: at least you can bring some knowledge away from it	01:13
	→ Vampire0 joined	01:13
	→ solussd_ joined	01:14
	→ aristidesfl joined	01:14
	→ meisth0th joined	01:15
meisth0th	hello	01:15
gitinfo	meisth0th: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	01:15
	← neurodrone left	01:15
imachuchu	never saw that bit about backing up first, good advice	01:16
	← Vampire0_ left	01:16
mythmon	!backup	01:16
gitinfo	Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups	01:16
meisth0th	i am using git archive --format tar.gz -o filename.tar.gz origin to get tar.gz archive of my project's current snapshot, but i want a root folder, an all files to be in that folder in tar.gz archive. is there such a parameter	01:17
	?	01:17
	--prefix did the trick, thanks :P	01:17
	→ erkules\|away joined	01:18
	← ShooterM_ left	01:18
	→ gid joined	01:18
	→ ShooterM_ joined	01:18
	← solussd_ left	01:19
imachuchu	meisth0th: glad we could help?	01:19
	← Lgb left	01:20
	→ efreese joined	01:20
	→ w09x joined	01:20
	← pdtpatrick left	01:20
	← ConstantineXVI left	01:20
	← erkules left	01:20
	→ intripoon_ joined	01:20
	→ alberto56 joined	01:21
	→ wo0f joined	01:22
	→ ymasory joined	01:22
	← efreese left	01:22
	← intripoon left	01:23
	→ efreese joined	01:23
	→ Lgb joined	01:23
	→ gavin_huang joined	01:23
	← wo0f1 left	01:23
	→ kenperkins joined	01:23
	→ Destos joined	01:25
	← efreese left	01:25
	→ ianmcorvidae\|alt joined	01:26
	← ianmcorvidae left	01:26
	← ianmcorvidae\|alt left	01:27
	← wo0f left	01:27
	→ ianmcorvidae joined	01:27
	← ianmcorvidae left	01:27
	→ ianmcorvidae joined	01:27
	strobert → strobert_	01:28
	← Bombe left	01:28
	← osmosis left	01:28
	← alberto56 left	01:28
	→ mritz joined	01:28
	strobert_ → strobert	01:29
	← gavin_huang left	01:30
	→ kcj joined	01:32
	→ gavin_huang joined	01:33
	← Textmode left	01:33
	→ alberto56 joined	01:33
	→ Bombe joined	01:34
	← kcj left	01:35
	← pppaul left	01:35
	→ alexisabril joined	01:36
	→ pppaul joined	01:36
	← mritz left	01:37
milki	zing	01:37
	← alexisabril left	01:38
	← aristidesfl left	01:39
	→ aristidesfl joined	01:39
	→ edude03 joined	01:40
	→ Chib joined	01:40
	→ ConstantineXVI joined	01:41
	→ ferdna joined	01:41
	→ cooloney joined	01:41
	← pppaul left	01:41
	→ pppaul joined	01:42
	← mocramis left	01:43
	→ harish joined	01:43
	→ mocramis joined	01:43
	→ mritz joined	01:44
	← Destos left	01:44
	← fuzzybunny69y left	01:47
	← pppaul left	01:48
	→ pppaul joined	01:49
	← MistuhKurtz left	01:50
	← ipalaus_ left	01:51
	← mattp_ left	01:52
	← soreau left	01:53
	→ mattp_ joined	01:53
	← pppaul left	01:54
	→ pppaul joined	01:54
	← mritz left	01:55
	→ zdk joined	01:55
	→ juvenal joined	01:58
	← Eridius left	01:59
	→ Targen joined	02:00
	← aristidesfl left	02:00
	← ShooterM_ left	02:00
	→ johnanderson joined	02:04
	← johnanderson left	02:04
	→ Davey joined	02:04
	→ soreau joined	02:05
	← d4rklit3 left	02:05
	→ ShooterM_ joined	02:06
	← meLon_ left	02:06
	← asedeno_work left	02:07
	← mcluskydodallas left	02:07
	← meLon left	02:10
	← alberto56 left	02:10
	← xiangfu left	02:11
	→ wolftankk joined	02:13
	← gavin_huang left	02:13
	→ gavin_huang joined	02:14
	← pppaul left	02:15
	← saintwolf left	02:16
	→ pppaul joined	02:16
	→ xsbeats joined	02:16
walkerneo	no one is ever here	02:16
	ffs	02:17
	← oriba left	02:17
	→ xiangfu joined	02:17
	← hellopat left	02:18
imachuchu	I'm here	02:18
	← enmand left	02:18
imachuchu	no one has been asking questions, also it's busier earlier in the day	02:19
	→ HyperNerdV2_ joined	02:19
	→ asedeno_work joined	02:20
bremner	walkerneo: you need a better IRC client, then you could tell there are many people here.	02:20
	← Gitzilla left	02:20
	← gavin_huang left	02:21
	← Araxia_ left	02:21
walkerneo	Alright, well I have an issue sort of thing	02:21
	→ saintwolf joined	02:21
walkerneo	here: http://stackoverflow.com/questions/10629068/git-ignore-htaccess-file-for-test-subdomain-or-better-method	02:21
	→ dcarper joined	02:21
	← HyperNerdV2 left	02:22
	← xiangfu left	02:23
	← HyperNerdV2_ left	02:23
bremner	I'm not sure I follow the details, but it sounds like a case for !config	02:23
gitinfo	[!configfiles] the recommended way is to change your application so that you can (perhaps optionally) store site-specific configuration/data in separate files, then keep those files out of version control. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	02:23
bob2	yes	02:23
	ps probably want mod_wsgi instead	02:23
	→ gavin_huang joined	02:24
	→ xiangfu joined	02:25
	← dcarper left	02:26
	← Chib left	02:26
	← orafu left	02:27
	→ orafu joined	02:27
	← gavin_huang left	02:28
	← alvaro_o left	02:30
	→ Gitzilla joined	02:30
	← asedeno_work left	02:30
	← thearthur left	02:31
	→ asedeno_work joined	02:31
	→ thearthur joined	02:32
	← ConstantineXVI left	02:34
	← pppaul left	02:35
	→ pppaul joined	02:35
	→ sebastorama joined	02:40
	→ gavin_huang joined	02:40
	→ Per4u3e joined	02:41
	← gid left	02:43
	→ mikepack joined	02:44
	← p3rror left	02:48
	← TomyLobo left	02:51
	← bitkiller left	02:51
	→ machty joined	02:52
	→ macUzer joined	02:55
	→ weiyang joined	02:55
	→ chaowang joined	02:57
	← philips left	02:59
	→ jackh joined	02:59
	→ soreau_ joined	02:59
	← Targen left	02:59
	← ISF left	02:59
	← soreau left	02:59
	soreau_ → soreau	02:59
	→ Yuuhi` joined	03:00
	→ solussd_ joined	03:00
	← jcontra left	03:00
	← rrn left	03:01
	→ philips joined	03:01
	← sgronblom left	03:01
EugeneKay	walkerneo - there's usually about 800 people here. Only a few of them !ask any questions ;-)	03:02
gitinfo	walkerneo: 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.	03:02
	← Yuuhi left	03:02
	← thearthur left	03:03
walkerneo	So this guy says: However, if you change the .git/info/exclude file of the dev repo(which uses the same format as .gitignore, but isn't versioned), then the .htaccess file will be ignored there, and left alone elsewhere. That should work, haven't tried it, though.	03:03
	← gavin_huang left	03:03
walkerneo	should I do that, or use what bremner mentioned, though I don't really know what he means	03:04
	← macmartine left	03:05
	→ rrn joined	03:07
	← harish left	03:07
	sucitivel → TrollBaiter	03:07
	← ymasory left	03:08
	→ gavin_huang joined	03:08
	← Chillance left	03:10
	gitinfo set mode: +v	03:13
iwoj	whenever I try to use the --git-dir flag, I always get "fatal: Not a git repository: " error… what up with that?	03:13
	→ beautifulmind joined	03:14
offby1	maybe your current directory isn't inside a git tree?	03:15
	← solussd_ left	03:15
iwoj	it's got a .git directory	03:16
	I just cloned into it	03:16
	→ pheaver joined	03:16
iwoj	I'm running git from outside that directory, though	03:16
	(which is what I thought the flag was for)	03:16
	→ a\|i joined	03:17
iwoj	I'll just do "cd ~/foo && git bar"	03:17
a\|i	I have a 500kb binary file in my git repo which keeps changing, would this keep increasing the git repo size by accummulation?	03:18
offby1	of course	03:18
	← Slix` left	03:19
	→ ipoval joined	03:19
a\|i	of course? any cure for this?	03:20
	← legumbre left	03:20
SethRobertson	a\|i: Read !best for ideas. For instance, consolidate into a subproject to perhaps allow aggressive history rewriting to nuke unneeded versions	03:21
gitinfo	a\|i: [!best_practices] There is no one right answer for git best practices, but a consensus from #git is available at http://sethrobertson.github.com/GitBestPractices/	03:21
	→ glennpratt joined	03:21
	→ neurodrone joined	03:21
	→ xjiujiu joined	03:21
a\|i	SethRobertson: how to get rid of the existing binary trace after moving to a subproject?	03:23
	← nesneros left	03:25
	← jameswarren left	03:26
	← gavin_huang left	03:27
	← ehsan left	03:27
	→ fukushima joined	03:28
	← pheaver left	03:28
	← krnl left	03:29
	← luke-jr left	03:31
	→ gavin_huang joined	03:32
	→ legumbre joined	03:32
	← vitor-br left	03:32
	→ arvind_khadri joined	03:33
	← legumbre left	03:33
	→ legumbre joined	03:34
	→ d4rklit3 joined	03:34
	→ pheaver joined	03:36
	← a\|i left	03:36
	← gavin_huang left	03:37
	← Per4u3e left	03:37
	← az left	03:40
	→ gavin_huang joined	03:41
	→ alexukf joined	03:42
	→ az joined	03:43
	← mikepack left	03:43
	→ harish joined	03:43
	← rrn left	03:45
	← gavin_huang left	03:45
	→ rrn joined	03:46
	← X1z0r left	03:49
	→ luxurymode joined	03:50
	→ Per4u3e joined	03:51
	→ gavin_huang joined	03:52
	← v0n left	03:53
	← machty left	03:54
	← yuriks_ left	03:57
	← alexukf left	03:58
	→ akiress joined	03:58
	← gavin_huang left	03:59
	→ gavin_huang joined	04:00
	← Per4u3e left	04:02
	→ localhost joined	04:02
	← lausi left	04:02
	→ lausi joined	04:02
	← iamjarvo left	04:02
	← fukushima left	04:05
	→ machty joined	04:08
	← optixx left	04:09
	← d4rklit3 left	04:09
	← az left	04:10
	← ianmcorvidae left	04:11
	→ optixx joined	04:11
	← Smirnov left	04:11
	← jackh left	04:11
	→ Smirnov joined	04:12
	← Smirnov left	04:12
	→ Smirnov joined	04:12
	← cilly left	04:12
	→ ianmcorvidae joined	04:12
	← ianmcorvidae left	04:12
	→ ianmcorvidae joined	04:12
	→ fukushima joined	04:13
	→ cilly joined	04:14
	→ sangi joined	04:14
	← WebDragon left	04:15
	→ cagedwisdom_ joined	04:17
	→ walkerneo_ joined	04:17
	← cagedwisdom left	04:17
	← walkerneo left	04:18
	← yosinof left	04:18
	→ rchavik joined	04:18
	← optixx left	04:19
	→ zheng joined	04:19
	→ optixx joined	04:21
	→ pjn_oz joined	04:21
	→ dcarper joined	04:22
	← pppaul left	04:22
	→ az joined	04:22
	→ michaelgamble joined	04:23
michaelgamble	heyo	04:23
	→ pppaul joined	04:23
michaelgamble	got a question, if i have a large binary file in a git repo would it be expected that i would be registering less then 1mb/s on a gigabit lan that typically transfers at 15-20 mb/s.. any idea why i would be seeing a slowdown?	04:25
	when i say typically transferring I'm talking about standard samba file share	04:26
	← dcarper left	04:26
	← pppaul left	04:27
	← jspiros left	04:27
	← glennpratt left	04:28
	→ pppaul joined	04:28
	TrollBaiter → sucitivel	04:29
	← madewokherd left	04:29
	← cyb3r3li0g left	04:30
	→ skylamer` joined	04:31
	→ mmc joined	04:32
	← xiangfu left	04:34
	→ dreiss joined	04:35
	← zheng left	04:37
	→ BarryCrayon joined	04:38
	→ mritz joined	04:39
	→ tkil joined	04:40
tkil	does anyone have a recipe handy for converting a repo to the equivalent of a "git clone --mirror" result? my use case is that i cloned the linux-stable repo, have done some work in it, but now want to have a centralized (within my company) copy so i can push/pull updates against linux-stable from/to multiple workstations.	04:41
	preferably without re-fetching all of -stable, as i have a local copy of it already...	04:42
SethRobertson	clone --reference	04:42
	← luxurymode left	04:42
RandalSchwartz	yes	04:42
	← acl_ left	04:42
RandalSchwartz	--reference	04:42
tkil	seth, merlyn -- thanks, will go read up on that.	04:43
	tkil wonders if FirstLast is the new trend...	04:43
	← BarryCrayon left	04:43
	RandalSchwartz wonders why tkil didn't just already read that	04:43
tkil	RandalSchwartz -- mostly because i've become convinced that my brain simply does not grok git (witness my last few exchanges on the mailing list). so i tend to google for terms that seem relevant (which is how i found something like http://stackoverflow.com/questions/3959924/whats-the-difference-between-git-clone-mirror-and-git-clone-bare ).	04:45
	so now i know something new, and i'm off to RTFM. :)	04:45
	hm. although it looks like --reference uses alternates by default, when i eventually would like to nuke my original copy.	04:46
	tkil digs further	04:46
tkil	although i saw a discussion on unpack / gc that seems to "undo" alternates, maybe that's the easy way forward.	04:46
	or do --reference clone and then start copying config bits.	04:47
EugeneKay	tkil - it's an old trend. Hiding behind a psuedonym is so late 90s	04:47
tkil	EugeneKay -- maybe. i've been tkil since the mid-1980s, and i've been lucky enough to have few collisions...	04:48
EugeneKay	I wanted EugeneK, but some git already registered the domain.	04:49
	RandalSchwartz pretends that everything he's said is relevant to any repo, unless otherwsise stated	04:49
	RandalSchwartz wanders off	04:49
tkil	hm. still not sure that --reference DWIM, as i want to copy data from a local repo but i want the --mirror to act as though it were from the original kernel.org one. hm. maybe just bite the bullet and clone the bloody thing again. networking is cheap.	04:49
EugeneKay	RandalSchwartz - have a !botsnack	04:49
gitinfo	RandalSchwartz: Om nom nom	04:49
	← iwoj left	04:50
	→ harshpb joined	04:50
	→ pcleddy joined	04:52
kevlarman	tkil: i think you could git clone --mirror the local one then mess with the remote url	04:52
	→ kcj joined	04:53
	← mischat left	04:54
	← mritz left	04:55
	← akiress left	04:57
tkil	kevlarman -- probably. i'll take a look. thanks!	04:58
	→ jameswarren joined	04:58
	← devth_ left	04:59
	← ferdna left	04:59
tkil	ooh. "Clone from upstream while borrowing from an existing local directory" in the git-clone manpage	05:00
kevlarman	tkil: that has all the annoying downsides of --reference	05:03
	← kenperkins left	05:03
tkil	kevlarman -- right, but they also mention that doing a repack will fix that.	05:03
	→ pdtpatr1ck joined	05:03
	→ wo0f joined	05:04
	← teweWORK left	05:04
	← harshpb left	05:05
	← optixx left	05:05
	→ The joined	05:06
	← The left	05:06
	→ harshpb joined	05:07
	→ optixx joined	05:07
	← michaelgamble left	05:08
	← wo0f left	05:09
r0csteady	Bu 8	05:09
	→ kenperkins joined	05:10
	→ jspiros joined	05:10
	→ cakehero joined	05:12
	→ wo0f joined	05:12
	→ cagedwisdom joined	05:12
	→ HyperNerdV2 joined	05:13
	← kukks left	05:15
	← majuscule left	05:17
	→ giallu joined	05:20
	← wo0f left	05:21
	← frogonwheels left	05:21
	→ frogonwheels joined	05:22
	→ wo0f joined	05:22
	← pcleddy left	05:25
	→ fp1 joined	05:25
	→ harish_ joined	05:25
	← btree_ left	05:26
	← harish left	05:28
	→ kerrick joined	05:29
	← sacarlson left	05:29
	→ ehsan joined	05:30
	← yoklov left	05:31
	← walkerneo_ left	05:31
	← pppaul left	05:32
	→ walkerneo joined	05:32
	← harshpb left	05:32
	← giallu left	05:32
	→ pppaul joined	05:32
	→ mikepack joined	05:33
	→ harshpb joined	05:33
walkerneo	I'm using git to manage my website	05:35
	← gchristensen left	05:35
	← brokenshakles left	05:35
walkerneo	I created a subdomain - foo.bar.com - for testing, so that I could make changes to things without affecting the actual site	05:35
	There is an .htaccess file, however, with an absolute path to a passenger-wsgi python script	05:36
EugeneKay	walkerneo - !config	05:36
gitinfo	walkerneo: [!configfiles] the recommended way is to change your application so that you can (perhaps optionally) store site-specific configuration/data in separate files, then keep those files out of version control. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	05:36
walkerneo	I read that already :/	05:37
EugeneKay	example.htaccess in git, .htaccess untracked in your !deploy -ed version.	05:37
gitinfo	Git is not a deployment tool, but you can build one around it for simple environments. Here is an example hook to get you started: http://goo.gl/l68hq	05:37
walkerneo	I don't follow	05:38
	← Gentlecat_ left	05:39
EugeneKay	Rename .htacces in your repo to example.htaccess. When you deploy your site somewhere, copy it to .htaccess and modify as needed.	05:40
walkerneo	Alright, so just manually edit it each time?	05:41
	→ airborn joined	05:41
EugeneKay	Ayup. You probably won't be changing too much in a .htaccess.... and if you are, I suggest a psychiatrist.	05:41
walkerneo	Well, I actually have every file in public_html and just use .htaccess redirects to prettify the urls	05:42
	there are thousands of pages :P	05:42
	← pppaul left	05:42
walkerneo	not really though ...	05:42
	→ pppaul joined	05:42
	→ btree joined	05:43
walkerneo	So, I want to scrap the changes I just made with git	05:45
	How can I? Revert back to the last commit? I don't really understand the docs	05:46
EugeneKay	!fixup	05:46
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!	05:46
	← pppaul left	05:47
	→ ipalaus_ joined	05:47
	→ pppaul joined	05:47
	← mmc left	05:48
	→ pdtpatrick joined	05:48
walkerneo	Thanks	05:48
	So who is Seth Robertson anyway?	05:48
	→ brokenshakles joined	05:49
EugeneKay	He's SethRobertson.	05:50
	→ harsh_ joined	05:51
	← pdtpatr1ck left	05:51
	← davidbanham left	05:51
	→ duckxx joined	05:51
	← harshpb left	05:52
	→ davidbanham joined	05:52
	← harish_ left	05:54
tkil	ok, maybe i'm looking at this backwards. i'm doing tweaking against linux-stable, and i'm doing it on multiple workstations. i'd like a place to keep my tweaks so that i can access them from any workstation. (currently handled by hand-copying and -applying patches.) i think i want to mirror the kernel.org linux-stable repo, then "mirror" that so i have a central location to keep my own patches on.	05:54
	or do i want to create new branches in the mirror? will they be erased when i refresh the mirror?	05:54
	← Bass10 left	05:55
	← pppaul left	05:55
	→ icq joined	05:55
	→ pppaul joined	05:56
	→ Sigma joined	05:57
	→ maleknet joined	05:58
	← beautifulmind left	05:59
	← pppaul left	06:00
	→ pppaul joined	06:00
	← Goplat left	06:00
	→ philoserf_ joined	06:03
	← pheaver left	06:05
	← Karmaon left	06:06
	← kerrick left	06:06
	← wo0f left	06:07
	← philoserf_ left	06:07
	→ yizumi joined	06:08
	→ mxweas_ joined	06:08
	← dreiss left	06:10
	← macUzer left	06:12
	→ shal3r joined	06:12
	→ gchristensen joined	06:12
	← Fandekasp left	06:12
	→ kpreid_ joined	06:13
shal3r	`git push origin master` stopped at "Writing objects: 11% (112/1015)" and nothing is happening from there, no CPU or HDD are used. How to debug thing like that?	06:13
	← kpreid left	06:13
	kpreid_ → kpreid	06:13
	→ philoserf_ joined	06:14
	← peper left	06:15
	→ peper joined	06:16
nibalizer	shal3r: strace?	06:16
shal3r	nibalizer, i don't believe this is useful anyhow - http://pastebin.com/Gc0HZPVc . Last lines just keep repeating	06:18
	← drev1 left	06:18
nibalizer	werid	06:19
	is it using 100% of a cpu	06:20
	oh, you said it wasn't	06:20
	yea idunno, just ^C and try again i expect	06:20
shal3r	nibalizer, i tried and same thing happens again - stops ar 11%	06:20
nibalizer	wut	06:21
	and git status just works fine?	06:21
	← Radium left	06:22
	← harsh_ left	06:23
shal3r	nibalizer, yes, shows "Your branch is ahead of 'origin/master' by 1 commit" and list of changed files	06:23
	→ harsh_ joined	06:23
nibalizer	weird, where are you pushing to?	06:24
	i wonder if your out of disk space on the remote or something	06:24
	→ Radium joined	06:24
	→ ymasory joined	06:26
	→ shruggar joined	06:27
	→ Chibby_ joined	06:27
	→ iwoj joined	06:30
shal3r	nibalizer, i'm trying local git server, over ssh. I have no issues with disk space and whole size of project is ~2mb	06:31
	→ glcrazy joined	06:31
	← yizumi left	06:32
nibalizer	thats pretty bizare man, i don't know how to help	06:35
	→ mishok13 joined	06:35
	→ fisted joined	06:36
	← pppaul left	06:38
	← HyperNerdV2 left	06:38
	← Mowsh left	06:38
	← mxweas_ left	06:39
	→ pppaul joined	06:39
	← OOPMan left	06:39
	→ dvide joined	06:41
	→ xiangfu joined	06:43
	← ipalaus_ left	06:43
	← harsh_ left	06:43
	← optixx left	06:44
	→ harsh_ joined	06:44
	← imachuchu left	06:45
	→ subrosa joined	06:46
	→ yizumi joined	06:46
	← mikepack left	06:46
	→ optixx joined	06:47
	← xjiujiu left	06:49
	→ macrover joined	06:49
	← edude03 left	06:49
	→ dreiss joined	06:49
	← airborn left	06:50
	← eletuchy left	06:50
	→ DuzyZiemniak joined	06:50
	← fukushima left	06:52
	← philoserf_ left	06:53
	→ b1rkh0ff joined	06:53
	→ Darj joined	06:53
	→ the_cybersphinx joined	06:53
	→ fukushima joined	06:54
	→ mikepack joined	06:54
	← mikepack left	06:54
	→ OOPMan joined	06:56
	← cybersphinx left	06:57
	→ marthinal joined	07:01
	← walkerneo left	07:04
	← Silowyi left	07:05
	→ alexukf joined	07:06
	← optixx left	07:07
	→ angelsl joined	07:08
	← TTSDA left	07:08
	← WillMarshall left	07:08
	← shruggar left	07:08
	→ optixx joined	07:09
	→ raatiniemi joined	07:09
sangi	how to clone a specific revision from git repository	07:10
nibalizer	sangi: you can specify a tag	07:10
	i don't know how to specify a commit	07:11
	→ amcsi_work joined	07:11
	← jmspeex left	07:11
	→ barrbrain joined	07:12
	← fukushima left	07:13
	→ herdingcat joined	07:13
	→ jceb joined	07:14
	→ ph^ joined	07:14
	← nutron left	07:18
	← Lgb left	07:20
	→ stodan joined	07:20
	← PigeonFriend left	07:20
	→ robbyoconnor joined	07:21
	→ nutron joined	07:21
	← Dreadnaught left	07:23
	→ Lgb joined	07:23
	→ ipalaus_ joined	07:23
	→ Dave^\| joined	07:24
	→ fukushima joined	07:27
	← optixx left	07:27
	← btree left	07:27
	→ optixx joined	07:29
	→ harish_ joined	07:30
	← _huoxito left	07:31
	← gavin_huang left	07:31
	→ j0ran joined	07:33
	← ph^ left	07:35
	→ ph^ joined	07:35
	← sebastorama left	07:35
	← ipoval left	07:37
	→ Pupeno_W_ joined	07:37
	← pantsman left	07:38
	→ gavin_huang joined	07:38
	← Pupeno_W left	07:39
	Pupeno_W_ → Pupeno_W	07:39
	→ ph^_ joined	07:39
	← ph^ left	07:40
	→ btree joined	07:40
	→ longbeach joined	07:40
	← harsh_ left	07:41
	← sangi left	07:43
	→ mneorr joined	07:43
	→ shirish joined	07:44
	→ dkeuyof joined	07:46
	← j0ran left	07:46
	← optixx left	07:47
	← osX64 left	07:47
	← shirish left	07:47
	← ph^_ left	07:48
	→ whitman joined	07:48
	← btree left	07:48
	→ optixx joined	07:49
	← JohnBat26 left	07:53
	← fp1 left	07:54
	← mishok13 left	07:55
	→ caseymcg joined	07:57
	← machty left	07:58
	→ marc_kdab joined	07:58
	→ sangi joined	07:58
	→ giallu joined	07:59
	← giallu left	07:59
	→ giallu joined	07:59
	← ColKurtz left	08:00
	→ ColKurtz joined	08:01
	← bgerber left	08:02
	→ j0ran joined	08:02
	← mneorr left	08:02
EugeneKay	man githooks	08:02
gitinfo	the githooks manpage is available at http://jk.gs/githooks.html	08:02
	→ dr_lepper joined	08:02
	← dr_lepper left	08:02
	→ dr_lepper joined	08:02
	→ bgerber joined	08:03
	← sangi left	08:04
	← DuzyZiemniak left	08:05
	→ robotmay joined	08:05
nibalizer	ooo	08:07
	→ sangi joined	08:09
	→ yatiohi joined	08:10
	→ Lord_DeathMatch joined	08:11
	→ dark_element joined	08:12
	← neurodrone left	08:13
	→ sweb1 joined	08:13
	← dreiss left	08:14
	→ mbroeker joined	08:14
sweb1	can i get list of modified, added, and delete files using git ?	08:14
	for this state	08:14
FauxFaux	sweb1: git diff --stat	08:15
	git status / git status -s	08:15
	← ipalaus_ left	08:15
	→ marcogmonteiro joined	08:16
	← sweb left	08:16
	→ erichammond joined	08:18
	← OOPMan left	08:18
	← pppaul left	08:22
	→ dcarper joined	08:22
	→ pppaul joined	08:23
	→ gasbakid__ joined	08:23
	→ dsirijus joined	08:24
dsirijus	how does one go having multiple faces of project in one git repo?	08:24
	← d3vic3 left	08:24
	← gasbakid left	08:24
dsirijus	like, i have design, backend, frontend #1, frontend #2, and then some in one project	08:24
	and i'd like to keep it in one repo, but maintaining that one can just pull project/backend too web server and there have it, and allow someone just to pull project/design and work on it?	08:25
	that was all relatively simple with svn	08:25
	currently, i'm trying to recreate that workflow with modules	08:26
	not too happy about it though	08:26
	*submodules	08:27
	← dcarper left	08:27
	← thursday left	08:28
	← pppaul left	08:28
	→ pppaul joined	08:28
EugeneKay	dsirijus - you use multiple repos.	08:30
	← alexukf left	08:30
	→ adhawkins joined	08:30
EugeneKay	Or use a subdirectory for each "face"	08:30
	→ pmatthews joined	08:31
	← xiangfu left	08:31
	→ BarryCrayon joined	08:32
dsirijus	EugeneKay, with first, i have problem that any project management software allows only for one repo per project, and i've read that the both submodules and sparse dir checkouts are extremely error prone	08:33
EugeneKay	They are; you probably don't want either of those two solutions.	08:33
	→ TheHaven joined	08:33
EugeneKay	I'm not sure what project software you're looking at(Eclipse?), but generally a Project has more than one Repo.... git really doesn't care.	08:34
dsirijus	with either redmine or gitlab i have only one repo to specify with project	08:34
	which is kinda silly with git	08:34
EugeneKay	"Project" is a meta thing, above git's level.	08:35
dsirijus	yeah	08:35
EugeneKay	I'm not really sure how gitlab handles the terminology, but Github has this Organizations feature, which works well for a Project meta collection.	08:35
	→ mneorr joined	08:35
	→ Kulrak joined	08:36
dsirijus	gitlab just bijects project to git repo	08:36
	→ RonRon joined	08:36
EugeneKay	I would(and do) use just plain gitolite, with repos sorted into Division/Project/ directories as appropriate, and then sort it out on my client(SmartGit)	08:36
	I do issue management, etc in a Drupal site rather than mixing it in with my git repo hosting(as gitlab and github do)	08:36
	gitinfo set mode: +v	08:37
RonRon	Any hope for someone looking for help with Git on Windows?	08:37
EugeneKay	RonRon - !ask	08:37
gitinfo	RonRon: 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.	08:37
	→ harsh_ joined	08:37
RonRon	I'm using Git on Windows, and I've been working with a remote branch for the day residing in remotes/origin/branchname, I'm pushing some stuff with no errors, when I woke up this morning and ran git status and git branches -a I saw I somehow moved to remotes/original/branchname, I'm clueless :(	08:38
EugeneKay	You changed the name of the remote from origin to original ?	08:39
RonRon	nope	08:39
	Haven't changed a thing	08:39
	Didn't even fetch from the remote repos so I guess it's a local problem	08:39
	but I can't think of anyplace to look	08:39
	← harsh_ left	08:39
EugeneKay	Then I'm afraid I don't quite follow as to what the problem is	08:39
	→ harshpb joined	08:40
RonRon	I'll try again from the start	08:40
EugeneKay	A !repo might help	08:40
gitinfo	[!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.	08:40
EugeneKay	!repro, rather	08:41
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.	08:41
RonRon	sec let me try and explain	08:41
EugeneKay	(fucking bot)	08:41
	→ d3vic3 joined	08:41
RonRon	I cloned the project and moved to a branch called branchname, when running branches -a I saw I was on "remotes/origin/branchname" which is ok, I pushed a few commits and went away, when I came back I ran git status and saw some stuff wasn't right so I ran git branches -a and somehow I was now on "remotes/original/branchname" while the old remotes/origin/branchname still existed, I did not checkout	08:42
	the new branch nor seen it before	08:42
	I have no idea how something like this might happen	08:42
	no other person working on this project sees that branch	08:42
	I'm guessing it's created locally somehow but I have no idea how	08:42
	→ mischat joined	08:42
	← Davey left	08:42
	→ tatsuya_o joined	08:43
EugeneKay	Mmmkay	08:43
	Could you run 'git branch -avv' and pastebin it ?	08:43
RonRon	sec	08:43
	http://pastebin.com/C468wpzF	08:44
	← benjo2 left	08:44
	← crazed left	08:45
	← Vile left	08:45
EugeneKay	And do you have a remote named "original" at all?	08:45
	← cyphase left	08:45
RonRon	nope	08:45
	No one else sees it	08:45
EugeneKay	Yeah, you probably typo'ed something when you made that working branch	08:45
	That commit(1961493) is the one you want your working branch to be at, correct?	08:46
	← pppaul left	08:46
RonRon	I didn't, this happend several times	08:46
	→ martinjlowm-lptp joined	08:46
RonRon	I just cloned the project again each time since I had no idea	08:46
	→ martinjlowm joined	08:46
RonRon	I should be at 20120329-v201109-gateway	08:46
EugeneKay	Ok, go ahead and checkout that branch	08:47
	→ pppaul joined	08:47
RonRon	As I said the weird thing is, I didn't type this, when first checked out the branch everything was OK, it wasn't until I approached it at a later time after multiple pushes	08:47
	sec	08:47
	← gchristensen left	08:48
EugeneKay	I'm not sure where the heck that remotes/original/ came from, but if you have a remotes/original/SomeBranch and no remote named "original", then there is a high probability that somethign is screwy.	08:48
	!reflog may help you decipher how you got to where you are. !lol is also one to look at.	08:49
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	08:49
	git config --global alias.lol "log --oneline --graph --decorate"	08:49
	← caseymcg left	08:49
	→ blacktulip joined	08:50
RonRon	I see this somewhere in there, Reflog message: checkout: moving from b0bde9c4dfad58f7c32d8e67fc3a9881c1d83651 to remotes/original/20120329-v201109-gateway	08:50
	Oh and this comes earlier, eflog message: checkout: moving from master to original/20120329-v201109-gateway	08:51
	→ noisebleed joined	08:51
	← noisebleed left	08:51
	→ noisebleed joined	08:51
EugeneKay	That's an interesting one.	08:51
	Maybe your cat was helping you code ?	08:51
	(it happens.... really it does)	08:51
	← pppaul left	08:51
RonRon	lol I hope not	08:52
	→ pppaul joined	08:52
	→ prodigel joined	08:54
prodigel	hi all. Is there a setting in gitconfig to enable by default --no-prefix when using git diff?	08:55
EugeneKay	prodigel - man git-config, ctrl-f for prefix ?	08:56
gitinfo	prodigel: the git-config manpage is available at http://jk.gs/git-config.html	08:56
	← raatiniemi left	08:56
	← pppaul left	08:56
	→ shruggar joined	08:56
	→ pppaul joined	08:57
	← dark_element left	08:57
prodigel	EugeneKay, now I see it! only mnemonicprefix was stealing my view there ... thanks!	08:57
	→ pabs3 joined	09:00
pabs3	is there a page that lists all the available remote helpers?	09:00
	→ cyphase joined	09:01
	← kcj left	09:01
	← beneggett left	09:01
	→ beneggett joined	09:03
	← beneggett left	09:03
	← rchavik left	09:03
	→ thiago joined	09:03
	→ beneggett joined	09:03
	← prodigel left	09:04
	→ nickoe joined	09:06
nickoe	Is it possible to set up a git repo in a abritary http server dir?	09:08
	→ jackh joined	09:08
thiago	yes, but it's a bad idea	09:09
	→ h0bbit_ joined	09:09
	→ nenjordi joined	09:10
	→ dark_element joined	09:13
	← tatsuya_o left	09:15
	→ tatsuya_o joined	09:16
	→ Milossh joined	09:16
	→ ipoval joined	09:16
	→ Tuttle joined	09:18
	← diegoviola left	09:19
	← pppaul left	09:20
	← relurk left	09:21
	→ pppaul joined	09:21
	← zdk left	09:21
	→ zdk joined	09:22
	→ rcu joined	09:23
	→ relurk joined	09:23
	← angelsl left	09:24
	→ cortana2 joined	09:25
	← dv310p3r left	09:25
	→ Shusshu joined	09:25
	← pppaul left	09:26
	→ dv310p3r joined	09:26
	← skylamer` left	09:26
	→ francisfish joined	09:27
	→ jonnu joined	09:27
	→ zastaph joined	09:28
	→ d3c joined	09:29
	→ kcj joined	09:30
zastaph	was following this guide http://tumblr.intranation.com/post/766290565/how-set-up-your-own-private-git-server-linux and wonder about if this line is nescessary? git config branch.master.remote origin && git config branch.master.merge refs/heads/master	09:31
	what happens if you don't do that	09:31
	← kadoban left	09:31
zastaph	then you can't merge?	09:31
	→ Vile joined	09:32
	→ syphar joined	09:34
thiago	you can	09:35
	but "git pull" will tell you that you didn't tell it what to pull	09:35
	git pull without any extra arguments	09:35
	→ tvw joined	09:36
	→ Per4u3e joined	09:36
zastaph	you mean git pull will complain if I do the above statement, or if I don't ?	09:37
	← duckxx left	09:37
thiago	git pull, without any extra arguments, expects to find the upstream branch	09:38
	those are the configs that set it	09:38
	there's also git branch --set-upstream though	09:38
	→ pppaul joined	09:38
	→ chaitu joined	09:38
	← chaitu left	09:39
zastaph	ok	09:39
	→ TomyLobo joined	09:39
	← jackh left	09:40
	→ lmm joined	09:41
	← barrbrain left	09:42
	gitinfo set mode: +v	09:42
lmm	hi, I just did a "git svn rebase" and seem to have lost some of my changes	09:42
tango_	were they committed?	09:42
lmm	yes	09:42
	→ rchavik joined	09:43
	← rchavik left	09:43
	→ rchavik joined	09:43
lmm	the only possible bad scenario I can think of is I may have done "git svn rebase", had it fail partway through due to conflicts, not finished it, and then done it again	09:43
	→ benjo2 joined	09:43
	← gasbakid__ left	09:43
	← pppaul left	09:43
	→ babilen joined	09:43
	→ chayin joined	09:43
EugeneKay	zastaph - !blog !gitolite	09:44
gitinfo	zastaph: Blog posts, while helpful and informative, are quite often outdated, give bad advice, or are just plain wrong. Please don't rely solely upon them, or treat them as authoritative.	09:44
	zastaph: Want to host as many git repos (and users!) as you like, on your own server, with fine-grained access control? You want gitolite: https://github.com/sitaramc/gitolite - Documentation: http://sitaramc.github.com/gitolite/master-toc.html	09:44
	→ pppaul joined	09:44
lmm	is there any way to look for "lost commits" or something?	09:44
EugeneKay	lmm - !reflog	09:44
gitinfo	lmm: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	09:44
	← wolftankk left	09:45
lmm	thanks	09:45
	hmm, maybe I didn't commit them. Very odd	09:45
	→ chayin__ joined	09:45
zastaph	EugeneKay right now I just put my remote repository on a "Local Protocol" \\NAS\repo.. i guess for gitolite i need a dedicated server	09:45
	← Shusshu left	09:45
EugeneKay	zastaph - a $20/mo VPS works well	09:46
	← shruggar left	09:46
	→ shruggar joined	09:46
zastaph	EugeneKay, the whole idea is to host things myself, at home.. at least for me	09:46
	← dv310p3r left	09:46
EugeneKay	Home works well too, if you have a dynamic DNS IP going	09:47
	← chayin_ left	09:47
	← rudi_s left	09:47
	→ rudi_s joined	09:47
	← rcu left	09:47
zastaph	and I don't need to access my sources outside my home too.. I just need a nice git setup with dev repo and "remote/main repo"	09:47
EugeneKay	Well that's fairly easy, then. :-p	09:48
	→ gasbakid joined	09:48
lmm	no, it was there	09:49
	← Per4u3e left	09:49
	← chayin left	09:49
	→ dv310p3r joined	09:50
	← rchavik left	09:50
	← dv310p3r left	09:51
	→ rchavik joined	09:52
	→ dv310p3r joined	09:52
	← sawidis left	09:53
	→ mxweas_ joined	09:53
	→ chased joined	09:53
	← chased left	09:53
lmm	when I rebase and get a conflict, I resolve it, add the files, and then git rebase --contiune?	09:53
	*continue	09:53
	→ rchavik_ joined	09:53
	← rchavik_ left	09:53
	→ rchavik_ joined	09:53
lmm	or do I have to commit my resolving edits?	09:54
	← weiyang left	09:54
FauxFaux	lmm: Just continue.	09:54
	→ chased joined	09:54
lmm	cool	09:54
	← rchavik left	09:55
	rchavik_ → rchavik	09:56
	← pppaul left	09:56
	→ pppaul joined	09:57
	← dv310p3r left	09:57
	← mxweas_ left	09:59
	← chaowang left	10:00
	← beneggett left	10:00
	→ flype joined	10:01
	← pppaul left	10:01
	← nutron left	10:02
	→ diosmiux joined	10:02
	→ Per4u3e joined	10:02
	→ pppaul joined	10:02
	→ noname002 joined	10:03
	→ _iron joined	10:03
	gitinfo set mode: +v	10:04
noname002	Hi, is it possible to set-up user-defined filter for a repository? e.x. user defined smudge and clean on some files in a project. If yes, how to do that properly with bare repository?	10:05
	→ Fandekasp joined	10:05
	← stfn left	10:05
noname002	e.x. filter script is kept it projects filters/ directory	10:06
	→ DoniRS joined	10:06
	→ dv310p3r joined	10:08
	← ehsan left	10:11
	← mischat left	10:11
	→ Element9 joined	10:11
	→ lorenz joined	10:14
	→ boob00 joined	10:15
	← b00b00 left	10:16
	→ LimeBlast joined	10:16
boob00	hello	10:17
gitinfo	boob00: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	10:17
Tuttle	Hi, I have a conceptual question. I work as a backend developer on a web project and we outsource the fronend work to an external company. We want to share the codebase but the coders should not have access to entire project, just the templates, css/js + statics and their html demos. They are able to use git. What arrangement would you recommend?	10:17
	→ na3r joined	10:17
noname002	Tuttle: i'd say put things in submodules	10:19
	→ SkAzZ joined	10:19
	← vervic left	10:20
	→ SkAzZ1 joined	10:21
	← b1rkh0ff left	10:21
	→ vervic joined	10:21
	← d3c left	10:21
boob00	Now, after successfuly at last (takes very long time) SVN->GIT, I want to work with git on my PC, so I need to "git clone myuser@gitserver/repo" ?	10:21
ketas	is it possible to split and merge repos by single file?	10:22
	← yizumi left	10:23
	→ dcarper joined	10:23
ketas	i bet it is, in some way	10:23
	← SkAzZ left	10:24
	← Per4u3e left	10:25
	← w09x left	10:25
	→ Samos123 joined	10:26
	← dcarper left	10:27
	→ dzonder joined	10:28
	← macrover left	10:28
EugeneKay	Tuttle - split up your application such that the "front" portion can exist in a repo independent of the other chunks	10:29
Tuttle	EugeneKay: so you mean to maintain two independent repos? frontend and the rest?	10:30
EugeneKay	At least two. I dunno how chunk-up-able your project is :-p	10:30
	← pppaul left	10:31
EugeneKay	git only has access controls at the repository level. Things like gitolite can control who can write to a given branch, but everything in that repository is visible to whoever clones it.	10:31
	→ pppaul joined	10:31
EugeneKay	If you want somebody to not see stuff then you need to give them a repo containing only that stuff	10:31
	For ongoing concurrent development of two separate but related repos, submodules are really not a good fit.	10:32
	→ felgru joined	10:32
EugeneKay	!subprojects	10:33
gitinfo	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.	10:33
shruggar	more importantly: why shouldn't they have access to the entire project? Maybe you're putting things in git that don't belong in git in the first place	10:33
EugeneKay	Well, if you're contracting out design work, there's a good chance you don't want them to get $PROPRIETARY_FORMULA	10:34
	← Milossh left	10:34
	→ d0k joined	10:34
	→ g105b joined	10:35
	→ b1rkh0ff joined	10:35
Tuttle	it's not an open source project (that's apparent), that investor wants to protect the IP. plus we don't want to overload the coders. they do a very good html+css+js and we're glad we make them use git itself. :)	10:36
	→ FernandoBasso joined	10:36
Tuttle	but i agree git is not here to protect the IP	10:37
g105b	I've got a global gitignore file, how can I make a rule to ignore everything apart from .php files within ~/ProjectName/Web directory?	10:37
shruggar	have them work in a separate repository, and use subtree merge to bring those changes in	10:37
	g105b: two lines. ~/ProjectName/Web/* \n !~/ProjectName/Web/*.php	10:38
Tuttle	ok, will look closely to submodules (already did this but was afraid about more commands needed to sync and possibility of losing commits), gitslave and subtree.	10:38
shruggar	(also, I don't think ~ works, but I could be wrong)	10:38
	← giallu left	10:38
g105b	shruggar: is it possible to have an arbitary ProjectName? Could it just be ~//Web/ ?	10:38
	→ OOPMan joined	10:39
shruggar	g105b: for standard globbing, yes, but I'm not sure about in git	10:39
g105b	shruggar: hmm, I'll try it - thanks	10:39
	→ teotwaki_ joined	10:39
	→ d3c joined	10:39
	→ keller joined	10:42
	→ Rickardo1 joined	10:46
Rickardo1	when changing from a branch to master without commiting the changes the new branch files is in master.. is it supposed to work that way?	10:47
	← KyleXY left	10:48
Tuttle	thanks for answers so far.	10:48
	another one: is it possible to forbid when someone is trying commit (push) text files with crlf eols, trailing eols or tab/spaces wherever we don't want them?	10:49
	→ ronniy joined	10:50
	→ arietis joined	10:50
	→ irqq joined	10:51
	← d3vic3 left	10:51
EugeneKay	Tuttle - sure. You need a hook on the receiving end which detects these problems and rejects the push	10:51
	← subrosa left	10:52
Tuttle	EugeneKay: pre-receive hook on the server?	10:52
	→ alexukf joined	10:52
EugeneKay	Yup.	10:52
	→ raatiniemi joined	10:52
	→ d3vic3 joined	10:52
Tuttle	it has access to the changed files? i've read it only gets some refs	10:52
	← sweb1 left	10:52
EugeneKay	pre-receive gets the old SHA, the new SHA, and the ref name. You would then do a git-show of the files changed between the two points, and hunt for CRLFs	10:53
	→ linusoleander joined	10:54
EugeneKay	I'm sure somebody has already written such a thing	10:54
	→ berserkr joined	10:55
Tuttle	yep. i know git allows for some autoconversion and can ignore this stuff. but i prefer doing less magic and hiding. people should get burnt when doing wrong and teach their editors	10:55
raek	Rickardo1: git doesn't touch untracked files, even when swiching branches	10:56
Rickardo1	raek: Ok, so, never forget commit before switching.. :p	10:56
	← diosmiux left	10:57
	← d3c left	10:57
raek	Rickardo1: what do you mean by "commit" here? git add + git commit?	10:57
Tuttle	EugeneKay: thanks	10:57
raek	Rickardo1: it's a good idea to run `git status` every now and then	10:58
Rickardo1	raek: I made an alias that both add and commit -am	10:58
	← davidbanham left	10:59
	← shruggar left	10:59
raek	Rickardo1: personally I think it is a bad idea to just commit everything without reading through the changes	11:00
	Rickardo1: I often use `git add --patch .` and pick the changes I want in the next commit	11:00
	← krz left	11:01
raek	anyway, unless your untracked files does not affect the code (e.g. a private TODO text file) you should consider cleaning them up before switching branches	11:02
	for example using `make clean` (or equivalent of your build system) or `git clean <suitable-options>`	11:03
	→ enmand joined	11:03
	← benjo2 left	11:03
	→ shruggar joined	11:04
Rickardo1	raek: I just want an untouch "master" until I commit changes.. I want to work on a branch and add files to it with the option to change to master anytime without any changes	11:06
	← mbroeker left	11:06
raek	Rickardo1: as long as all your files are tracked you can simply use `git checkout <branch>`	11:07
	← zdk left	11:07
	← ymasory left	11:08
	← zeom left	11:08
raek	if you have a lot of untracked files that belong to "other-branch", then add and commit them to that branch before changing branch	11:08
	→ rgsteele joined	11:09
	← Fandekasp left	11:09
raek	you can do `git add . && git commit -m "INCOMPLETE COMMIT: work in progress` to store away the changes	11:09
	then the working tree is clean and you can switch branch	11:10
	to continue working on the other-branch, do a `git checkout other-branch && git reset HEAD~`	11:10
	the "incomplete commit" will then be gone, and its changes will be in the wokring tree	11:11
	← pppaul left	11:11
	← pabs3 left	11:12
	→ pppaul joined	11:12
	← harshpb left	11:12
	← herdingcat left	11:12
Rickardo1	raek: Ok ty.. . I will try egit plugin for eclipse now.. do u know if its good?	11:12
	→ harshpb joined	11:12
	← cooloney left	11:13
	→ Fandekasp joined	11:13
raek	no idea. I mostly use the git command line.	11:13
	→ Nasrudin joined	11:13
	← vervic left	11:13
	→ shruggar1 joined	11:14
	→ d3c joined	11:14
Nasrudin	Hi there. how can I restrict access to my git repositories? I'm interested in using it in a project with 2 people and 1 central development server	11:14
	→ davidbanham joined	11:14
bremner	!gitolite	11:14
gitinfo	Want to host as many git repos (and users!) as you like, on your own server, with fine-grained access control? You want gitolite: https://github.com/sitaramc/gitolite - Documentation: http://sitaramc.github.com/gitolite/master-toc.html	11:14
	← Chibby_ left	11:14
Nasrudin	bremner: For me?	11:15
	→ shruggar2 joined	11:15
bremner	yes	11:15
	← shruggar1 left	11:15
Nasrudin	Thanks :)	11:15
	→ vervic joined	11:15
	← vervic left	11:16
	→ Ryback_ joined	11:16
	← Ryback_ left	11:16
	→ Ryback_ joined	11:16
	← shruggar left	11:17
	← d3vic3 left	11:19
	→ zeom joined	11:19
	→ d3vic3 joined	11:20
	→ HyperNerdV2 joined	11:20
	→ ymasory joined	11:21
	→ n1x joined	11:24
	← glcrazy left	11:25
	← shruggar2 left	11:25
	← dsirijus left	11:25
	→ glcrazy joined	11:25
	→ siovene joined	11:26
siovene	Hello. I can't fetch from my repository, with error: failed to read object HASH_HERE: invalid argument.	11:27
	← pppaul left	11:27
siovene	Here's the output: http://dpaste.com/749290/	11:27
	Any help, please?	11:27
	I can pull and push fine, though.	11:27
	→ pppaul joined	11:27
	← Lord_DeathMatch left	11:30
	→ solussd_ joined	11:32
	→ gchristensen joined	11:32
bremner	wait, you can pull but not fetch?	11:32
siovene	bremner: indeed.	11:33
bremner	that seems unlikely to me since the first thing pull does is fetch	11:33
siovene	"git pull origin master" is just fine, and it tells me I'm up to date.	11:34
	← flype left	11:34
bremner	ah, well, try git fetch origin master	11:34
siovene	* branch master -> FETCH_HEAD	11:35
	Looks good.l	11:35
bremner	yep, so it's some other branch/tag that has a problem	11:35
siovene	Any way to find out? Maybe it's some old branch that was merged and I don't mind pruning.	11:36
bremner	I don't know, maybe try git fsck? I don't have much experience with corrupted repos	11:36
siovene	fatal: failed to read object 1331ad5b4bc10d3f2815deee67746cebadf006c7: Invalid argument	11:36
	That's a different hash.	11:36
cmn	that looks like the other end's fs or power or something screwed	11:36
	→ shruggar joined	11:36
cmn	invalid arguments sounds like what mmap or read would say when presented with an empty file	11:37
	run git fsck on the remote repo	11:37
	and pull out your backups	11:37
siovene	I can fetch just fine on another copy of this repo.	11:37
	cmn: this is a repository hosted on bitbuckets.	11:37
	Also git fsck is fine on another copy of the repo.	11:37
cmn	those other repos aren't broken	11:38
siovene	It just gives a "dangling blob HASH" message a dozen times.	11:38
cmn	the one you're trying to fetch from has invalid objects	11:38
	← gchristensen left	11:38
cmn	other repos being fine has no effect whatsoever on the one that isn't	11:38
siovene	No, because I'm fetching from the same repo, on a different computer, and it's fine.	11:38
	Oh I see.	11:38
	So I guess I should just clone from scratch?	11:39
cmn	argh, misread the output, if your local repo that's fucked	11:39
	→ sq-one joined	11:40
siovene	you mean it's my local repo that's fucked?	11:40
cmn	yeah	11:40
	→ oehman joined	11:40
	← ymasory left	11:41
cmn	sorry, I just got up	11:41
	← pppaul left	11:41
siovene	no problem, I'll just clone from scratch :)	11:41
	→ aristidesfl joined	11:41
	← project2501a left	11:41
cmn	the error comes at unpacking, so it's your local system that has a corrupted object	11:41
	→ gusnan joined	11:42
	→ pppaul joined	11:42
	→ shwaiil joined	11:42
shwaiil	hi guys	11:42
gitinfo	shwaiil: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	11:42
shwaiil	I want to RM a file in local repo, but keep it in origin ? What to do ?	11:42
	→ temoto joined	11:42
shwaiil	git rm, then git checkout file --cache ?! or something	11:42
cmn	unless you commit the deletion and push that commit, it won't have an effect on the other repo	11:43
temoto	Being inside rebase session i added wrong resolution to index, how to revert it back to conflict state?	11:43
shwaiil	I ment, in future pull don't get back this file	11:43
cmn	but more importantly, git doesn't work with files at that level, it transfers history	11:43
shwaiil	let's say, I have a readme.txt on root	11:43
cmn	delete it then	11:43
	← pppaul left	11:43
shwaiil	cmn: ok thanks :)	11:43
	→ pppaul joined	11:44
cmn	but you'll get deleted-modified conflicts if the file is edited on the other branch	11:44
shwaiil	cmn: yeah, I see. thanks	11:45
	← shruggar left	11:47
	← glcrazy left	11:47
	← harshpb left	11:47
	→ glcrazy joined	11:47
	→ harshpb joined	11:48
	← d3c left	11:49
	← pppaul left	11:49
	→ pppaul joined	11:49
	→ ToBeFree joined	11:51
	← tatsuya_o left	11:52
	← teotwaki_ left	11:53
	← na3r left	11:53
	→ cannonball joined	11:54
	← `Assassin left	11:54
	← optixx left	11:54
	← pppaul left	11:55
	→ TTrecco joined	11:55
	→ Lord_DeathMatch joined	11:56
	→ optixx joined	11:56
	→ pppaul joined	11:56
	← jstemmer left	11:57
	← juvenal left	11:58
	→ achadwick joined	11:58
	← harshpb left	12:01
	← pppaul left	12:01
	→ pppaul joined	12:02
	→ harshpb joined	12:02
	← alexukf left	12:03
	→ m1_au joined	12:03
m1_au	hi#	12:04
gitinfo	m1_au: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	12:04
	→ Per4u3e joined	12:05
m1_au	getting this error when editing gitolite.conf : the following users (pubkey files in parens) do not appear in any access rules	12:05
FauxFaux	And?	12:05
m1_au	not sure what i messed up	12:05
FauxFaux	Did you include those users in any access rules?	12:05
	→ project2501a joined	12:05
m1_au	yes, that's why i was changing file	12:05
FauxFaux	Pastebin the file, and a key it claims isn't accessed?	12:06
	*the name of	12:06
	← pppaul left	12:06
	← dv310p3r left	12:06
	→ pppaul joined	12:07
raek	m1_au: did you add both the user key and the new conf to the commit?	12:07
	← TTrecco left	12:07
m1_au	they are both in /var/lib/gitolite/.ssh	12:08
	→ angelsl joined	12:08
m1_au	http://pastebin.centos.org/38850	12:08
	← nenjordi left	12:08
	← d3vic3 left	12:09
FauxFaux	m1_au: If you use @all, it will issue that warning, and it's fine. Don't worry about it (so long as you only want the new users to have access to the 'testing' repo.	12:10
	→ d3vic3 joined	12:11
m1_au	works fine with testing, well in theory its fine to give @all access to every single repo is it is NATed	12:11
	← pppaul left	12:11
m1_au	ok, my mistake	12:12
	thx FauxFaux,	12:12
FauxFaux	The issuance of the warning for @all is a bit strange.	12:12
m1_au	FauxFaux it was a typo in name in keys (well not typo but i used wrong name should be id instead of ida)	12:13
	→ pppaul joined	12:13
	gitinfo set mode: +v	12:14
lorenz	!backup	12:14
gitinfo	Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups	12:14
	← CodeVision left	12:14
	← d3vic3 left	12:17
	→ xiangfu joined	12:17
lorenz	i want to (completely) backup a project, is it sufficient to simply zip the ".git" folder?	12:17
	→ d3vic3 joined	12:18
FauxFaux	Or one of the bot's solutions, yeah. Running git repack -adf # first will make the zip less huge.	12:18
	→ Anonyme44893 joined	12:18
lorenz	i use the gui version on windows	12:19
FauxFaux	Have fun with that.	12:19
lorenz	thx :)	12:19
	← harshpb left	12:20
	← redrocket left	12:21
	→ harshpb joined	12:21
	← harshpb left	12:21
	→ harshpb joined	12:22
	← Per4u3e left	12:22
	→ fayimora_ joined	12:22
	→ cthuluh joined	12:22
	→ dcarper joined	12:23
	→ d3c joined	12:23
	→ redrocket joined	12:23
	← pppaul left	12:23
	→ Milossh joined	12:24
	→ pppaul joined	12:24
	← sangi left	12:25
	→ Per4u3e joined	12:25
	← fayimora left	12:26
	fayimora_ → fayimora	12:26
	← dcarper left	12:27
	← pjn_oz left	12:27
	→ vitor-br joined	12:30
	← vitor-br left	12:30
	→ TTrecco joined	12:31
	← HyperNerdV2 left	12:31
	← xiangfu left	12:32
	← jceb left	12:32
	← Kabaka left	12:33
	← TTrecco left	12:33
	← pppaul left	12:35
	→ codevision joined	12:35
	← glcrazy left	12:35
	→ pppaul joined	12:36
	← masterkaen left	12:36
	→ jim0203 joined	12:38
	→ Bass10 joined	12:39
	← pppaul left	12:41
	← mneorr left	12:41
	→ xiangfu joined	12:41
	← thiago left	12:41
	→ thiago joined	12:41
	→ pppaul joined	12:42
	→ zdk joined	12:43
	→ tommyvyo joined	12:44
	→ Jackneill joined	12:44
	← Jackneill left	12:44
	→ Jackneill joined	12:44
	→ ology joined	12:45
	→ AaronMT joined	12:46
	← harshpb left	12:46
	→ machty joined	12:47
	← pppaul left	12:48
	← jim0203 left	12:48
	→ barrbrain joined	12:48
	→ pppaul joined	12:48
	← dkeuyof left	12:49
	→ SkAzZ joined	12:49
	← n1x left	12:50
	→ Chib joined	12:51
	← pppaul left	12:53
	← SkAzZ1 left	12:53
	→ iamjarvo joined	12:53
	→ Superlokkus joined	12:53
	→ DuzyZiemniak joined	12:53
	→ pppaul joined	12:53
	→ jackh joined	12:54
	codevision → CodeVision	12:56
	→ gmarseliss joined	12:56
	← barrbrain left	12:57
	← project2501a left	12:59
	→ v0n joined	12:59
	→ flype joined	12:59
	← Chib left	13:00
	→ Chib joined	13:00
	→ stfn joined	13:00
	← arvind_khadri left	13:01
	→ barrbrain joined	13:01
	→ naquad joined	13:02
	→ macabre joined	13:03
	dwmw2_gone → dwmw2	13:03
	→ glennpratt joined	13:04
	→ revagomes joined	13:04
	→ alexisabril joined	13:04
	← RobertLaptop left	13:04
	← bgerber left	13:05
	← solussd_ left	13:05
	→ hellopat joined	13:05
	→ solussd_ joined	13:05
	→ pandeiro joined	13:05
	← Guest9109 left	13:07
	→ bgerber joined	13:08
	→ j416 joined	13:09
	← solussd_ left	13:09
	← maleknet left	13:10
	← pppaul left	13:11
	→ pppaul joined	13:12
	← erkules\|away left	13:13
	→ erkules\|away joined	13:13
	erkules\|away → erkules	13:13
	← Tuttle left	13:13
	→ cleardance joined	13:13
	→ bleen joined	13:14
bleen	Github specific question: if I rename a repository on github, will all the forks that live on github have their remotes updated automatically?	13:14
cmn	bleen: that would give you better results in #github or support@	13:15
	← barrbrain left	13:15
	← Tinti left	13:16
bleen	cmn: didnt enev think to check if there was a github channel .. thanks	13:16
	← optixx left	13:16
	→ rtuin joined	13:17
	→ RaceCondition joined	13:17
	← pppaul left	13:17
	→ optixx joined	13:17
	→ pppaul joined	13:18
	← rchavik left	13:18
	→ barrbrain joined	13:19
	← Lgb left	13:20
	→ ManuRocca joined	13:20
	← ManuRocca left	13:20
	→ juvenal joined	13:20
	→ Guest9109 joined	13:20
zastaph	does git for windows use mingw or msys	13:21
	→ dv310p3r joined	13:22
	← RonRon left	13:23
	→ Lgb joined	13:23
	← arietis left	13:23
	→ rchavik joined	13:24
	← rchavik left	13:24
	→ agileadam joined	13:25
	← gmarseliss left	13:25
	→ project2501a joined	13:25
	→ rchavik joined	13:25
	→ marhaban joined	13:26
	← marhaban left	13:26
	→ Peste_Bubonica joined	13:28
	← pppaul left	13:31
	→ pppaul joined	13:31
	→ Chillance joined	13:32
	→ dfr\|mac joined	13:33
	→ nadavoid joined	13:34
	→ MANCHUCK joined	13:36
	→ TeckniX joined	13:37
	→ RonRon joined	13:40
	← OOPMan left	13:40
	→ litwol joined	13:41
litwol	Hello	13:41
gitinfo	litwol: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	13:41
	→ bartek joined	13:42
	← harish_ left	13:43
	→ gtrak joined	13:43
litwol	Issue i am having difficulty with comes from necessity to merge two branches. one of the branches has a regular directory foo/bar/baz, while my work/feature branch replaces foo/bar/baz with a git submodule. now when i try to merge branch with submodule git complains that i have conflicting directories (ie, file/dir exists)	13:44
	i'm looking for advise how this situation needs to be dealt with	13:44
	→ erichynds joined	13:45
cmn	that depends on what you want to do	13:45
cleardance	We have a project, a game for android and we want everything on github inc images. We do git init in our root directory and do git add . , but we don't get all subdirectories included. How do we include all subdirectories?	13:45
cmn	you should make the worktree look like you want to and then stage all that and then commit	13:45
litwol	i want to make sure the non-git-submodule foo/bar/baz gets entirely replaced by submodule foo/bar/baz, and all old contents are get rid of	13:46
cmn	so if you want to keep the submodule, use a submodule there	13:46
	→ ehsan joined	13:46
cleardance	cmn: how do i stage it all?	13:46
cmn	cleardance: that's not for you	13:46
	→ dcarper joined	13:47
cmn	litwol: presumably the submodule is still there, so you should use git add to stage the submodule and remove the conflicted entry	13:47
cleardance	What do I do to add all subdirectories?	13:47
litwol	hmm. i just tried 'resolve' strategy and it completed without an error. but to be honest i dont know what this means in terms of what got overwriten with what (other than the submodule, cause there are a lot of other things merged too)	13:48
	→ solussd_ joined	13:48
	→ ConstantineXVI joined	13:48
cmn	litwol: git status will tell you what's going on in the submodule	13:48
	whether it's still conflicted or not	13:49
litwol	right	13:49
cmn	cleardance: 'git add .' does, check your ignore rules	13:49
	→ harish joined	13:49
cmn	and whether those directories are git repos	13:50
cleardance	i have no ignore rules	13:50
	are there any defaults?	13:50
	→ ipalaus_ joined	13:50
	→ Sahua joined	13:51
cmn	not from git, but you can declare your own with the config	13:51
	← dfr\|mac left	13:51
cmn	core.excludesfile I believe	13:51
	and silly question, but do those dirs have anything in them?	13:51
cleardance	yes	13:53
cmn	that aren't empty dirs? what does git say when you try to add them explicitly?	13:53
cleardance	when i add the git add src/folder/game/. nothing is added	13:55
	← RonRon left	13:55
cmn	!repro	13:55
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:55
	→ bartek_ joined	13:55
RandalSchwartz	cleardance - any files in there?	13:55
cmn	and include an ls, and what your core.excludesfile is	13:55
	← bartek left	13:55
cleardance	if i add a file explicitly i get : fatal file belongs to submodule	13:55
RandalSchwartz	ahh - that means you have a .git in there	13:56
	right?	13:56
	← Maccer left	13:56
cmn	hm, that error should only appear if there's a submodule in the index, I think	13:57
	← ehsan left	13:57
RandalSchwartz	do not add a git repo to a git repo.. :)	13:57
cmn	but there's definitely something fishy going on	13:57
RandalSchwartz	yeah, submodule time	13:57
cmn	when I said to make sure that they weren't git repos, did you even check?	13:57
	→ lorenz363 joined	13:59
	← lorenz left	13:59
	← zastaph left	13:59
	→ snearch joined	14:00
	← jackh left	14:00
	← kermit left	14:00
	← snearch left	14:01
	→ snearch joined	14:01
	← Radium left	14:01
	→ RonRon joined	14:02
	→ w09x joined	14:02
	→ mrwalker joined	14:02
	← kcj left	14:03
	← harish left	14:03
	← rtuin left	14:04
	← d3c left	14:04
	→ JohnyBaby joined	14:04
cleardance	it is solved	14:04
	→ Anubisss_ joined	14:04
	← pppaul left	14:05
	→ beatak joined	14:05
	→ gchristensen joined	14:05
	← cagedwisdom_ left	14:05
	← cagedwisdom left	14:05
	← Fandekasp left	14:05
	→ Anubisss__ joined	14:06
	→ djh_ joined	14:06
	← djh_ left	14:06
	→ pppaul joined	14:06
	→ Fandekasp joined	14:06
	→ ehsan joined	14:07
	← Anubisss left	14:08
RandalSchwartz	cleardance - how?	14:08
	was it a sub-repo?	14:08
	→ d3c joined	14:09
	← Anubisss_ left	14:09
	← litwol left	14:10
	→ mritz joined	14:10
temoto	Being inside rebase session i added wrong resolution to index, how to revert it back to conflict state?	14:10
	← pppaul left	14:11
	→ giallu joined	14:11
	→ Destos joined	14:11
CareBear\	I'm not sure you can	14:11
cmn	the conflicted state is generated from the merge, so you could try resetting the index to HEAD, checking out all the files and cherry-picking the commit (probably better with --no-commit)	14:12
CareBear\	you can reset of course, and later add the right resolution	14:12
cmn	but I can't gurantee that it'll work	14:12
	→ Resure joined	14:13
	→ pppaul joined	14:13
	→ RobertLaptop joined	14:15
	← ehsan left	14:16
	← roger_raymond left	14:18
	→ luxurymode joined	14:19
	→ na3r joined	14:19
	→ bglusman joined	14:19
	→ harish joined	14:19
	→ roger_raymond joined	14:19
	→ tatsuya_o joined	14:20
	→ edude03 joined	14:20
	← pppaul left	14:20
	→ kermit joined	14:20
	→ pppaul joined	14:21
	← bglusman left	14:22
	→ bglusman joined	14:22
	← pppaul left	14:23
	→ ryez joined	14:24
	→ pppaul joined	14:24
	→ hrezaei joined	14:24
	→ alester joined	14:25
	→ fly9 joined	14:25
	← hrezaei left	14:25
	← sq-one left	14:25
	← jjasinski left	14:26
	← gavin_huang left	14:27
	→ HRezaei joined	14:27
HRezaei	hi people!	14:27
gitinfo	HRezaei: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	14:27
	→ sallyx joined	14:28
	← blacktulip left	14:28
	→ airborn joined	14:29
HRezaei	I'm new to git, I've created a new repository. and added a remote (https). then fetched from it. and it was successful. but there is no files in my repo folder	14:29
	how to fetch working files?	14:29
	← pppaul left	14:30
HRezaei	I'm using git gui on windows 7	14:30
cmn	forget about fetching files, you fetch (and push) history	14:30
cleardance	hi people!	14:30
	@gitindo	14:30
cmn	HRezaei: what you want is to create a local branch pointing to a remote-trackig branch	14:30
cleardance	@gitinfo	14:30
	→ pppaul joined	14:30
	← mritz left	14:31
HRezaei	how to do that?	14:31
	← lonewulf` left	14:31
cmn	with branch -a lists all branches, with git checkout -t remote/branchanme you create a local branch with the same name which tracks it	14:31
	and read the !book	14:31
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 !designers !gitt !vcbe and !parable	14:31
	→ fly9_ joined	14:32
cmn	specially if you come from another VCS	14:32
	← xiangfu left	14:33
	→ admsyn joined	14:33
	→ harish_ joined	14:34
HRezaei	the first vcs I'm familiar is git!	14:34
	→ felipec joined	14:34
	→ mneorr joined	14:34
felipec	git log -z -s --format='%H'	14:34
offby1	HRezaei: "git checkout branchname"	14:35
felipec	why is that appending \n instead of \0?	14:35
	← Fandekasp left	14:35
	→ lonewulf` joined	14:35
	→ Fandekasp joined	14:35
	← fly9 left	14:35
	fly9_ → fly9	14:35
	← harish left	14:36
	→ mishok13 joined	14:36
offby1	I suspect that %H is clobbering it. Might even be a bug	14:37
	← tvw left	14:37
	← Superlokkus left	14:37
cmn	because it's assuming it's tformat instead of format or the other way around	14:37
HRezaei	cmn: using git gui, I click on branch then create or checkout, both of them need a revision expression	14:37
cmn	--format=format:%H should make it work	14:37
	HRezaei: yes, you need to tell it where you want to start from	14:37
offby1	indeed	14:38
HRezaei	cmn: 0 for example?	14:38
cmn	HRezaei: 0 what?	14:38
HRezaei	I never created any branch on my repo	14:39
cmn	then why are you complaining that you didn't get any files?	14:39
	if you don't want to continue working, just add files as you'd do normally	14:39
	← gdoteof left	14:39
	← oehman left	14:40
	← ipalaus_ left	14:40
	→ ipalaus_ joined	14:40
	ipalaus_ → ipalaus	14:40
HRezaei	I pushed my files via git gui on bitbucket.org and now I want to work on it on another pc.	14:41
cmn	so you do want to base your branch on top of another	14:41
	← stodan left	14:41
	→ jjasinski joined	14:41
HRezaei	now I'v installed git gui on new pc and I don't know how to fetch my project down from bitbucket	14:41
felipec	cmn: tformat is something completely different... that doesn't make it work	14:41
	← noname002 left	14:41
cleardance	I pushed a project to git and my partner want to import it into eclipse. It has a alot of folders with images and with source files, how should he clone/pull it from eclipse and import it?	14:41
felipec	ohh, format:format, OK	14:42
	→ ehsan joined	14:42
cmn	felipec: yeah; check the ML, RandalSchwartz had this same problem a couple of weeks ago or so	14:43
	← brokenshakles left	14:43
	← RonRon left	14:43
	← lonewulftp left	14:44
	→ iamjarvo1 joined	14:44
	→ Maccer joined	14:44
	← w09x left	14:45
	← iamjarvo left	14:45
	→ fisted_ joined	14:45
	← aristidesfl left	14:45
	← davidbanham left	14:46
	← Lord_DeathMatch left	14:46
	→ aristidesfl joined	14:47
	← pppaul left	14:47
	→ pppaul joined	14:48
	← fisted left	14:48
SethRobertson	cleardance: eclipse has git support	14:49
	← aristidesfl left	14:49
	← Praise left	14:50
	→ neurodrone joined	14:50
	→ Praise joined	14:50
SethRobertson	HRezaei: So you don't have access to your ssh keys, url, and account information from the old PC?	14:50
cmn	HRezaei: you said you already did that	14:51
	→ hsnmck joined	14:51
cmn	why didn't you use 'git clone' but created a new repo by hand?	14:52
hsnmck	hello, how can I use git diff, to see the diff for a file in 2 different commits	14:52
SethRobertson	git diff A B -- filename	14:52
hsnmck	thank you	14:52
SethRobertson	Well, A..B might be better	14:52
	Or A...B	14:52
HRezaei	cmn: thanks, git clone solved my problem, thanks to others too.	14:52
hsnmck	what the .. or the ... means	14:53
	→ marhaban joined	14:53
SethRobertson	!..	14:53
gitinfo	[!dots] In the log family (git-log, gitk, etc.) A..B means "everything in B but not in A" [formally: ^A B] and A...B means "everything in A or B but not in both" [formally: A B --not $(git merge-base --all A B)]. An empty "side" of the dots implies HEAD, so 'git log master..' is very different from 'git log master'!	14:53
	→ stuntmachine joined	14:53
	← marhaban left	14:54
	→ brokenshakles joined	14:55
	→ dfr\|mac joined	14:55
	← armenb_ left	14:55
	→ yosinof joined	14:55
	→ oriba joined	14:56
	→ armenb joined	14:57
	→ jackh joined	14:57
	← Milossh left	14:58
	← toothr left	14:59
	← flype left	14:59
hsnmck	!^	15:00
	← brokenshakles left	15:01
	← Praise left	15:01
	→ Praise joined	15:01
	← pppaul left	15:01
	→ tvw joined	15:01
	← JohnyBaby left	15:01
	← rurufufuss left	15:01
	→ pppaul joined	15:02
	zendeavor → automage	15:02
	→ toothr joined	15:03
	← d3c left	15:04
	→ Vert joined	15:05
	← csgeek left	15:05
	← syphar left	15:06
	← pppaul left	15:06
	→ aJacom joined	15:07
	→ pppaul joined	15:07
	← Praise left	15:08
	→ Praise joined	15:08
	← Praise left	15:08
	→ Praise joined	15:08
	Guest39604 → atomicity	15:08
	→ d3c joined	15:08
	← hachque left	15:09
	← pppaul left	15:10
	→ pppaul joined	15:10
	→ Silowyi joined	15:10
	→ mikepack joined	15:11
	← HRezaei left	15:11
	→ kevwil joined	15:12
hsnmck	I'm in the middle of fixing something, I have a patch that I want to apply but without having the commit, I want to have all the modifications at the end in one commit.. so how can I apply the patch without having the commit.. usually I use git am, but this will add the commit, so how can I do it? Thanks	15:13
	← hellopat left	15:13
	← admsyn left	15:14
	→ brokenshakles joined	15:14
cmn	reset to HEAD~	15:14
	that will undo the changes to the branch and the index	15:15
	→ zastaph joined	15:15
	← pppaul left	15:15
cmn	but leave the files modified	15:15
hsnmck	soft rest right?	15:15
cmn	mixed	15:15
	→ skylamer` joined	15:15
cmn	(i.e. the default)	15:15
	a soft reset won't modify the index	15:15
hsnmck	ah ok	15:15
	→ pppaul joined	15:16
	→ hellopat joined	15:16
zastaph	does git bash use msys or mingw ?	15:16
	← jspiros left	15:16
	→ OOPMan joined	15:17
	→ beneggett joined	15:18
	← fly9 left	15:18
hsnmck	is there a way to undo a patch.. I mean to remove all the files modifications... after a git am	15:19
	?	15:19
	← VadtecWk left	15:19
cmn	reset --hard HEAD~	15:19
	or do a checkout -f after the mixed reset	15:19
	← jackh left	15:19
	← juvenal left	15:20
	→ fly9 joined	15:21
	→ juanfer joined	15:22
	→ jspiros joined	15:23
	→ subrosa joined	15:23
	→ juvenal joined	15:23
	← SkAzZ left	15:23
	← d3vic3 left	15:24
	← pppaul left	15:24
	→ pppaul joined	15:25
	→ d3vic3 joined	15:25
	← Samos123 left	15:26
	← kenperkins left	15:26
	→ jerojasro joined	15:26
	← alexisabril left	15:26
jerojasro	hi all. Is there a way of getting git to warn me whenever I'm pulling/trying to merge a branch that has no common ancestors with my local (current) branch?	15:27
	→ michaelcox joined	15:27
	← SethRobertson left	15:27
	→ markcoop joined	15:27
	← jspiros left	15:27
	→ Targen joined	15:28
	→ ilteris_ joined	15:28
ilteris_	can someone shed a light on this problem I have? http://cl.ly/2P1r3N321G3U412e3q1a	15:28
	this is my gitignore file: http://pastie.org/3925975	15:29
cmn	ilteris_: you're trying to add files that are ignored	15:29
	→ VadtecWk joined	15:29
cmn	you need to tell it to force	15:29
	but maybe xcode doesn't know about that	15:29
ilteris_	cmn: yeah and I don't think they are in my .gitignore file	15:29
	→ SethRobertson joined	15:30
	← VadtecWk left	15:30
cmn	not in that one, no	15:31
	→ jspiros joined	15:31
ilteris_	I am using -f just liek you suggested	15:31
cmn	you should figure out why they're in the ignore list	15:31
	if you don't think they should be	15:31
ilteris_	I don't see any more gitignore files in my project	15:31
cmn	check all the paths up to there for .gitignores	15:31
	← d3vic3 left	15:32
ilteris_	is there a command to check that?	15:32
cmn	and if you have core.excludesfile, check that file	15:32
	use ls	15:32
	ls bin	15:32
	ls bin/data	15:32
	ls -a bin bin/data	15:32
ilteris_	you mean it could be inside bin/ bin/data folder	15:32
	let me check	15:32
cmn	yes, those are paths leading up to there	15:32
	← martinjlowm left	15:32
ilteris_	oh shit	15:32
	you are right	15:32
	→ alexukf joined	15:33
ilteris_	there's a .gitignore inside bin/data folder	15:33
	and it has	15:33
	*	15:33
	!.gitignore	15:33
	removing that file	15:33
	← pppaul left	15:34
	→ jspiros_ joined	15:34
	→ d3vic3 joined	15:34
	→ pppaul joined	15:34
	← jspiros left	15:36
	← subrosa left	15:37
	← Per4u3e left	15:38
	← jspiros_ left	15:38
	← rly left	15:38
	← OOPMan left	15:40
	← rchavik left	15:40
	→ VadtecWk joined	15:40
	← VadtecWk left	15:40
	→ VadtecWk joined	15:40
	→ hashpuppy joined	15:40
	← d3vic3 left	15:40
	← VadtecWk left	15:41
	→ jspiros joined	15:41
	→ martinjlowm joined	15:41
hashpuppy	what happens if you branch feature off of develop. then you commit to feature. merge in develop into feature. commit to feature. now, can you rebase to squash commits? or no, because you've merged in develop and that will somehow mess things up?	15:41
	← felgru left	15:41
hashpuppy	would that rewrite history at all?	15:42
PerlJam	hashpuppy: that's what rebase does.	15:42
hashpuppy	sorry.	15:42
	→ duckxx joined	15:42
PerlJam	hashpuppy: as long as you haven't shared that history, you should be fine.	15:42
hashpuppy	would that rewrite pushed history at all? assuming that develop has been pushed	15:42
thiago	rebase rewrites history	15:42
	never rebase a branch that other people have or has been merged into another branch	15:42
	← hellopat left	15:43
	← optixx left	15:43
	← tuxx- left	15:43
hashpuppy	ok, so if people are working off develop, and i merge that into feature, then don't do rebase feature?	15:43
	to squash	15:43
	→ tuxx- joined	15:43
thiago	once you merge a branch, never rebase it again	15:43
hashpuppy	ok. thanks :)	15:44
	← bgerber left	15:44
PerlJam	thiago: why that latter restriction?	15:44
	thiago: seems to me it only matter for "live" branches	15:44
	→ titom joined	15:44
thiago	well, you can rebase a branch that you've merged	15:45
	provided you delete the branch you merged it into	15:45
	→ VadtecWk joined	15:45
	← pppaul left	15:45
	→ optixx joined	15:45
	→ Davey joined	15:46
	← jspiros left	15:46
	→ Superlokkus joined	15:46
	→ d3vic3 joined	15:46
	← alexukf left	15:46
	→ jspiros joined	15:47
	← DuzyZiemniak left	15:48
	→ bgerber joined	15:48
	← aJacom left	15:48
	→ admsyn joined	15:48
	→ hellopat joined	15:49
	← michaelcox left	15:49
	→ milestone joined	15:49
	← markcoop left	15:50
	→ sallyz joined	15:50
	← jspiros left	15:51
	→ jspiros joined	15:51
	← LekeFly left	15:52
	← VadtecWk left	15:52
	→ T-Guy joined	15:52
	→ LekeFly joined	15:54
	→ Guest24375 joined	15:54
	gitinfo set mode: +v	15:54
	→ amigojapan joined	15:54
	→ pppaul joined	15:54
	→ OOPMan joined	15:54
	→ VadtecWk joined	15:55
	← VadtecWk left	15:55
	→ VadtecWk joined	15:55
	→ Ecesis joined	15:55
	← Guest24375 left	15:55
	gitinfo set mode: +v	15:55
	→ Bbradley joined	15:56
	← jspiros left	15:56
	→ jspiros joined	15:57
	← ianmcorvidae left	15:57
	← whitman left	15:57
	← juvenal left	15:58
T-Guy	guess what, found the channel on channel list and I'm serching wikipedia to know wtf git is !!!	15:58
	← Bbradley left	15:59
	→ joepie92 joined	15:59
cmn	T-Guy: http://git-scm.com	15:59
	← VadtecWk left	15:59
	→ Bbradley_1983 joined	15:59
	→ p3rror joined	15:59
cmn	or, you know, read the topic	15:59
	← pppaul left	16:00
	→ VadtecWk joined	16:00
	→ pppaul joined	16:00
	→ RaceCondishun joined	16:01
	← jspiros left	16:01
	← VadtecWk left	16:01
	→ VadtecWk joined	16:01
	← g105b left	16:02
	→ michaelcox joined	16:02
	← robotmay left	16:03
	→ jspiros joined	16:03
	← RaceCondition left	16:03
	RaceCondishun → RaceCondition	16:03
	← yosinof left	16:03
	← sallyz left	16:03
	← martinjlowm left	16:04
	→ markus-_ joined	16:04
	→ martinjlowm joined	16:04
	← d3c left	16:04
	→ pheaver joined	16:05
	→ yosinof joined	16:05
	gitinfo set mode: +v	16:06
	← milestone left	16:06
michaelcox	process question - let's say I create a few branches, each one to fix a separate issue to an open source project on github - I submit pull requests, but locally regardless of whether those pull requests are accepted, I want a merged version to use myself. But I also want to leave the branches separate in case I need to make additional commits to them. What's the best way to handle this?	16:06
adhawkins	Just create yourself a branch and merge these feature branches into it.	16:07
	Your branch will exist locally, just don't push it anywhere.	16:07
	← soreau left	16:07
michaelcox	if I committed again to one of those branches, wouldn't it contain that merge commit?	16:07
	gitinfo set mode: +v	16:08
Bbradley_1983	Does anyone have any articles they can recommend explaining the difference between the windows binaries install from git-scm.com and using msysgit? I'm having difficulty understanding which I should use	16:08
	→ jspiros_ joined	16:08
	← pdtpatrick left	16:08
	← Superlokkus left	16:08
	→ jim0203 joined	16:08
drue	Bbradley_1983, i think it's the same.	16:09
	← jspiros left	16:09
	← T-Guy left	16:09
	→ thelazydeveloper joined	16:09
Bbradley_1983	Oh, okay thanks. I'm looking to set it up with SSH for remote development, so I guess I'll just go with the binaries and see how it goes. Thanks again!	16:09
cmn	Bbradley_1983: it's the same, git-scm.com points to the msysgit project's downloads	16:10
	← Chib left	16:10
	← SethRobertson left	16:10
	← VadtecWk left	16:10
	→ Araxia_ joined	16:10
Bbradley_1983	I appreciate it.	16:10
	← pheaver left	16:10
	← fayimora left	16:11
	→ SethRobertson joined	16:12
	→ imachuchu joined	16:12
	← neurodrone left	16:12
	← jspiros_ left	16:13
	→ osmosis joined	16:14
	→ pheaver joined	16:14
	← michaelcox left	16:15
	→ jspiros joined	16:15
	→ HyperNerdV2 joined	16:15
	← HyperNerdV2 left	16:15
	← irqq left	16:15
	← j416 left	16:15
	← pppaul left	16:16
	← Ecesis left	16:16
	→ pppaul joined	16:16
	← markus-_ left	16:16
	← _iron left	16:17
	→ lorenz joined	16:17
	← lorenz363 left	16:17
	→ kenperkins joined	16:17
	→ Superlokkus joined	16:17
	→ snapy joined	16:17
	→ _iron joined	16:17
snapy	hello, I have one newbie question dealing with refspecs and git push	16:18
RandalSchwartz	don't ask to ask. just ask. :)	16:18
adhawkins	!ask	16: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.	16:18
	← Tabmow left	16:18
snapy	Is there a way to setup (in the config I guess) a default refspec for local branch with a different name that in the remote?	16:19
	← pppaul left	16:19
snapy	I basically want to automate this: http://blog.endpoint.com/2008/07/git-push-know-your-refspecs.html	16:19
	← jspiros left	16:19
	→ pppaul joined	16:19
	→ HyperNerdV2 joined	16:19
	→ Tabmow joined	16:20
adhawkins	won't git push -u origin local-branch:remote-branch work?	16:20
	I haven't tried it.	16:20
	→ jstemmer joined	16:20
adhawkins	git branch -vv will then show you what remote branch the local one is tracking.	16:20
snapy	testing branch -vv...	16:20
	→ soreau joined	16:21
	← ipalaus left	16:21
	→ Pookz joined	16:21
snapy	git branch attempts to create a new branch so it has given me the error that the branch exists	16:22
	the thing is	16:22
adhawkins	No, just 'git branch -vv' alone will list all local branches, as well as what remote branch they're tracking.	16:22
snapy	trying again...	16:22
	→ CannedCorn joined	16:22
adhawkins	If you do a 'git push -u remotename localbranch:remotebranch' I think it will push localbranch up as a branch called remotebranch on the remote called remotename (and set the upstream of the local branch)	16:23
	→ drev1 joined	16:23
snapy	you're right	16:23
	← pheaver left	16:23
	→ alexisabril joined	16:24
	→ jspiros joined	16:24
snapy	I have just tested the git remote -u	16:25
	sorry git push -u	16:25
adhawkins	And?	16:25
snapy	I didn't have anything to push	16:25
adhawkins	Do you have a local branch? Does the remote branch exist?	16:25
	→ VadtecWk joined	16:25
snapy	but anyway I got the message Branch ghmte-master set up to track remote branch master from github.	16:25
	← RaceCondition left	16:26
adhawkins	Excellent, assuming that's what you wanted.	16:26
snapy	however this on	16:26
	no	16:26
	← angelsl left	16:26
snapy	this seems to work only in the pull direction	16:26
	which I already had	16:26
	→ DuzyZiemniak joined	16:27
	→ fayimora joined	16:27
snapy	git remote <remote> show still does not show anything for the push direction	16:27
	anyaway I am going to do a dumb commit and see if a single 'git push' works now	16:27
	→ jceb joined	16:27
	← pppaul left	16:27
	← jonnu left	16:28
	→ angelsl joined	16:28
	→ dreiss joined	16:28
snapy	so it doesn't	16:28
	→ pppaul joined	16:28
	← na3r left	16:28
adhawkins	As long as 'git branch -vv' shows the correct local and remote branch names, all should be well I'd have thought	16:28
SethRobertson	snapy: what is your setting for push.default?	16:29
snapy	I still need to give the local_branch:refs/heads/new_branch extra argument	16:29
	SethRobertson, I haven't touched it, so I guess it will be the default	16:29
SethRobertson	The default is "matching" currently. You probably want to set it to "upstream"	16:29
adhawkins	snapy: You've reached the limit of my git knowledge I'm afraid, I'll let someone more knowledgeable take over :)	16:30
snapy	thanks adhawkins for your time :)	16:30
adhawkins	Sorry for not being able to fully help	16:30
snapy	lookig at man git-config I get the default for push.default is	16:30
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	16:30
snapy	matching - push all matching branches. All branches having the same name in both ends are considered to be matching	16:30
SethRobertson	I wish I had said that	16:31
snapy	I can try to set it "upstream"	16:31
	upstream - push the current branch to its upstream branch.	16:31
	← BarryCrayon left	16:31
	→ maletor joined	16:31
snapy	the key question is "what is its upstream branch"?	16:31
	the same name on the remote?	16:31
	← amcsi_work left	16:31
SethRobertson	What `git branch -vv` says	16:31
adhawkins	Isn't 'tracking' what you want?	16:32
SethRobertson	upstream is the new tracking	16:32
snapy	ok, I begin to see a possibility	16:32
adhawkins	Ah ok :)	16:32
	← beneggett left	16:32
snapy	I am going to run branch -vv again	16:32
	→ BarryCrayon joined	16:32
snapy	ok so I see my destination branch as the "upstream branch"	16:33
	I guess I now have to change push.default to "upstream"	16:33
	going to try that...	16:33
	← amigojapan left	16:33
	← pppaul left	16:33
	→ beneggett joined	16:34
	→ alberto56 joined	16:34
	→ RaceCondition joined	16:34
	→ pppaul joined	16:34
	→ juvenal joined	16:35
snapy	coooolll	16:35
	it worked!!	16:35
	→ jingmin joined	16:35
	← yosinof left	16:35
	← alberto56 left	16:36
snapy	although I guess that now I will have to push every branch one by one	16:36
	→ Dreadnaught joined	16:36
	→ alberto56 joined	16:36
snapy	it's a partial solution	16:36
	← jingmin left	16:36
	← Kulrak left	16:36
	← dark_element left	16:36
snapy	the thing is that git remote show <remote> distinguishes between " Local branch configured for 'git pull'" and "Local refs configured for 'git push'"	16:37
	← BarryCrayon left	16:37
snapy	I would like my local topic branch to be placed on the second group "Local refs configured for 'git push'	16:37
	← angelsl left	16:40
	→ panpainter joined	16:40
snapy	Another solution that I found is a wrapper script shown here: http://stackoverflow.com/questions/7101145/how-to-configure-specific-upstream-push-refspec-for-git-when-used-with-gerrit	16:41
	anyway, thanks for your help guys	16:42
	← LimeBlast left	16:44
	← abetaha left	16:44
	trout → const	16:45
	→ Enchilada joined	16:45
Enchilada	Pieter: hey	16:45
	→ alvaro_o joined	16:46
	→ _Qman joined	16:46
	← adhawkins left	16:47
	→ ixti joined	16:47
	← h0bbit_ left	16:48
	→ shruggar joined	16:48
	→ arvind_khadri joined	16:49
	← pppaul left	16:54
	← bgerber left	16:54
	→ kadoban joined	16:54
	→ osX64 joined	16:55
	→ ToreadorVampire joined	16:55
	→ Lulzon joined	16:56
	→ pppaul joined	16:56
	← francisfish left	16:56
	→ neurodrone joined	16:56
	← dreiss left	16:56
	← ToreadorVampire left	16:58
	→ bgerber joined	16:58
	→ abetaha joined	16:59
	→ Goplat joined	16:59
	→ yosinof joined	17:00
	← kevwil left	17:02
	← snapy left	17:04
	→ kevwil joined	17:04
	← shruggar left	17:04
	← shwaiil left	17:05
	→ eletuchy joined	17:06
	→ abetaha_ joined	17:06
	← abetaha left	17:07
	← pppaul left	17:08
	← eletuchy left	17:08
	→ pppaul joined	17:09
	← khmarbaise left	17:09
	→ eletuchy joined	17:09
	→ jstout24 joined	17:10
	← pmatthews left	17:11
	→ kukks joined	17:14
	← kukks left	17:14
	→ kukks joined	17:14
	← mneorr left	17:14
	← RaceCondition left	17:14
	← b1rkh0ff left	17:15
	← snearch left	17:15
	→ Jayflux joined	17:15
	→ PrinceAMD joined	17:16
	← PrinceAMD left	17:16
	→ PrinceAMD joined	17:16
	→ Tinti joined	17:19
	→ pheaver joined	17:19
	← pppaul left	17:20
	→ pppaul joined	17:20
Suhana	I have a gitweb setup on a local(ish) box which I've successfully connected to from my desktop box, but attempting the same from a laptop is producing a "connection refused" error - however `ssh -vT git.mydomain` is working as expected (allowing me to login) -- Any idea where I should be looking?	17:21
	→ Mowsh joined	17:22
	← pppaul left	17:22
	← luxurymode left	17:22
	→ pppaul joined	17:23
	→ dekuked joined	17:23
	← Superlokkus left	17:23
	→ umc joined	17:24
	← tyatpi left	17:25
RandalSchwartz	gitweb setup? or something like gitolite?	17:26
Suhana	gitweb itself	17:26
RandalSchwartz	gitweb doesn't have a ssh connection	17:26
	← eicto left	17:27
RandalSchwartz	knows nothing of it :)	17:27
	→ _huoxito joined	17:27
RandalSchwartz	gitweb is just some scripts for apache to show your git repo	17:27
	← stfn left	17:27
Suhana	... so my ha;f baked attempts at cloning my own repository with `git clone git.mydomain/base/project.git` .. are daft ?	17:27
	→ axl_ joined	17:27
RandalSchwartz	that's not related to gitweb	17:27
cmn	that's not a url that would work	17:28
kpreid	they're a separate problem	17:28
Suhana	ah	17:28
RandalSchwartz	are you asking a gitweb question, or a git question?	17:28
Suhana	um	17:28
	pass ? :D	17:28
cmn	Suhana: see man git clone for valid urls	17:28
gitinfo	Suhana: the git-clone manpage is available at http://jk.gs/git-clone.html	17:28
	← achadwick left	17:28
Suhana	ty - got it infront of me now	17:28
	← arvind_khadri left	17:31
imachuchu	how do you cherry-pick a range of commits (or is it an option on rebase)?	17:31
Suhana	git clone -v git://git.mydomain.co.uk/base/project.git -- works (from the desktop) -- but gets `connection refused` from the laptop - so it does appear to be a connection (authentication?) issue	17:32
	→ b1rkh0ff joined	17:32
	→ d4rklit3 joined	17:32
	→ thearthur joined	17:33
	→ Ripp__ joined	17:34
cmn	git:// isn't authenticated at all	17:34
	and it doesn't use ssh	17:34
	if you get connection refused it means that there is no daemon listening on that port	17:34
Suhana	assuming a clone works from one machine ... I think that suggests the daemon is running	17:35
hsnmck	how can I remove a git add before commit	17:35
RandalSchwartz	hsnmck - what does "git status" say to do. :)	17:36
	→ shruggar joined	17:36
	← cilly left	17:37
hsnmck	new files..	17:37
RandalSchwartz	right - and the message tells how to unstage them	17:37
	"git status" is your friend	17:37
hsnmck	thans :)	17:37
	:D	17:37
cmn	Suhana: there's one running on the machine your desktop is connecting to; it's not necessarily the same one that your laptop is trying to connect to	17:37
	← jameswarren left	17:37
Suhana	it is the same machine	17:38
	← babilen left	17:38
cmn	or it could be firewall rules, or a lot of other stuff going on in your network	17:38
	→ eicto joined	17:38
Suhana	ugh	17:38
cmn	if you've double-checked that they're trying to connect to the same IP address, then it must be firewall rules	17:38
	← pppaul left	17:40
	→ pppaul joined	17:41
	→ dreiss joined	17:41
	→ pdtpatrick joined	17:42
	← fly9 left	17:43
Suhana	oh..	17:43
	hah	17:43
	ty cmn :) opening 9418 did the trick :)	17:43
cmn	now think about whether you actually want to use the plain git transport	17:44
	→ whitman joined	17:44
Suhana	as apposed to ?	17:45
cmn	ssh	17:46
	← shruggar left	17:46
cmn	which has authentication	17:46
	and you can push with it	17:46
	and stop other people from fetching or pushing to your repo	17:46
	← gusnan left	17:46
RandalSchwartz	or gitolite	17:46
	which is trivial to install, and allows others to even use your account	17:47
hsnmck	is there a way to combine two commits in one (before pushing)?	17:47
thorbjornDX	hsnmck: man git-rebase	17:47
gitinfo	hsnmck: the git-rebase manpage is available at http://jk.gs/git-rebase.html	17:47
RandalSchwartz	hsnmck - "git rebase -i"	17:47
	and that	17:47
thorbjornDX	hsnmck: (definitely use -i, it's one of my favorite git features)	17:47
	← Enchilada left	17:47
Suhana	hmm, I can already push from the desktop, so I assume I can push from elsewhere - ssh keys have been dropped in place already	17:48
hsnmck	thank you guys	17:48
	← pppaul left	17:48
	← CannedCorn left	17:48
	→ abetaha joined	17:48
	← Targen left	17:48
	→ CannedCorn joined	17:48
	→ ipalaus joined	17:48
	→ pppaul joined	17:49
	← CannedCorn left	17:50
	→ wilmoore joined	17:50
	← joepie92 left	17:50
	→ CannedCorn joined	17:51
	→ MrMaksim1ze joined	17:51
	← abetaha_ left	17:51
	→ joepie91 joined	17:52
	← rgsteele left	17:53
	→ d3c joined	17:53
	→ patrick99e99 joined	17:54
cmn	Suhana: if you're pushing through git:// then anybody in the world can push	17:54
	← alexisabril left	17:55
	← d3c left	17:55
tango_	g16	17:55
Suhana	that .. would be embaressing	17:55
	→ nelk joined	17:55
	← felipec left	17:56
	← pppaul left	17:56
Suhana	I though I was pushing via git@...	17:56
	s/vim/via	17:56
	ugh - I need new glasses (or a bigger typeface)	17:56
	→ pppaul joined	17:57
cmn	those are two completely different things	17:57
	and you need to enable pushing via git:// explicitly	17:57
	→ d3c joined	17:57
	→ alexisabril joined	17:58
	→ khmarbaise joined	18:00
patrick99e99	Does anyone know of a way to hide removed code (code highlighted as red) when viewing a diff on github's site?	18:00
	← cortana2 left	18:01
	← khmarbaise left	18:01
	→ RaceCondition joined	18:01
EugeneKay	patrick99e99 - custom user style with display:none; set	18:01
	← pppaul left	18:01
	→ TzilTzal joined	18:03
	→ pppaul joined	18:03
TzilTzal	hi	18:03
gitinfo	TzilTzal: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	18:03
	← tatsuya_o left	18:03
	← Fudge left	18:04
	→ sallyz joined	18:05
	→ blacktulip joined	18:05
	→ meonkeys joined	18:06
	→ anjen joined	18:06
	→ arietis joined	18:06
	← pppaul left	18:06
	→ pppaul joined	18:07
meonkeys	after making changes to .gitignore, how do I tell git to reexamine all files and fix newlines if necessary?	18:07
	→ teweWORK joined	18:07
meonkeys	s/.gitignore/.gitattributes/	18:07
	(like adding "*.sh eol=lf")	18:07
	→ duckx joined	18:08
	→ fisted joined	18:08
	→ aselder_ joined	18:09
	← patrick99e99 left	18:09
	→ offbyone_ joined	18:09
	→ martinjl` joined	18:09
	→ ehsan_ joined	18:09
	→ kephas joined	18:09
	→ nelk_ joined	18:10
	→ bob2_ joined	18:10
	← nelk left	18:10
	← PrinceAMD left	18:10
	← duckxx left	18:10
	← juanfer left	18:10
	← fisted_ left	18:10
	← ehsan left	18:10
	← bartek_ left	18:10
	← glennpratt left	18:10
	← tommyvyo left	18:10
	← martinjlowm-lptp left	18:10
	← the_cybersphinx left	18:10
	← saintwolf left	18:10
	← enigmus left	18:10
	← offbyone left	18:10
	← aselder left	18:10
	← SamB left	18:10
	← LucasTizma left	18:10
	← shal3r left	18:10
	← qwertz_ left	18:10
	← bob2 left	18:10
	← jameslord left	18:10
	← sontek left	18:10
	← nowhereman left	18:10
	← wolfcore left	18:10
	← hays left	18:10
	← chris2 left	18:10
	← quuxman left	18:10
	← xxthink left	18:10
	← jrdavid left	18:10
	← Slush- left	18:10
	← ska-fan left	18:10
	← anildigital left	18:10
	← lindenle_ left	18:10
	← sntxrr left	18:10
	← sjefen6 left	18:10
	← bitslip left	18:10
	← luka12345 left	18:10
	← OPK left	18:10
	← lpsmith left	18:10
	← narthollis left	18:10
	← fangism1 left	18:10
	← aaronky left	18:10
	← pigeon left	18:10
	→ quuxman_ joined	18:10
	→ glennpratt_ joined	18:10
	→ aaronky joined	18:10
	→ sjefen6 joined	18:10
	→ PrinceAMD joined	18:10
	→ juanfer joined	18:10
	→ ehsan joined	18:10
	→ bartek_ joined	18:10
	→ the_cybersphinx joined	18:10
	→ aselder joined	18:10
	→ SamB joined	18:10
	→ LucasTizma joined	18:10
	→ sntxrr joined	18:10
	→ wolfcore joined	18:10
	→ chris2 joined	18:10
	→ xxthink joined	18:10
	→ lindenle_ joined	18:10
	→ jrdavid joined	18:10
	→ Slush- joined	18:10
	→ lpsmith joined	18:10
	→ ska-fan joined	18:10
	→ anildigital joined	18:10
	→ bitslip joined	18:10
	→ OPK joined	18:10
	→ luka12345 joined	18:10
	→ narthollis joined	18:10
	→ fangism1 joined	18:10
	→ pigeon joined	18:10
	→ jameslord joined	18:10
	← aselder left	18:10
	→ tommyvyo joined	18:10
	← ill1cit left	18:10
	← cakehero left	18:10
	← jameslord left	18:11
	→ enigmus joined	18:11
cmn	re-staging files should do it	18:11
	might need to reset the index to HEAD	18:11
	→ hays joined	18:11
	→ sontek joined	18:11
	← cleardance left	18:11
	→ sebastorama joined	18:11
	→ saintwolf joined	18:11
	← alanp left	18:11
	← PrinceAMD left	18:11
	← pppaul left	18:11
	→ SamB_ joined	18:12
	← ehsan left	18:12
	← SamB left	18:12
	→ pppaul joined	18:12
	← anjen left	18:12
	← kevwil left	18:13
	← bgerber left	18:13
	← martinjlowm left	18:14
meonkeys	Ok, thanks. http://help.github.com/line-endings/ has a complete answer too (assuming no local modifications).	18:14
	→ alanp joined	18:14
	→ moonlightcheese joined	18:14
moonlightcheese	so whenever i try to push to a bare git repo over git:// protocol, it hangs at "Writing Objects: 16%"	18:15
	→ FLeiXiuS joined	18:15
	← FLeiXiuS left	18:15
	→ FLeiXiuS joined	18:15
	→ freedrull joined	18:15
	← fukushima left	18:15
	→ jameslord joined	18:15
	← barrbrain left	18:16
FLeiXiuS	How can I show a summary view of difference for 2 branches?	18:16
PerlJam	FLeiXiuS: like git diff ?	18:16
FLeiXiuS	I want to see some stats on, files added, changed, removed, insertions/deletions	18:16
cmn	--stat	18:16
	← erichammond left	18:16
	← meonkeys left	18:16
FLeiXiuS	cmn, That's not showing me new files.	18:16
freedrull	i'm merging my development branch into my master branch. I'm getting merge conflicts, but for every conflict I just want the HEAD changes. shouldn't this be merged automatically? can i use a different merge strategy?	18:16
cmn	--name-status will	18:16
	→ fly9 joined	18:17
	← pppaul left	18:17
	→ bgerber joined	18:17
	→ pppaul joined	18:18
	→ diegoviola joined	18:18
	← Vile left	18:21
FLeiXiuS	Ok, now how about getting it to display a sum of insertions/deletions	18:21
	→ luxurymode joined	18:22
SethRobertson	--diffstat and friends?	18:22
	→ stfn joined	18:23
SethRobertson	Well, --stat and friends anyway	18:23
	← pppaul left	18:23
	→ Pupeno_W_ joined	18:23
	→ shal3r joined	18:24
FLeiXiuS	Ahh	18:24
imachuchu	moonlightcheese: this isn't an actual fix, but if you are having network problems you can always bundle locally, copy it to the remote, then clone/merge from the bundle	18:24
	→ qwertz_ joined	18:24
moonlightcheese	that's more of a work around heh.	18:25
	→ FaCeBooK` joined	18:25
moonlightcheese	i gotta figure out what's wrong with this thing.	18:26
	← Pupeno_W left	18:26
	Pupeno_W_ → Pupeno_W	18:26
moonlightcheese	i'm just building a git server on an ubuntu box, it's nothing special.	18:26
imachuchu	freedrull: look at the merge strategies section of the git merge man page, esp. about the "theirs" and "ours" options	18:26
moonlightcheese	it's weird, i can see it connect, and it just hangs.	18:27
imachuchu	moonlightcheese: how much are you pushing? One bundle copy just to set up a large repo isn't a terrible thing, if the normal way works fine afterwards	18:27
	← FaCeBooK` left	18:27
	← Vert left	18:28
imachuchu	moonlightcheese: also, as always, run a "git fsck" on your local repo, just to be sure	18:28
	← oriba left	18:28
moonlightcheese	$ git push rackspace master	18:28
fsvend	Hi, when using git send-email, it starts the e-mail content with an annoying line: "From: ...", ie. adds info already present in the e-mail header. Why is this so? I've tried the --suppress-from option, but no luck.	18:28
moonlightcheese	Counting objects: 48, done.	18:28
	Delta compression using up to 4 threads.	18:28
	Compressing objects: 100% (44/44), done.	18:28
	Writing objects: 16% (8/48)	18:28
	→ pppaul joined	18:28
moonlightcheese	i've deleted and reinitialized the local.	18:29
	i can't seem to get this thing setup.	18:29
cmn	that's uploading stuff, be patient	18:29
	→ irqq joined	18:29
cmn	take a look at your network traffic	18:29
moonlightcheese	it's like a brand new project... it's not gonna take long.	18:29
	it zooms along without issue until 16%.	18:30
	→ mneorr joined	18:30
canton7	you're not pusing over git:// from windows are you?	18:31
moonlightcheese	i am.	18:31
canton7	aha	18:31
	known bug: it freezes	18:31
moonlightcheese	wat.	18:31
	that blows.	18:31
imachuchu	lol, windows	18:31
canton7	fix: don't push over git://. it's unauthenticated	18:31
	→ klj613 joined	18:31
moonlightcheese	i'm lazy.	18:31
canton7	some problem to do with some windows socket weirdness iirc, that no-one's been able to figure out	18:31
	ssh is easier than git:// :P	18:32
moonlightcheese	no it isn't :p	18:32
canton7	in its basic form it is	18:32
	you don't even need to set up anything	18:32
	← EyesIsMine left	18:32
moonlightcheese	well then show me that guide.	18:32
	cuz it took me forever to figure out the damn keys last time i set it up.	18:33
imachuchu	moonlightcheese: what OS's are involved (what on the local, what on the remote)?	18:33
canton7	1. put git repo somewhere you have ssh access to. 2. set remote url to you@yourserver:relative/path/to/repo.git	18:33
moonlightcheese	and i don't remember how i did it, but i struggled with it for a while.	18:33
canton7	don't need no keys if you're that lazy -- just use your ssh password	18:33
	← pppaul left	18:33
	← rrn left	18:34
	→ pppaul joined	18:34
canton7	yes, there are more complex solutions that avoid having to put in your password on every push, or allow proper multi-user and per-repo authentication, but if you're just after a quick solution, ^^	18:34
	→ martinjlowm joined	18:35
	← lonewulf` left	18:38
	← pppaul left	18:38
moonlightcheese	woot.	18:39
	that was pretty easy after all.	18:39
	→ pppaul joined	18:39
canton7	see? haha :)	18:39
moonlightcheese	:)	18:39
imachuchu	ssh = easy option (there's a reason everyone uses it)	18:39
canton7	now stop that git-daemon from allowing pushes before someone finds it..	18:40
	→ fukushima joined	18:40
	← Bbradley_1983 left	18:40
	automage → zendeavor	18:41
	→ oriba joined	18:41
moonlightcheese	how does i?	18:41
	→ khmarbaise joined	18:42
SethRobertson	killall git-daemon	18:42
	→ nrichards joined	18:42
moonlightcheese	hmph.	18:42
canton7	and stop it from starting up. iirc it doesn't allow pushes by default? So you must have passed it some flag?	18:42
imachuchu	moonlightcheese: I assume that the remote is a *nix system?	18:42
moonlightcheese	Ubuntu	18:42
	← ryez left	18:43
moonlightcheese	31810 ? Ss 0:00 /usr/lib/git-core/git-daemon --base-path=/home/git/repositories --verbose --syslog --detach --pid-file=/var/run/git-daemon.pid --user=git --group=nogroup --export-all --enable=receive-pack	18:44
	← raatiniemi left	18:44
canton7	the --enable=receive-pack is what allows pushes iirc	18:44
	you may want to allow unauthenticated read-only access to your repos: in which case remove that flag. If you don't want any unauthenticated access, kill git-daemon :)	18:45
	→ jameswarren joined	18:45
	→ Eridius joined	18:45
imachuchu	moonlightcheese: you also may want to uninstall the package for "git-daemon-run" as it's what automatically starts the daemon on boot (if you have it installed)	18:46
moonlightcheese	why would i not want the server to automatically start the git-daemon when it boots?	18:46
	i kinda want this up all the time.	18:46
canton7	do your repos contain any sensitive information? is there any reason to allow joe bloggs to access them?	18:47
	→ macmartine joined	18:47
canton7	git-daemon is not required for ssh access. Just for git:// access	18:47
moonlightcheese	wat.	18:47
	→ astm joined	18:47
	→ hwrd\|work joined	18:47
moonlightcheese	usrs?	18:47
EugeneKay	yasrs	18:47
imachuchu	moonlightcheese: the git daemon allows for syncing over the git protocol, if you are only using ssh then it isn't needed	18:48
moonlightcheese	ahbedamd	18:48
imachuchu	moonlightcheese: ?	18:48
	← alexisabril left	18:48
	← hiryu_ left	18:50
	→ francisfish joined	18:50
	→ hwit joined	18:50
	← Eridius left	18:50
	← SamB_ left	18:50
	← hays left	18:50
	← juanfer left	18:50
	← bartek_ left	18:50
	← the_cybersphinx left	18:50
	← LucasTizma left	18:50
	← wolfcore left	18:50
	← chris2 left	18:50
	← xxthink left	18:50
	← jrdavid left	18:50
	← Slush- left	18:50
	← ska-fan left	18:50
	← anildigital left	18:50
	← lindenle_ left	18:50
	← sntxrr left	18:50
	← bitslip left	18:50
	← luka12345 left	18:50
	← OPK left	18:50
	← lpsmith left	18:50
	← narthollis left	18:50
	← fangism1 left	18:50
	← pigeon left	18:50
	→ Eridius_ joined	18:50
EugeneKay	.trigger_edit ssh Please use SSH to talk to remote repos. http:// and git:// are completely unsecured. You can try to configure "smart" https:// access, but it is usually much easier to just stick with ssh://	18:51
gitinfo	EugeneKay: Okay.	18:51
	← tr-808 left	18:51
	Eridius_ → Eridius	18:51
	→ tr-808_ joined	18:51
	→ tr-808 joined	18:51
	← ColKurtz left	18:51
	→ SamB__ joined	18:51
	→ SamB_ joined	18:51
	→ juanfer joined	18:51
	→ bartek_ joined	18:51
	→ the_cybersphinx joined	18:51
	→ sntxrr joined	18:51
	→ wolfcore joined	18:51
	→ chris2 joined	18:51
	→ xxthink joined	18:51
	→ lindenle_ joined	18:51
	→ jrdavid joined	18:51
	→ Slush- joined	18:51
	→ lpsmith joined	18:51
	→ ska-fan joined	18:51
	→ anildigital joined	18:51
	→ bitslip joined	18:51
	→ OPK joined	18:51
	→ luka12345 joined	18:51
	→ narthollis joined	18:51
	→ fangism1 joined	18:51
	→ pigeon joined	18:51
	← bleen left	18:51
imachuchu	moonlightcheese: also as canton7 points out, is there anything sensitive in your repo (that you wouldn't want people who have access to the server to read/modify)?	18:51
canton7	EugeneKay, you can use http authentication for even dumb http?	18:52
EugeneKay	canton7 - dat TLS	18:52
	→ hays joined	18:52
moonlightcheese	if they have access to the server, there's no reason they shouldn't be able to edit those files.	18:52
imachuchu	moonlightcheese: kk, just checking	18:52
canton7	EugeneKay, even without TLS	18:52
	(although security, of course, is rather low)	18:52
	← astm left	18:52
moonlightcheese	what difference would it make?	18:52
	→ LucasTizma joined	18:52
canton7	*although that	18:52
EugeneKay	canton7 - While technically true, the point of the factoid "DON'T DO THAT YOU FOOL", so I think that edge case should be omitted.	18:53
	← pppaul left	18:53
EugeneKay	+is	18:53
	← SamB_ left	18:53
canton7	EugeneKay, yeah true. Even so, dumb http + TLS?	18:53
	← mastro left	18:53
EugeneKay	canton7 - that'd be dumb https://	18:53
	And still, just don't. Please don't.	18:53
	→ ColKurtz joined	18:53
moonlightcheese	well shit, that's actually the easiest way to do it. i thought you had to have git-daemon up for ssh.	18:54
	and go through all that key garbage.	18:54
canton7	EugeneKay, yeah, I was wondering whether you were counting that in the "don't" category. Fair play	18:54
	← machty left	18:54
	→ shruggar joined	18:54
hsnmck	I wanted to squash 2 commits, so I used rebase -i, but I noticed that I used the wrong commit, so is there a way to abort a rebase without loosing everything. it asked me now to resolve the conflicts and use rebase --continue, but I want to undo this rebase and redo it with the correct commit, so is it possible to do that.. thx	18:54
EugeneKay	hsnmck - !fixup	18:54
gitinfo	hsnmck: 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!	18:54
imachuchu	moonlightcheese: nope, git+ssh is really easy	18:55
canton7	moonlightcheese, the key stuff is to avoid typing in your password on every push	18:55
imachuchu	moonlightcheese: canton7 also shared keys can make ssh more secure	18:55
	← mtphys left	18:55
canton7	also true. Also allows, with gitolite, for per-repo access rules	18:56
	→ pppaul joined	18:56
	zendeavor → automage	18:56
	→ Targen joined	18:56
	→ mtphys joined	18:56
	→ lonewulftp joined	18:56
	← FernandoBasso left	18:57
	← ronniy left	18:57
temoto	hsnmck, git rebase --abort	18:58
	→ mneorr_ joined	18:58
	→ FernandoBasso joined	18:58
hsnmck	temoto: I did this after resolving the conflicts, it works thanks	18:58
	:)	18:58
	→ tyatpi joined	18:59
	← mtphys left	19:00
	→ mtphys joined	19:00
	← pppaul left	19:00
	← mneorr left	19:01
	→ pppaul joined	19:01
	← Chillance left	19:02
	→ cakehero joined	19:02
	→ jim0203_ joined	19:02
	→ Chillance joined	19:02
	← jim0203 left	19:03
	jim0203_ → jim0203	19:03
	← stuntmachine left	19:03
	← oriba left	19:03
	← francisfish left	19:04
	← tyatpi left	19:04
	→ eijk joined	19:04
	← TzilTzal left	19:06
	→ zykes- joined	19:07
	← berserkr left	19:08
aried3r	Are branches usually kept around in git? Like, feature branches, bug fixing branches,... or are they deleted after being merged into master?	19:09
	← bolt left	19:09
FauxFaux	If delete lets you delete them without capital -D, then it's safe to delete them as they don't actually have any infomration in them.	19:10
	→ troy-- joined	19:10
cmn	for topic branches, you usually want to delete them to remove cruft	19:10
	→ Vile joined	19:10
	→ hsn joined	19:10
troy--	i accidently deleted a folder but i didn't commit it	19:11
	← jameslord left	19:11
canton7	did you add the files in it at any point (using 'git add')?	19:11
	→ jameslord joined	19:11
	→ bolt joined	19:11
cmn	troy--: do you mean that you didn't commit the deletion and it was tracked, or that you dir that git had no idea existed?	19:11
hsn	what means AM after branch name and how to remove it? /c/hadoop/hadoop (trunk\|AM)	19:11
cmn	hsn: that means you're in the middle of an 'am' run	19:12
	you called am at some point and never finished fixing it	19:12
troy--	nm i figured it out	19:12
	thanks	19:12
	← quuxman_ left	19:12
	→ quuxman joined	19:12
	→ oriba joined	19:13
	← quuxman left	19:13
	← agileadam left	19:14
	→ n1x joined	19:16
	← ology left	19:16
	← pppaul left	19:17
	→ pppaul joined	19:18
	→ rrn joined	19:19
	→ MyTallest joined	19:20
	← Lgb left	19:20
	← pppaul left	19:22
	→ Lgb joined	19:23
	→ thwest1 joined	19:23
	← thwest1 left	19:23
	→ thwest1 joined	19:24
	→ lonewulf` joined	19:24
	→ pppaul joined	19:24
	← thwest1 left	19:24
	← toothr left	19:25
	→ tworkin joined	19:26
tworkin	!submodule_rm	19:26
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	19:26
	→ znake joined	19:26
	← d3c left	19:26
	→ toothr joined	19:26
dmlloyd	heh	19:28
	I strongly dislike the notion of submodules	19:28
	→ d3c joined	19:28
jast	and I find it awesome	19:28
	what a dilemma	19:28
cmn	you dislike that projects have external build-time dependencies?	19:29
dmlloyd	we solve that in the build	19:29
	rather than in the scm	19:29
jast	submodules are just a way of keeping track which exact version of the dependency is being used at any given point in time	19:30
	→ pantsman joined	19:30
	← pantsman left	19:30
	→ pantsman joined	19:30
jast	personally I find that useful	19:30
	← w0m_ left	19:30
	→ w0m joined	19:30
iheffner	I find the idea of submodules useful. I find use of them to be alternatively useful and a pain point.	19:32
	→ jim0203_ joined	19:32
	→ Pupeno_W_ joined	19:32
	→ hydrozen joined	19:32
fsvend	Anyone here experience that git send-email adds an extra "From: " line in the e-mail body?.. It's not there when I inspect the patch git-format-patch creates.	19:32
	→ francisfish joined	19:32
iheffner	I'd like to see functionality in git-archive that handled and followed submodule references in a manner that created a fully working archive at any given point in time.	19:32
	← jim0203 left	19:33
	jim0203_ → jim0203	19:33
	→ alexbligh1 joined	19:33
tworkin	i develop a library that i share among applications, and i find it productive to fix bugs in the shared code at the same time that im developing the non-shared code, so I end up workin within the submodule a good bit.	19:33
	i'm sure theres some alternative like checking out the projects at the same level, and just having the build complain that the needed component is missing	19:33
	← Pupeno_W left	19:33
	Pupeno_W_ → Pupeno_W	19:33
	← pppaul left	19:34
	→ pppaul joined	19:34
tworkin	but submodules work alright, i just have to come here to remember a few of the steps. google doesnt have a "!git submodule_rm" command :[	19:34
	← mneorr_ left	19:35
	gitinfo set mode: +v	19:36
alexbligh1	Newbie question: I have cloned a repository (R1) on to a local machine, and committed a pile of updates to my local repo. I want to push my new repo to my own git/gitosis sever to publish it, but want to continue with R1 being where I pull from. How do I do that?	19:36
	→ StamEhad joined	19:36
iheffner	being able to include and deploy different versions of the same common library for different "products" running on the same system would be hella useful when you want to release one product which depends on a newer version of a library, but you have an old crusty things that also depends on that library, but you don't have the resources to regress the crufty thing and do a release on it. Our current deploy system does not support this. We get around it ...	19:37
	... in a horrible way.	19:37
canton7	alexbligh1, look at the default behaviour of 'git push' (see push.default in man git-config). Observe that 'git pull' always uses tracking information to determine where to pull from, and that @{upstream} / @{u} always points to the tracked branch	19:37
gitinfo	alexbligh1: the git-config manpage is available at http://jk.gs/git-config.html	19:37
	← jim0203 left	19:37
	← gtrak left	19:37
	← hwit left	19:38
canton7	alexbligh1, so, you can set your local repo's branches to track branches from R1. 'git pull' will then pull from R1, while 'git push remote_repo' will push to your gitolite server	19:38
	→ khmarbaise_ joined	19:38
canton7	alexbligh1, also, !gitosis	19:38
gitinfo	alexbligh1: gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite	19:38
	→ jim0203 joined	19:38
	→ gtrak joined	19:39
	→ hwit joined	19:39
	← OOPMan left	19:39
	→ gusnan joined	19:39
	← jceb left	19:39
	← khmarbaise left	19:40
	khmarbaise_ → khmarbaise	19:40
alexbligh1	canton7, so I want something like "git remote add mysever [email@hidden.address] then "git push myserver"?	19:40
canton7	alexbligh1, sure	19:40
alexbligh1	canton7, (& re gitosis, yes I know, but it's installed...)	19:41
	← StamEhad left	19:41
	← pppaul left	19:41
canton7	to be fair, you can completely ignore tracking info and all that, and just be explicit as to where you pull/fetch from, and push to	19:41
	→ OOPMan joined	19:42
	→ pppaul joined	19:42
alexbligh1	canton7, so what is the final parameter in "git push origin master:refs/heads/master" doing (from various FAQs on doing this without the intiial clone)	19:42
fsvend	any git users here with Ø/ø in their name, and have problems with git send-email?	19:42
canton7	alexbligh1, it's saying "take the local master branch, and push it to the remote location refs/heads/master". That example is a bit odd, as the left-hand is implicit, whereas the right-hand side is more explicit. Your example would be better off as 'git push origin master'	19:43
	← lukus left	19:43
	← neurodrone left	19:44
	← lonewulf` left	19:44
	← FLeiXiuS left	19:44
	→ JEntrep joined	19:45
	← Targen left	19:45
alexbligh1	canton7, thx. I think I can safely ignore them then. I suspect they have been copied from FAQ to FAQ without anyone understanding them...	19:45
	← JEntrep left	19:45
canton7	yeah, likely	19:45
	← OOPMan left	19:47
	← ShooterM_ left	19:48
	→ ShooterM_ joined	19:48
	→ OOPMan joined	19:49
	→ Targen joined	19:49
	← Jackneill left	19:51
	← hsn left	19:52
	← umc left	19:53
	→ lonewulf` joined	19:53
	← pppaul left	19:53
	→ g3orge joined	19:54
	← lonewulf` left	19:54
	→ pppaul joined	19:54
g3orge	I have the master branch and another one with many differences (and conflicts of course). Instead of merging/rebasing I want to keep only the second one. is that possible? I mean do I need to keep the master branch?	19:55
cmn	you don't need to have any particular branch at all	19:55
PerlJam	g3orge: what you do with your branches is up to you	19:55
	← znake left	19:55
	→ znake joined	19:55
g3orge	oh. thanks. is there a way to rename or something so I won't confuse other people. I mean to rename the second master, or to replace its contents.	19:56
	← marthinal left	19:57
cmn	you can name branches pretty much anything	19:57
g3orge	but how can I rename them after the creation?	19:58
tworkin	g3orge: you can just delete master, and then branch a new master out of otherplace	19:58
	→ tatsuya_o joined	19:58
cmn	man git branch -m	19:58
gitinfo	the git-branch manpage is available at http://jk.gs/git-branch.html	19:58
	→ lonewulf` joined	19:58
g3orge	ok thanks guys	19:59
	← wolfcore left	19:59
	→ alexukf joined	19:59
	→ Slix` joined	20:01
alexbligh1	canton7, excuse the further dumb question, but is the syntax in essence "git push [branchname] [remotename]"? I'm getting "[branchname] does not appear to be a git repository/the remote end hung up unexpectedly"	20:01
canton7	other way around	20:01
	git push remotename branchname	20:01
alexbligh1	ahh	20:01
	save it's now complaining [remotename] isn't a git repository.	20:02
	→ neurodrone joined	20:02
	← g3orge left	20:03
cmn	maybe it isn't	20:04
	does git remote list it? is it a proper url?	20:04
	→ milestone joined	20:04
	← OOPMan left	20:07
	← francisfish left	20:07
	← marcogmonteiro left	20:08
	← pppaul left	20:09
	← Zenith77\|2 left	20:09
	← d4rklit3 left	20:09
xref	when you 'git clone' is anything written to the repo you clone from? a message it was cloned or any other file change?	20:09
	← dcarper left	20:09
	← Ripp__ left	20:09
	← sallyz left	20:10
	← d3c left	20:10
	→ pppaul joined	20:11
cmn	no	20:11
	→ OOPMan joined	20:11
cmn	other than the inode's access time if the filesystem has it on, there is no effect on the remote	20:12
	→ francisfish joined	20:12
	← lorenz left	20:15
xref	thanks cmn, trying to figure out why one of my gitolite repos had it's objects/ ownership changed to a different user	20:16
	← enmand left	20:16
	← erichynds left	20:16
	← pppaul left	20:16
xref	a git clone to /tmp was run on the local fs as root, but I guess a git clone shouldn't affect the repo	20:16
cmn	probably because someone did some variation of sudo git clone /var/git/...; sudo git push	20:16
	the push being the important part	20:16
xref	ah	20:16
	→ pppaul joined	20:17
cmn	i.e. someone in your teams need a good talking to	20:17
	and possibly sudo privileges revoked	20:17
	← hsnmck left	20:17
	→ h0bbit_ joined	20:17
xref	a sudobuser	20:17
grayhoof	dangerous	20:18
	← jim0203 left	20:18
	→ jeffrin joined	20:20
	→ tyatpi joined	20:20
jeffrin	hello all	20:20
gitinfo	jeffrin: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	20:20
jeffrin	can someone help me	20:20
FauxFaux	Is your question "Can someone help me?"? You only get one.	20:21
	→ robotmay joined	20:21
jeffrin	i like to download usb-next branch using git	20:21
	→ d4rklit3 joined	20:21
EugeneKay	xref - any time you see files in your gitolite repo not owned by the gitolite user it means somebody has screwed it up and should be beaten viciously. Which is why I do it bout once a week.	20:22
	← bartek_ left	20:22
	→ bartek joined	20:22
	← asakura left	20:23
jeffrin	i did related to git clone git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git	20:23
bartek	Hi there. Can I use something similar to receive-pack to get information like the commit log? e.g. ssh -x [email@hidden.address] "git-receive-pack 'myrepo.git'" refs/heads/master ..	20:23
	→ nutron joined	20:23
	← Targen left	20:23
	→ mcluskydodallas joined	20:23
cmn	bartek: no, logging only works on a local repo	20:24
bartek	cmn: Thanks	20:25
iheffner	jeffrin: it sounds like you may be looking for git checkout or git archive, depending on what you mean by "download" and what you expect to have afterwards.	20:25
cmn	bartek: you can put gitweb or similar on that machine if you find yourself needing/wanting that often	20:25
jeffrin	i give git clone ...........	20:26
	← edude03 left	20:26
	→ Gentlecat joined	20:27
cmn	jeffrin: clone downloads all branches, use git branch -a to list all of them, git checkout -t origin/usb-next will most likely give you what you want	20:27
	← Sigma left	20:28
	← pppaul left	20:28
	→ edude03 joined	20:28
	→ MistuhKurtz joined	20:28
jeffrin	cmn : let me try related to that	20:29
cmn	what do you mean with related?	20:29
	→ pppaul joined	20:29
xref	EugeneKay: haha, thanks for the tip	20:29
	← Resure left	20:29
	→ krz joined	20:30
	→ Kabaka joined	20:30
	→ asakura joined	20:30
	→ dark_element joined	20:31
	← tommyvyo left	20:32
jeffrin	cmn : that related is for security .. what if i do not do exactly as i said	20:32
	cmn : i mean exactly as you said	20:32
cmn	then the quality of help you'll receive will be much lower	20:32
	← Nasrudin left	20:33
cmn	because we can't know what situation you're actually in	20:33
jeffrin	cmn : please wait .. let me try	20:33
	→ tommyvyo joined	20:35
	→ Adys_ joined	20:35
	← Adys left	20:36
	← h0bbit_ left	20:37
	← dark_element left	20:37
jeffrin	cmn :http://pastecode.com/Hw	20:39
cmn	you already have that branch, check it out	20:39
	→ cleardance joined	20:40
	← admsyn left	20:40
jeffrin	cmn : git checkout remotes/origin/usb-next is that ok for checkout	20:41
cmn	no	20:41
	that's a remote-tracking branch, you can check that out; trying to do so detaches HEAD	20:41
	use git checkout usb-next	20:41
	you have that local branch already	20:41
cleardance	How do I go back to a previous version of my program?	20:43
	← skylamer` left	20:43
	→ fuzzybunny69y joined	20:43
RandalSchwartz	sitaram - missing a suggested command after "suggested command:" on the g2migr.html page	20:44
jeffrin	cmn : i created that branch.. that should be deleted	20:44
	→ KyleXY_ joined	20:44
cmn	then do so	20:44
jeffrin	cmn : i want the branch created by upstream	20:44
iheffner	cleardance: temporarily or permanently? and we're assuming you mean "a previous commit"	20:44
	← FernandoBasso left	20:45
cmn	jeffrin: then delete the local branch and do what I said	20:45
	→ beppe joined	20:45
	← hwit left	20:46
	ironfroggy → ironfroggy_	20:47
	ironfroggy_ → ironfroggy	20:47
	← beppe left	20:47
	→ BiggFREE joined	20:47
	← DuzyZiemniak left	20:48
	← hydrozen left	20:49
	← pppaul left	20:49
	→ pppaul joined	20:49
	← irqq left	20:50
jeffrin	cmn :http://pastecode.com/Hx	20:50
	← bnjmn left	20:51
	KyleXY_ → KyleXY	20:51
	→ irqq joined	20:51
iheffner	jeffrin: git checkout -t origin/usb-next	20:51
	→ thinice joined	20:52
	← thinice left	20:52
	← hashpuppy left	20:52
cmn	jeffrin: that shows you doing what I said not to do	20:52
	← icq left	20:53
jeffrin	http://pastecode.com/Hy	20:53
RandalSchwartz	I'm not understanding this error message while trying to migrate gitolite v2 to v3... "WARNING found 639 gl-perms files with R or RW; see docs"	20:54
	the docs are incomplete about that. what do I need to change?	20:54
	← tyatpi left	20:55
	← milestone left	20:55
	← _iron left	20:55
jeffrin	cmn : what should i do now	20:56
nickoe	Is it possible to clone a git repo, that is residing in a http accesable folder?	20:56
	← hellopat left	20:56
cmn	jeffrin: whatever you want	20:57
	you're set; you have checked out the branch at the state it was when you last fetched	20:57
	← whitman left	20:57
jast	nickoe: yes, but you need to either set up a git CGI thingy on the server or run "git update-server-info" inside the server repo	20:57
	→ iondiode joined	20:58
	← pppaul left	20:59
	gitinfo set mode: +v	20:59
	← yosinof left	20:59
zastaph	if I download git for windows I get 1.7.10, but on my ubuntu even after apt-get update/upgrade its still 1.7.5.4	21:00
cmn	so?	21:00
zastaph	I need this functionality: http://stackoverflow.com/questions/1557183/is-it-possible-to-include-a-file-in-your-gitconfig	21:00
	only available in 1.7.10	21:00
cmn	so upgrade to that version	21:00
jeffrin	cmn : please see my present condition http://pastecode.com/Hz	21:01
zastaph	uninstall on apt-get, and install manually?	21:01
	→ pppaul joined	21:01
	← macmartine left	21:01
cmn	zastaph: build from source or find a ppa that has up-to-date git binaries	21:01
	jeffrin: and now what? you've undone creating the local branch. What do you want to tell me?	21:02
iondiode	does this workflow make sense (or is possible) --- make many small commits locally , roll those commits into 1 version (so that when I push there is only 1 step between my version and remotes?) ?	21:02
	← cannonball left	21:02
nickoe	jast, okay	21:03
cmn	iondiode: that's part of many workflows	21:03
	→ hachque joined	21:03
iondiode	cmn: thanks, how do i do the roll up part?	21:03
cmn	man git rebase -i	21:03
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	21:03
	→ yosinof joined	21:03
iondiode	cmn: sweet, thanks - and you too gitinfo ;)	21:04
cmn	!botsnack	21:04
gitinfo	Om nom nom	21:04
	← hachque left	21:05
	→ hachque_ joined	21:05
nickoe	jast, hmm, that does not work...	21:05
	← pppaul left	21:05
	← fsvend left	21:05
	→ Vert joined	21:06
cmn	nickoe: you'll have to be a lot more specific	21:06
jeffrin	cmn : THANKS A LOT http://pastecode.com/HA	21:06
nickoe	jast, well, it stil suggests the git update-server-info thing...	21:06
	whough I alrady have done it...	21:06
	→ pppaul joined	21:07
	← hachque_ left	21:07
	← juvenal left	21:07
nickoe	but it is because it is on AFS	21:07
	← Xander left	21:07
	← Anonyme44893 left	21:07
cmn	AFS has nothing to do with git being able to access the information over http	21:07
nickoe	cmn, yeah,... woops forgot the link	21:07
	http://dpaste.com/749542/	21:07
cmn	where did you run update-server-info?	21:07
cleardance	I want to merge 2 branches, master and X, everything in master should be kep and the files in X that are not in master should be put in master, how do i do that? if there is collision betwen files, files in master should be kept as they are.	21:08
nickoe	But even if I do git update-server-info on the server, it does not solve it	21:08
cleardance	git merge master X?	21:08
nickoe	but I may not be on the entirely correct server	21:08
cmn	where on the srver	21:08
	what?	21:08
nickoe	ind the software folder	21:08
cmn	what do you mean not the correct server?	21:08
	→ SegFault1X\|work joined	21:08
cmn	run it from the git repo	21:08
	← francisfish left	21:08
	→ Xander_ joined	21:08
	← SegFault1X\|work left	21:09
cmn	as long as the filesystem is there, it works	21:09
	← znake left	21:09
nickoe	cmn, yes, that would be the software folder	21:09
cmn	is it a bare repo?	21:09
	what do you see in the httpd logs?	21:09
nickoe	well it is a clone of a svn repo	21:09
cmn	that doesn't matter	21:09
nickoe	cmn, I don't know if I can see the logs	21:10
	→ yoklov joined	21:10
nickoe	I am a user on the server	21:10
	→ SegFaultAX\|work2 joined	21:10
nickoe	else I would just have made it a real git server thign	21:10
	← Maccer left	21:10
cmn	what do you mean by real git server?	21:10
	and why isn't ssh an option?	21:11
	→ Maccer joined	21:11
cleardance	I want to merge 2 branches, master and X, everything in master should be kep and the files in X that are not in master should be put in master, how do i do that? if there is collision between files, files in master should be kept as they are. I try 'git merge master X' but i get conflicts, can i tell git to just then keep files from master?	21:11
nickoe	cmn, it may be...	21:11
cleardance	or should i do just git branch X ?	21:11
cmn	cleardance: on master, git merge X	21:11
	→ tyatpi joined	21:11
cmn	see man git merge for options about keeping one side or the other	21:12
gitinfo	the git-merge manpage is available at http://jk.gs/git-merge.html	21:12
	← pppaul left	21:12
	← lonewulf` left	21:12
cmn	but beware of the strategies that ignore one side	21:12
cleardance	merge is not possible because you have unmerged files i get	21:12
	→ pppaul joined	21:12
cmn	then you're already merging	21:12
	→ acl_ joined	21:14
	← yosinof left	21:14
	→ yosinof joined	21:14
cleardance	yes it tried but failed, can i unmerge?	21:14
nickoe	cmn, am I doing it right? http://dpaste.com/749547/	21:14
cleardance	i did git merge master X instead of git merge X while in master	21:15
	← yosinof left	21:15
cmn	in this particular case, that shouldn't matter	21:15
	nickoe: you need to specify a apth	21:15
	path*	21:15
	← bartek left	21:15
	← n1x left	21:15
	← acl_ left	21:16
	Xander_ → Xander	21:16
nickoe	cmn, havent I done that?	21:16
cmn	a real one	21:16
cleardance	how do I revert a half-failed merge?	21:17
cmn	or do you really have your stuff on $HOME/path/software?	21:17
nickoe	cmn, the path like file:///afs/...?	21:17
cmn	cleardance: you don't need to revert anything, abort the merge	21:17
	→ Constant_ joined	21:17
cmn	nickoe: that's a local path, if that works, you can use that	21:17
cleardance	how?	21:17
cmn	but if that works, why are you trying to do network stuff	21:18
	→ lonewulf` joined	21:18
cmn	cleardance: man git merge --abort	21:18
gitinfo	cleardance: the git-merge manpage is available at http://jk.gs/git-merge.html	21:18
	← pdtpatrick left	21:18
	→ pdtpatrick joined	21:18
	← TheHaven left	21:19
cleardance	ok i aborted and then tried git merge X but i still failed on the same files, guess i can checkout X and remove those files?	21:19
	→ yosinof joined	21:19
cmn	man git checkout --ours	21:19
gitinfo	the git-checkout manpage is available at http://jk.gs/git-checkout.html	21:19
nickoe	cmn, well it is also located on /afs/institution.edu/.../software on the server	21:20
	→ krnl joined	21:20
nickoe	git clone [email@hidden.address] is that the right syntax?	21:20
cmn	when you say on the server, do you actually mean that's the path on the server, or are you giving the path over which you can access it and you're obsesing over the fact that it's hosted somehwere else?	21:21
	→ iamjarvo joined	21:21
	← iamjarvo1 left	21:21
cmn	man git clone for a review of the possible syntax	21:21
gitinfo	the git-clone manpage is available at http://jk.gs/git-clone.html	21:21
	← kadoban left	21:21
	→ kadoban joined	21:22
	→ ph^ joined	21:22
nickoe	cmn, that the afs path is the path to access the folder on the server or _any_ unix afs setup that is normal	21:24
cmn	that doesn't answer my question	21:24
	← fuzzybunny69y left	21:24
	← ph^ left	21:25
	← eijk left	21:25
cmn	that syntax is right, as long as the path is right	21:25
	→ ph^ joined	21:25
nickoe	okay, thank yoyu	21:25
	→ fuzzybunny69y joined	21:25
	← Maccer left	21:26
	→ ph^_ joined	21:26
	← ConstantineXVI left	21:26
	← Constant_ left	21:26
	→ ConstantineXVI joined	21:26
	← heroux left	21:27
	← dekuked left	21:27
	→ heroux joined	21:27
	← ph^ left	21:29
	← ColKurtz left	21:29
	← imachuchu left	21:30
	→ codeshah joined	21:30
	← pppaul left	21:30
	← MyTallest left	21:30
	← Peste_Bubonica left	21:30
	← jeffrin left	21:31
	→ pppaul joined	21:31
	← yorick left	21:31
EugeneKay	nickoe - the remote URI depends upon the environment. If you're referencing a filesystem path then it's usually user@host:/foo/bar/repo.git. gitolite(and other hosting packages) usually use git@host:user/repo.git - no leading /.	21:31
	→ ColKurtz joined	21:31
EugeneKay	nickoe - when in doubt, ask your sysadmin. Or just !tryit	21:31
gitinfo	nickoe: [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. http://sitaramc.github.com/1-basic-usage/tias.html may help with git-specific TIAS.	21:31
	← luxurymode left	21:31
	← tommyvyo left	21:31
	← iamjarvo left	21:32
	← Rickardo1 left	21:32
	→ mischat joined	21:33
	→ joho joined	21:33
	→ erichammond joined	21:36
	← v0n left	21:37
	→ PrinceAMD joined	21:37
	← pppaul left	21:38
	→ oppaus joined	21:39
	← pandeiro left	21:39
	→ enmand joined	21:39
	→ felipec joined	21:39
	→ pppaul joined	21:39
	← hwrd\|work left	21:40
	← joho left	21:41
	← ph^_ left	21:42
	← d0k left	21:42
	→ ferdna joined	21:42
	→ ph^ joined	21:43
	← irqq left	21:43
sitaram	RandalSchwartz: The missing command should be something like 'find ~/repositories -name gl-perms \| xargs perl -pi -e 's/\bR\b/READERS/;s/\bRW\b/WRITERS/'	21:45
	RandalSchwartz: I will fix the docs a bit later; thanks	21:45
	→ psoo joined	21:45
sitaram	(for catching it)	21:45
	← ph^ left	21:47
	← RobertLaptop left	21:47
	← ConstantineXVI left	21:47
	← sebastorama left	21:49
	→ v0n joined	21:49
	→ SegFault1X\|work2 joined	21:50
EugeneKay	sitaram - I had a problem with removing a g2-era repo last night.... the gl-perms file stayed in place after I removed all rules referencing it, generating that error as well.	21:51
	sitaram - perhaps you should prune gl-perms files for non-listed repos?	21:51
	→ Maccer joined	21:52
	← psoo left	21:52
	→ ConstantineXVI joined	21:53
	← SegFaultAX\|work2 left	21:53
	← Destos left	21:53
	← pppaul left	21:54
	→ luke3321 joined	21:55
	← alexukf left	21:55
	← nickoe left	21:55
	→ pppaul joined	21:55
	← dr_lepper left	21:55
	← ixti left	21:55
	← blacktulip left	21:56
	← dfr\|mac left	21:58
	← CannedCorn left	21:58
	gitinfo set mode: +v	21:58
	→ dfr\|mac joined	21:58
	→ acl_ joined	21:59
	← khmarbaise left	21:59
	← john_anderson left	21:59
	← dfr\|mac left	21:59
	→ CannedCorn joined	21:59
	→ madewokherd joined	22:00
	→ john_anderson joined	22:01
	← duckx left	22:02
	← MANCHUCK left	22:02
	→ Fudge joined	22:02
	gitinfo set mode: +v	22:02
	→ dr_lepper joined	22:02
	← beneggett left	22:02
	→ sebastorama joined	22:03
	→ kcj joined	22:03
	← erichammond left	22:03
	← kcj left	22:03
	→ kcj joined	22:03
	← alberto56 left	22:03
	← kcj left	22:04
	← dv310p3r left	22:04
	← ColKurtz left	22:04
	→ erichammond joined	22:04
	→ kcj joined	22:04
	→ Zenith77 joined	22:04
	← fayimora left	22:04
	← mcluskydodallas left	22:04
	← juanfer left	22:04
	← iondiode left	22:05
	← Darj left	22:05
	← revagomes left	22:05
	→ sallyz joined	22:05
	← j0ran left	22:06
	→ beneggett joined	22:06
	→ ColKurtz joined	22:06
	→ mcluskydodallas joined	22:07
	← bartman`` left	22:07
	→ machty joined	22:08
	← pppaul left	22:08
	← osmosis left	22:09
	→ pppaul joined	22:10
	→ isao joined	22:10
	→ dcarper joined	22:10
	→ osmosis joined	22:11
	← pppaul left	22:11
	→ pppaul joined	22:11
	← lonewulftp left	22:12
	→ lonewulftp joined	22:12
	→ bartman`` joined	22:12
	← Element9 left	22:14
sitaram	EugeneKay: there's no way to know whether a non-listed repo is actually one that is yet to be listed, such as can happen if (a) the admin decides to start the conf file from scratch for whatever reason and add repos back in a different order or something or (b) the repo has been moved over from another installation	22:14
	← dcarper left	22:14
sitaram	EugeneKay: removing the file would lose access to various people; access that cannot be re-established simply by 'gitolite setup' or 'gitolite compile' or 'gitolite trigger POST_COMPILE' etc	22:15
	I'm not comfortable throwing away info like that; rather leave it to the admin	22:15
	→ alberto56 joined	22:16
EugeneKay	The thing for me is it's a non-obvious error, and I'm left to go back and hunt through the docs to figure out why the heck I'm getting it.	22:16
	← john_anderson left	22:16
	→ alexukf joined	22:17
	→ jeddhaberstro joined	22:17
	→ john_anderson joined	22:18
	← txomon\|home left	22:19
	EugeneKay thinks on it	22:20
EugeneKay	Perhaps some sort of 'clean' command which will go in and remove "unneeded" gl-confs, non-active hooks, etc?	22:21
	→ dvide_ joined	22:21
	← macabre left	22:21
jeddhaberstro	How can I get git log to only list commits made on a specific branch?	22:22
cmn	git log branch	22:22
	← TeckniX left	22:22
	→ queuetip joined	22:22
jeddhaberstro	that seems to include commits from branches that were merged with it	22:22
	which I don't want	22:22
	← dvide left	22:22
cmn	if you mean that you don't want commits made in branches merged into that branch, --first-parent might it to you, depending on how you merged	22:22
EugeneKay	That seems like there'd be a thousand corner cases.	22:22
queuetip	i'm a total git nub, i pushed some changes via git push master, and then another developer made some changes, but when i try git pull master it says it's not a repo	22:23
cmn	those commits /are/ in that branch	22:23
jeddhaberstro	hmm	22:23
	→ fayimora joined	22:23
cmn	queuetip: master is probably the branch, not the repo name	22:23
frogonwheels	jeddhaberstro: it's a non-trivial problem	22:23
bremner	jeddhaberstro: if you consult !cs you might find your idea of branch doesn't exist	22:23
gitinfo	jeddhaberstro: 'Git for Computer Scientists' explains the basic structures used by git, which is very helpful for understanding its concepts. http://sitaramc.github.com/gcs/	22:23
bball-	how can I throw away local commits for a single file ?	22:23
jeddhaberstro	thanks	22:23
frogonwheels	jeddhaberstro: you can try and exclude commits 'reachable' from other branches	22:23
	← isao left	22:23
queuetip	cmn: how do i figure out the repo name then to pull into?	22:23
	← moonlightcheese left	22:23
jeddhaberstro	my goal is to visualize git --graph essentially	22:23
cmn	git remote	22:23
queuetip	cmn: thanks	22:23
jeddhaberstro	so I was hoping to get the commits on made to a branch, for each branch and kind of graph it branch by branch	22:24
	if you get what I mean	22:24
cmn	but you shouldn't use any pull command that requires args	22:24
	← bglusman left	22:24
cmn	it'd be better to set up tracking (either on push with git push -u <remote> <branch> or git branch --set-upstream <branch> <remote>/<branch>)	22:24
queuetip	cmn: great, that would make life easier for sure. i'm gonna do just that. thanks	22:25
	→ iamjarvo joined	22:25
frogonwheels	jeddhaberstro: with merge commits, there's nothing special about the order of the multiple parents	22:25
cmn	jeddhaberstro: as I said, --first-parent will give you only commits made directly on that branch, as long as you never merged the branch into another one	22:25
	and --no-merges would make it clearer, probably	22:26
	← Ryback_ left	22:26
	← tworkin left	22:26
jeddhaberstro	well, i want to be able to do this for merged branches also, so I don't think that'll work	22:26
	← DoniRS left	22:26
jeddhaberstro	frogonwheels: can you clarify what you mean?	22:26
cmn	what you want goes against what git model's is	22:26
frogonwheels	jeddhaberstro: but as a rule the first parent is the one from the branch.	22:26
jeddhaberstro	ah, that might be useful	22:26
cmn	you just said it wasn't	22:27
frogonwheels	jeddhaberstro: hence cmn mentioning --first-parent	22:27
jeddhaberstro	sorry, i misunderstood what cmn what telling me then.	22:27
	← krnl left	22:27
jeddhaberstro	hmmm	22:28
cmn	but the point is that what you're looking for needs to be scripted and needs a coherent history	22:28
jeddhaberstro	I feel like I must be missing something very obvious. Every git gui tool is able to essentially make the same except graphs very uniformly	22:28
cmn	so?	22:28
iheffner	jeddhaberstro: what do you mean by "visualize git --graph" ? is "git --graph" not visual enough or visualized incorrectly for your needs?	22:29
cmn	that's not what you're looking for	22:29
jeddhaberstro	Suggesting there is some common procedure they're all following	22:29
	→ carpii joined	22:29
cmn	that procedure is what you said you didn't want	22:29
jeddhaberstro	I want to generate my own graph	22:29
	← HyperNerdV2 left	22:29
jeddhaberstro	so I can manipulate is visually	22:29
cmn	then grab the information from git log or rev-list	22:29
	and create your own graph	22:29
jeddhaberstro	that's what I'm stuck on, the graph rendering algorithm	22:29
cmn	that's really not a problem we can solve	22:30
	automage → zendeavor	22:30
	→ isao joined	22:30
jeddhaberstro	i'm not asking for a solution :P	22:30
cmn	and this is also not what you came here asking for	22:30
jeddhaberstro	I came here to see if anyone knew of a specific git command that would help me in solving my graph rendering problem	22:31
	→ dduncan joined	22:31
cmn	then you should have asked for that	22:31
	← dduncan left	22:31
jeddhaberstro	i did	22:31
	hence my original question	22:31
	→ Karmaon joined	22:31
cmn	no, you asked for a way to limit the output to commits made on a branch, but not on branches that were merged with it	22:32
	and you do want those commits	22:32
	← pppaul left	22:32
jeddhaberstro	kind of, I don't think you understand what my idea is	22:32
	or i don't understand you heh	22:33
	→ pppaul joined	22:33
jeddhaberstro	one sec	22:33
	let me get a picture	22:33
	to explain what i mean	22:33
	→ codeM0nK3Y joined	22:33
	← luke3321 left	22:34
isao	I want to keep a warm backup of a github repo; I did `git clone —mirror` and cron for `git remote update`	22:34
	Can I push to the mirror?	22:34
	I assume yes	22:35
cmn	you can, but it'll probably get overwritten on the next fetch	22:35
isao	oh, that's what I was afraid of	22:36
	← intransit left	22:38
	← martinjlowm left	22:39
	← beatak left	22:39
	← airborn left	22:39
	→ martinjlowm joined	22:39
isao	cmn: so.. if github goes down, would this work? I change the [remote "origin] mirror config from true to false, allow puhes to the mirror..	22:40
jeddhaberstro	cmn: This is what I'm trying to do: http://i45.tinypic.com/4u836e.png	22:40
isao	..then when github comes back push the changes to github and re-enble the mirror = true?	22:41
jeddhaberstro	i want to retrieve the commits in each box separately	22:41
	← iamjarvo left	22:41
jeddhaberstro	and each box represents a branch (or what was once a branch)	22:41
	← joshteam left	22:41
cmn	isao: unless your script respects that variable, there's no guarantee that it wouldn't overwrite your changes	22:42
	jeddhaberstro: right, so you want to build a graph; removing information isn't going to help you	22:43
	← bob2_ left	22:43
	→ bob2_ joined	22:43
	← dr_lepper left	22:43
isao	cmn: thx. if mirror = false, what does `git remote update` do.. the same thing?	22:43
jeddhaberstro	i'm not removing data, I'm deconstructing it..	22:43
	bob2_ → bob2	22:44
cmn	jeddhaberstro: you were asking how to get less data, that's what I'm talking about	22:44
jeddhaberstro	yes	22:44
	and it is not possible with git log to get that exact data?	22:44
cmn	what you want is to grab all of the graph and then deal with that	22:44
jeddhaberstro	that's what i was trying to avoid :)	22:44
	lol	22:45
cmn	as we've said several times, --first-parent might get it	22:45
jeddhaberstro	all right, thanks	22:45
cmn	but there's no guarantee	22:45
	← pppaul left	22:45
jeddhaberstro	i'll give it a go, see what happens	22:45
carpii	if i have a conflict on a commit, how can i dump out both versions of the affected file, instead of getting << inline == diffs	22:45
cmn	isao: fetch uses the fetch refspec to decide what to write	22:45
	→ pppaul joined	22:46
	→ SkAzZ joined	22:47
cmn	isao: see man git remote remote.<name>.mirror	22:47
gitinfo	isao: the git-remote manpage is available at http://jk.gs/git-remote.html	22:47
cmn	though I don't see how that could ever work other than locally	22:47
	← yosinof left	22:48
	→ Destos joined	22:48
	← linusoleander left	22:48
	→ SkAzZ1 joined	22:48
	← Sahua left	22:48
isao	yes, the "failover" would be disable `remote update` and eventual resyncing upstream would be manual/local	22:49
	it's a blue moon thing, i hope	22:49
	← shruggar left	22:49
	→ shruggar1 joined	22:49
isao	ah well. thanks cmn	22:51
	← SkAzZ left	22:52
	→ cagedwisdom joined	22:52
	→ cagedwisdom_ joined	22:52
	← carpii left	22:54
	→ bitkiller joined	22:55
	→ teotwaki_ joined	22:55
	→ RobertLaptop joined	22:56
	→ MyTallest joined	22:56
	← shruggar1 left	22:56
	← pppaul left	22:57
MyTallest	Is it possible to get the list of files that will be involved in a merge?	22:57
	→ pppaul joined	22:57
aried3r	<FauxFaux> If delete lets you delete them without capital -D, then it's safe to delete them as they don't actually have any infomration in them. <-- Sorry for the late reply, but, what exactly does that mean? -D says "delete a branch", -d says "delete a fully merged branch".	22:57
	So what exactly does "If delete lets you delete them without capital -D" mean?	22:58
rudi_s	aried3r: -d only works if you have integrated the commits in a branch, thus if -d works you can't lose any information.	22:59
	-D forces the delete, which might include losing history.	22:59
aried3r	I see, I didn't see that in the short description,	22:59
	Is there a way to only list fully merged branches?	23:00
	← b1rkh0ff left	23:00
FauxFaux	I can think of a couple of crazy ways, with merge-base.	23:01
aried3r	--no-merged -- do not list branches which are fully contained by HEAD	23:01
	:D	23:01
FauxFaux	Even better!	23:01
aried3r	Indeed! Horray!	23:01
	Who would have guessed I'd actually need that once, hah	23:02
	← sallyz left	23:03
	← sallyx left	23:03
	← teweWORK left	23:03
	→ joshteam joined	23:03
	← SegFaultAX\|work left	23:03
	← thiago left	23:03
	← tewecske left	23:04
	← jesse left	23:04
	← robotmay left	23:07
	→ novas0x2a\|laptop joined	23:07
	← xref left	23:07
	← yoklov left	23:07
novas0x2a\|laptop	hm. is it documented anywhere that git clean -f -d -x will not remove untracked directories that happen to be git working copies? (you need -f -f to remove those)	23:07
	← solussd_ left	23:08
	→ solussd_ joined	23:08
	→ Lord_DeathMatch joined	23:09
	← kenperkins left	23:09
	→ kenperkins joined	23:09
novas0x2a\|laptop	oh. it's in the git clean manpage under -d	23:10
	← CannedCorn left	23:10
	← ConstantineXVI left	23:11
	← gusnan left	23:12
	← pppaul left	23:13
	← solussd_ left	23:13
	→ pppaul joined	23:13
	← tr-808 left	23:14
	← isao left	23:15
	→ cannonball joined	23:15
	← cleardance left	23:15
	← cagedwisdom_ left	23:16
	← ColKurtz left	23:17
	→ davidbanham joined	23:18
	← edude03 left	23:20
	← Chillance left	23:20
	→ edude03 joined	23:21
	→ ColKurtz joined	23:21
cmn	MyTallest: git diff --name-only otherbranch	23:21
	← lonewulftp left	23:23
	← ajpiano left	23:25
	← dcorbin left	23:26
	→ TTSDA joined	23:26
RandalSchwartz	sitaram - thanks	23:26
	← bitkiller left	23:27
	→ ajpiano joined	23:27
	→ bitkiller joined	23:28
	→ Targen joined	23:29
	← Lord_DeathMatch left	23:29
	→ bulletmark joined	23:30
	← fisted left	23:30
	← TTSDA left	23:33
	← davidbanham left	23:34
	→ davidbanham joined	23:35
	← alexukf left	23:35
	→ jlk joined	23:35
	← pppaul left	23:35
jlk	Hi, I'm trying to debug an update hook I've written in python. In order to properly play around, I'd like to get to the python debugger (pdb) at a certain point in the middle of a push	23:35
	→ duckxx joined	23:36
	← martinjlowm left	23:36
jlk	however, when I put the pdb.set_trace() call in the hook and try to push, remote rejects the push and I can't get into the debugger	23:36
	→ cooloney joined	23:36
jlk	anybody ever figure out somehow to do this?	23:36
	← tr-808_ left	23:36
EugeneKay	jlk - hooks can take the same arguments on stdin from you as from git....	23:36
	← ColKurtz left	23:36
jlk	EugeneKay: yes, but the environment of the repository will be different	23:36
	→ pppaul joined	23:37
	→ tr-808 joined	23:37
	→ TTSDA joined	23:37
jlk	in this case, I wrote the hooks testing it that way, and it works, because certain things like the tag had been fully written out	23:37
	← martinjl` left	23:37
jlk	but in the middle of a push, only some data about the tag is accessible, and I need to figure out what all is accessible in this particular environment	23:37
	→ lonewulftp joined	23:38
RandalSchwartz	just write something that logs the data	23:38
	→ ColKurtz joined	23:38
RandalSchwartz	like before there were debuggers :)	23:38
	"print" is your frioend	23:38
milki	lol	23:38
jlk	ugh	23:38
milki	print is a perfectly valid debugger	23:38
RandalSchwartz	most of my debugging is done with print	23:38
	→ NullMoogleCable joined	23:38
EugeneKay	echo 4 lyfe	23:38
jlk	that's like the dark ages	23:38
RandalSchwartz	hey - we lived that era young man. )	23:38
NullMoogleCable	hi	23:38
gitinfo	NullMoogleCable: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	23:38
milki	LOL	23:39
	← giallu left	23:39
milki	sita has been around since before the dark ages	23:39
EugeneKay	Yes, and the dark ages don't take a 5MB stack trace, four binary interpreters, and six hours to list the environment variables avaialb.e	23:39
	They just kinda do it.	23:39
RandalSchwartz	when 1 megahertz was fast	23:39
jlk	RandalSchwartz: and there were reasons that things have moved on :)	23:39
	s/were/are/	23:39
	→ abetaha_ joined	23:39
cmn	not many of them were good ones	23:39
RandalSchwartz	things moved on because microsoft wrote bloatware	23:39
EugeneKay	You'd be surprised how muc of a modern *nix system is still written in sh	23:40
cmn	printf is still a programmer's best friend	23:40
RandalSchwartz	thank goodness I can run non-ms software on these intel and AMD chips	23:40
jlk	ok, bickering and gray bearding aside...	23:40
	→ krispyjala joined	23:40
	← novas0x2a\|laptop left	23:40
	jlk wonders how Microsoft got pulled into this	23:40
EugeneKay	That's our best advice. If you're not happy with it there is plenty more available on the internet.	23:40
RandalSchwartz	ms bloatware drove hardware to get faster :)	23:40
krispyjala	anybody experienced this where when you do git pull it gets "stuck" at the merge but then when you ctrl+c and do it again it seems to have already merged?	23:41
jlk	EugeneKay: I'm fully aware of how much is written in sh, my other task today is fixing Linux bringup on s390, by fixing all the shell code.	23:41
	so there's my gray beard submission.	23:41
wereHamster	krispyjala: a broken hook manybe?	23:41
NullMoogleCable	so im looking to setup a private server to run like github	23:41
krispyjala	wereHamster: how would I start to investigate that?	23:41
RandalSchwartz	you kids and your linuxes. back in the old days, we had only BSD... and we liked it.	23:42
EugeneKay	NullMoogleCable - !gitolite	23:42
gitinfo	NullMoogleCable: Want to host as many git repos (and users!) as you like, on your own server, with fine-grained access control? You want gitolite: https://github.com/sitaramc/gitolite - Documentation: http://sitaramc.github.com/gitolite/master-toc.html	23:42
	← pppaul left	23:42
	← abetaha left	23:42
	→ abetaha__ joined	23:42
RandalSchwartz	yes - gitolite is amazingly easy to set up, and far more powerful than a simple git service	23:42
	per-branch acls, etc	23:42
	→ pppaul joined	23:42
RandalSchwartz	we're deploying that at $client	23:42
	→ rchavik joined	23:43
	← rchavik left	23:43
	→ rchavik joined	23:43
NullMoogleCable	i was trying to get gitlab installed but i ran into tons of issues and gave up	23:43
jlk	I used gitolite as the backend for the Fedora package source control setup. High regards.	23:43
wereHamster	krispyjala: see what's blocking the merge command form finishing	23:43
jlk	(same for internal Red Hat)	23:43
	RandalSchwartz googles gitlab	23:43
	← duckxx left	23:43
EugeneKay	It's a github alike with gitolite underneath	23:43
RandalSchwartz	ahh	23:44
jlk	and a giant pile of ruby	23:44
RandalSchwartz	yeah, pages slowly coming up	23:44
EugeneKay	Yeah, ruby.	23:44
RandalSchwartz	isn't everything just a giant pile of ruby these days?	23:44
jlk	sadly	23:44
EugeneKay	It's web scale	23:44
RandalSchwartz	whatever happened to just doing everything in Perl like Larry Wall intended?	23:44
EugeneKay	PHP didn't get accepted into CPAN	23:44
RandalSchwartz	PHP 1.0 was written in Perl :)	23:44
EugeneKay	That's the joke	23:44
RandalSchwartz	No... it's true	23:45
EugeneKay	Yes, that's the joke.	23:45
RandalSchwartz	aha	23:45
	→ Per4u3e joined	23:45
milki	lol	23:45
krispyjala	wereHamster: how exactly? All I am seeing is in top it's just saying "git-merge Merge branch 'master' of tpmongodb01:engine140 HEAD 8f5f4e7c93e7c17803859a7b336cd047db8781b2"	23:45
	and cpu is at 100%	23:45
	← abetaha_ left	23:46
	← nrichards left	23:46
	← bulletmark left	23:46
cmn	you attach a debugger to it, stop execution and look at the backtrace	23:47
	← titom left	23:47
wereHamster	or you use `perf` to profile the command	23:48
	← ToBeFree left	23:48
	→ fisted joined	23:48
cmn	does perf work even if you kill the process?	23:48
	→ walkerneo joined	23:49
wereHamster	I'd expect it to...	23:49
krispyjala	thx guys i'll try	23:49
	← Sky[x] left	23:51
	← acl_ left	23:51
	← mrwalker left	23:51
	← tatsuya_o left	23:51
	← bitkiller left	23:53
	→ bitkiller joined	23:53
	← pppaul left	23:55
walkerneo	I have two repos on my server. One is the live site, the other is the testing site. If while I'm testing stuff, changes are made to the live site, and then I pull the changes from the test site, what happens?	23:55
	→ pppaul joined	23:56
EugeneKay	A merge.	23:56
	← tvw left	23:56
	← ipalaus left	23:57
wereHamster	hold on there... you edit the live site without testing it first?	23:57
	the sequence should be: code, test, deploy	23:57
	→ ConstantineXVI joined	23:58
	← oppaus left	23:58
	← ConstantineXVI left	23:58
	→ benjo2 joined	23:58
	→ ConstantineXVI joined	23:59
walkerneo	What I meant by changes	23:59
	is like a file upload	23:59
	by the users or a forum post or something	23:59
	So things will sort themselves out right? It's not going to get rid of the files?	23:59

Logs Search ←Prev date Next date→

Channels Documentation