IRCloggy #git 2012-10-02

Provider of IRC logs since 2005.

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

	2012-10-02
	→ wasanzy joined	00:00
	← derpops left	00:01
	rohan32\|afk → rohan32	00:01
	→ jperry2_ joined	00:01
	← Layke left	00:02
yaymukund	weird. maybe there's some override for git/info/exclude	00:03
	→ nwest joined	00:04
	← hyperair left	00:05
	→ Bombe joined	00:05
	← Croms left	00:06
	→ menardIX_ joined	00:07
	→ hyperair joined	00:07
	← SegFaultAX\|work left	00:07
	← simesy_work left	00:10
	→ Sonderblade joined	00:11
	← wasanzy left	00:11
	→ simesy_work joined	00:11
	← awelch0100 left	00:12
	→ dreiss joined	00:14
	→ juvenal joined	00:14
	← storrgie left	00:14
	→ SegFaultAX\|work joined	00:15
	→ rchavik joined	00:16
	→ storrgie joined	00:16
	→ eletuchy joined	00:16
	→ flaguy48 joined	00:16
	← macrover left	00:16
	→ gavin_huang joined	00:17
	← brentratliff left	00:20
	→ wasanzy joined	00:20
	← jperry2_ left	00:20
	→ Croms joined	00:21
	→ anabelle joined	00:21
	← ehsan left	00:22
	→ brentratliff joined	00:22
	← Guest98783 left	00:24
	← storrgie left	00:24
	← wasanzy left	00:25
frogonwheels	yaymukund: you want /script/local/ and /script/local/*	00:26
	yaymukund: in .git/info/exclude	00:26
	→ chrisgeorge joined	00:27
	→ fletch_ joined	00:27
	→ derpops joined	00:27
frogonwheels	ag4ve: um.. git objects, are.. well, git objects.	00:27
	→ tmcmahon joined	00:28
	← simesy_work left	00:28
yaymukund	frogonwheels: thanks, but that didn't seem to work	00:28
	→ simesy_work joined	00:28
frogonwheels	ag4ve: http://git.rsbx.net/Documents/Git_Data_Formats.txt ??	00:28
ag4ve	frogonwheels: i mean, hg and darcs objects are compressed diffs...	00:28
yaymukund	frogonwheels: https://gist.github.com/c7e48101aceee76cbb4a	00:29
	→ jdunck joined	00:29
	→ codeFiend joined	00:29
	→ layke__ joined	00:30
ag4ve	frogonwheels: thanks i think. i'm going to have to spend some time on this :)	00:30
frogonwheels	yaymukund: ok, I put a leading / in.	00:31
	← kerrick left	00:31
	← Turicas left	00:31
	← layke_ left	00:31
	← zenx left	00:32
yaymukund	frogonwheels: hmm? so like /script/local/? that doesn't work either, and nor does script/local	00:32
frogonwheels	yaymukund: what is the root of this project?	00:32
	← the_cybersphinx left	00:32
yaymukund	~/src/jtv/web	00:33
	← wbednarski left	00:33
	→ dvide joined	00:33
	→ alunduil joined	00:33
	→ wasanzy joined	00:34
frogonwheels	yaymukund: so git rev-parse --git-dir gives you that?	00:35
yaymukund	that says `.git`	00:35
	I have excludesfile = ~/.gitignore in my gitconfig. maybe that is overriding it? let me try removing	00:35
	(nope)	00:36
frogonwheels	yaymukund: that shouldn't have an affect	00:36
	yaymukund: well I tried it in a test repo and it works. :\|	00:36
yaymukund	hmm, okay, I'll try it in another repo	00:37
	← cakehero left	00:37
	→ cbreak\|evil joined	00:39
yaymukund	frogonwheels: yeah	00:39
	← wasanzy left	00:39
	→ asteve joined	00:39
yaymukund	frogonwheels: thanks, you're right. something's screwed up with the repo	00:39
	hm	00:39
	← anabelle left	00:39
yaymukund	it works on another repo of mine	00:39
	sorry fo rthe trouble. I should've tried that earlier	00:39
	at least the world makes sense again	00:39
	← cbreak left	00:41
	cbreak\|evil → cbreak	00:41
	← hyperair left	00:41
	SirCmpwn_ → SirCmpwn	00:42
	← fairuz_ left	00:42
	← Targen left	00:43
	→ wasanzy joined	00:44
	← guampa left	00:47
	→ vitor-br joined	00:48
	→ msmithng joined	00:48
	← opus left	00:49
	→ chrisdev joined	00:49
	← mabrand left	00:50
	→ guampa joined	00:51
	→ wuiqed joined	00:52
	← simesy_work left	00:53
	→ simesy_work joined	00:54
	← etcetera left	00:54
	← wasanzy left	00:57
	← layke__ left	00:57
	→ layke__ joined	00:57
	→ njbair joined	00:59
	← simesy_work left	00:59
	→ simesy_work joined	00:59
	← chrisgeorge left	01:00
njbair	My git repo has someone else's repo in a subdirectory, and `git status` shows it as untracked content. I want it to be updated with everything else.	01:00
	→ apok joined	01:01
	→ gtrak joined	01:02
	← bddn left	01:02
	← Error404NotFound left	01:03
	→ aristidesfl joined	01:03
	← codeFiend left	01:03
	→ macmartine joined	01:04
	→ wasanzy joined	01:04
	fuller → fuller_afk	01:08
	← simesy_work left	01:08
	→ simesy_work joined	01:08
	→ etcetera joined	01:10
	→ cirenyc joined	01:10
frogonwheels	njbair: !subproject	01:11
gitinfo	njbair: [!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.	01:11
	← Mocramis left	01:12
	→ Mocramis joined	01:13
	→ skyf joined	01:13
	← metcalfc left	01:13
	→ hyperair joined	01:13
	← juvenal left	01:14
	→ codeFiend joined	01:14
	← spaceonline left	01:15
	← FernandoBasso left	01:15
	→ thiago joined	01:16
	← hendry left	01:17
	← aantix left	01:18
	→ intripoon joined	01:18
	→ hendry joined	01:18
	→ iori joined	01:18
	← hyperair left	01:19
	→ ncr100_ joined	01:19
	← Lgb left	01:20
	← intripoon_ left	01:20
	← hwrd\|work left	01:21
	→ freeknot joined	01:21
	← derpops left	01:21
	← simesy_work left	01:21
	← wuiqed left	01:21
	→ simesy_work joined	01:21
	→ Lgb joined	01:21
	← wasanzy left	01:21
	← ncr100 left	01:22
freeknot	hi, I accidentally deleted my "—-bare inited" remote repo but i have my local repos, how to get the remote repo back?	01:22
	← SegFaultAX\|work left	01:22
	← BiggFREE left	01:23
	→ hyperair joined	01:23
	→ kerrick joined	01:23
	← ncr100_ left	01:24
bremner	recreate and push	01:24
	← thillux_ left	01:25
	→ CannedCorn joined	01:25
	← etcetera left	01:25
	→ _huoxito joined	01:26
freeknot	thanks, so easy =)	01:27
	← madsy left	01:28
	→ Vampire0 joined	01:29
	→ eletuchy_ joined	01:29
	← eletuchy left	01:29
	← Vampire0_ left	01:31
	→ opus joined	01:31
	← simesy_work left	01:32
	→ simesy_work joined	01:32
	← madewokherd left	01:33
	← jdunck left	01:34
	→ ahferroin7 joined	01:34
	→ wasanzy joined	01:35
	→ Targen joined	01:36
	← freeknot left	01:36
	← ahferroin7 left	01:36
	→ fkurk joined	01:36
	← fkurk left	01:36
	→ fkurk joined	01:37
	← fkurk left	01:37
	← gregm_ left	01:37
	← chrisdev left	01:38
	→ akiress joined	01:39
	← goshawk left	01:40
	→ SegFaultAX\|work joined	01:40
	← quazimodo left	01:42
	← rohan32 left	01:43
	→ rohan32 joined	01:43
	← jonshea left	01:43
	→ gregm_ joined	01:44
	trout → const	01:44
	→ shtr0m joined	01:44
	→ metcalfc joined	01:44
	→ jschall joined	01:45
	← simesy_work left	01:45
	→ simesy_work joined	01:45
	→ harish joined	01:46
	← devth left	01:49
	→ madewokherd joined	01:49
	→ zeen joined	01:49
	→ wbednarski joined	01:50
	← Lulzon left	01:50
	→ Dreadnaught joined	01:51
	← Dreadnaught left	01:51
	→ Dreadnaught joined	01:51
	← Kulrak left	01:52
	← dreiss left	01:53
	← wasanzy left	01:53
	← simesy_work left	01:55
	→ simesy_work joined	01:55
	← dsantiago left	01:55
	→ etcetera joined	01:56
	← etcetera left	01:57
	→ cilly joined	01:59
	→ foundationkid joined	01:59
	→ wasanzy joined	02:01
	← mgorbach left	02:01
	→ mgorbach joined	02:02
	→ dsantiago joined	02:04
	→ fkurk joined	02:06
	← fkurk left	02:06
	← donri left	02:08
	← daniel_- left	02:09
superjoe	why is git clone --recursive not the default?	02:09
	← opus left	02:10
	← codeFiend left	02:11
	← shtr0m left	02:12
	→ kvanderw joined	02:13
	← wasanzy left	02:14
	← Eridius left	02:14
hyperair	ooh there's a clone --recursive?	02:14
	→ shtr0m joined	02:14
	← kvanderw left	02:14
	→ dragon3_ joined	02:14
	← menardIX_ left	02:15
superjoe	hyperair, yeah, it sets up the submodules for you	02:15
hyperair	yeah i just saw the manpage	02:15
superjoe	why would you ever not want the submodules set up?	02:15
hyperair	nice	02:15
	→ codeFiend joined	02:15
imMute	superjoe: if you didn't plan on using them?	02:15
superjoe	now I have to add a line to the readme for every project that uses git submodules telling them to remember to do --recursive	02:16
bremner	It's god's way of telling you not to use submodules so much.	02:16
	← danielfilho left	02:17
superjoe	bremner, hmm, after reading that gitinfo post just above, maybe "just do it" is the solution for me.	02:17
	rohan32 → rohan32\|busy	02:17
	← macmartine left	02:17
superjoe	nah. then I have to put a line in the readme telling developers to cd into the folder and do git clone again	02:18
	that's not nice.	02:18
	→ jonshea joined	02:19
	→ cakehero joined	02:19
	→ fkurk joined	02:20
	← SegFaultAX\|work left	02:20
	→ devth joined	02:20
	← sjohnson left	02:20
	→ BiggFREE joined	02:21
	← devth left	02:21
	← funnyfingers left	02:22
	→ Eridius joined	02:25
	← gtrak left	02:26
	← simesy_work left	02:26
	← Mocramis left	02:26
	→ Mocramis joined	02:27
	→ simesy_work joined	02:27
	← fkurk left	02:27
	→ Eridius_ joined	02:30
	← OOPMan left	02:31
	← cakehero left	02:31
	← harish left	02:31
	→ OOPMan joined	02:32
	→ harish joined	02:32
	← simesy_work left	02:32
	→ simesy_work joined	02:32
	← jargon- left	02:33
	→ jargon- joined	02:33
	→ Vinnie_mac joined	02:35
	→ derpops joined	02:35
	← Eridius_ left	02:36
	← kukks left	02:36
	← apok left	02:37
	→ etcetera joined	02:37
	→ wasanzy joined	02:39
	← jargon- left	02:39
	← codeFiend left	02:40
	← artnez left	02:41
	← johnny_rose left	02:41
	← wbednarski left	02:42
	→ Eridius_ joined	02:42
	← mmc1 left	02:44
	← asteve left	02:44
	← orafu left	02:46
	→ yoklov joined	02:48
	→ orafu joined	02:49
EugeneKay	This is why I need to work on git-library more	02:50
	← wasanzy left	02:50
	← yaymukund left	02:52
	← chaiz left	02:52
	→ johnny_rose joined	02:52
	→ wasanzy joined	02:53
	→ chaiz joined	02:54
	→ gtrak joined	02:55
	← cirenyc left	02:57
	rohan32\|busy → rohan32	02:58
	→ cirenyc joined	02:58
	→ macrover joined	02:59
	← tmcmahon left	03:01
	→ Beoran__ joined	03:01
	rohan32 → rohan32\|sleep	03:02
	→ blake0200 joined	03:04
	← Beoran_ left	03:05
	← blake0200 left	03:05
	← derpops left	03:05
	← eletuchy_ left	03:06
	← rohan32\|sleep left	03:06
Vinnie_win	is git-subtree part of the official Git distribution yet?	03:08
	→ ReekenX joined	03:11
	← gerard0 left	03:13
	→ Anubisss_ joined	03:13
	← metcalfc left	03:14
	→ blake0200 joined	03:15
	← blake0200 left	03:15
	← Eridius left	03:15
	→ johnny_rose1 joined	03:16
	→ gerard0 joined	03:16
	← tgummerer left	03:16
	← Anubisss left	03:17
	→ tgummerer joined	03:17
	← johnny_rose left	03:18
	← simesy_work left	03:18
	← wasanzy left	03:18
	→ artnez joined	03:18
	→ simesy_work joined	03:18
	← BiggFREE left	03:20
	← tgummerer left	03:21
	→ tgummerer joined	03:21
	← simesy_work left	03:22
	← OOPMan left	03:22
	→ simesy_work joined	03:22
	← vitor-br left	03:22
	← bitkiller left	03:23
	→ vitor-br joined	03:24
	← griotspeak left	03:25
	← cirenyc left	03:26
	→ munichlinux joined	03:26
	← gry left	03:27
	→ derpops joined	03:27
	← friskd left	03:28
	→ gry joined	03:28
	← vitor-br left	03:28
	→ wasanzy joined	03:29
	→ danielfilho joined	03:29
	← Bert left	03:30
	← nwest left	03:31
	→ irqq joined	03:32
	→ Anubisss__ joined	03:33
	← tfnico_ left	03:33
	→ tfnico_ joined	03:33
	← Vinnie_mac left	03:33
	← Anubisss__ left	03:34
	→ Bert joined	03:34
	→ vitor-br joined	03:34
	→ Anubisss__ joined	03:35
	← gerard0 left	03:35
	→ toobluesc joined	03:35
	← Anubisss_ left	03:35
	← wasanzy left	03:36
	← simesy_work left	03:39
	← etcetera left	03:39
	→ simesy_work joined	03:39
shtr0m	I just switched to git for the first time. I can do a "git init" but it gives me warnings saying that it can't read the config file which is located on another linux account	03:39
	→ Anubisss_ joined	03:39
shtr0m	When I log in as the other user the /path/to/config/ doesn't exist	03:40
	← chaiz left	03:40
	→ cakehero joined	03:41
	← simesy_work left	03:42
	→ simesy_work joined	03:42
	← Anubisss__ left	03:42
	→ macmartine joined	03:43
	→ bubbles10101 joined	03:43
	→ yaymukund joined	03:44
	→ codeFiend joined	03:45
	→ wasanzy joined	03:46
	← macmartine left	03:46
	→ jdunck joined	03:47
EugeneKay	Something is wrong with your environmen	03:48
	Probably the $HOME variable	03:48
	← johnny_rose1 left	03:48
	← Bruno_ left	03:50
	← thiago left	03:51
	→ chaiz joined	03:51
	→ gerard0 joined	03:52
	offby1 's $HOME environment is emitting radon gas	03:53
	← chaiz left	03:53
	← irqq left	03:53
	→ maxandersen1 joined	03:54
	← NfNitLoop left	03:55
	→ NfNitLoop joined	03:55
	→ JohnBat26 joined	03:56
	→ macmartine joined	03:56
	← maxandersen left	03:57
	Eridius_ → Eridius	03:58
	← e66 left	03:58
	→ thepaperclip joined	04:01
	→ thiago joined	04:02
	← CannedCorn left	04:02
	← thepaperclip left	04:02
	← duckxx left	04:03
	← munichlinux left	04:05
	← cakehero left	04:06
	→ caseymcg joined	04:07
	→ Error404NotFound joined	04:07
	→ cakehero joined	04:09
	← cilly left	04:11
	← todd_dsm left	04:12
	→ cilly joined	04:13
	→ hwrd\|work joined	04:16
	→ liquid-silence joined	04:16
	← liquid-silence left	04:16
	→ liquid-silence joined	04:16
	← foundationkid left	04:17
	→ fireh joined	04:18
	← bubbles10101 left	04:18
	← jonshea left	04:19
	→ etcetera joined	04:21
	→ Tuomas joined	04:21
	→ fisted_ joined	04:21
	← adamben left	04:22
	← fisted left	04:24
	→ todd_dsm joined	04:26
	← d3vic3 left	04:28
	← aristidesfl left	04:28
	← gtrak left	04:29
	→ d3vic3 joined	04:29
	→ noyb joined	04:30
	← Natureshadow left	04:31
	← gavin_huang left	04:31
	→ Natureshadow joined	04:33
	→ longbeach joined	04:33
	→ bubbles10101 joined	04:34
	→ shruggar joined	04:42
	← msmithng left	04:42
	→ derrekito joined	04:43
	← fletch_ left	04:45
	→ svetlyak40wt joined	04:45
	→ rubious joined	04:46
	← etcetera left	04:47
	← brentratliff left	04:48
	→ etcetera joined	04:48
	→ metcalfc joined	04:48
	→ hoschi joined	04:48
	← superjoe left	04:48
	← gregm_ left	04:49
	← etcetera left	04:49
	→ etcetera joined	04:50
	→ leeN joined	04:50
	← macrover left	04:51
	← jdunck left	04:52
	→ Steve_Ray joined	04:58
	← Fretta left	05:04
	← macmartine left	05:07
	→ beautifulmind joined	05:07
	← jokajak left	05:09
	→ munichlinux joined	05:09
	→ olaf_ joined	05:10
	→ aantix joined	05:14
	← todd_dsm left	05:14
	→ jdunck joined	05:15
	← olaf_ left	05:15
	→ j416 joined	05:16
	→ steveoliver joined	05:16
	← shruggar left	05:16
	← yoklov left	05:17
	→ todd_dsm joined	05:17
	→ patrick85 joined	05:18
	← derrekito left	05:18
	← tomaw left	05:20
	← aantix left	05:21
	← Steve_Ray left	05:22
	← khmarbaise_ left	05:23
	→ BiggFREE joined	05:23
	→ ehsan joined	05:23
	← j416 left	05:24
	→ jokajak joined	05:24
	→ aspotashev joined	05:27
	→ quazimodo joined	05:28
	→ shruggar joined	05:28
	← svetlyak40wt left	05:29
	← guampa left	05:31
	← yaymukund left	05:31
	← Chillance left	05:31
	→ pantsman joined	05:31
	← pantsman left	05:31
	→ pantsman joined	05:31
	→ thirdknife joined	05:31
	→ johnny_rose joined	05:32
	← johnny_rose left	05:32
	← ehsan left	05:32
	→ johnny_rose joined	05:32
	← johnny_rose left	05:36
	→ dc5ala joined	05:37
	→ Moebius__ joined	05:37
	← shruggar left	05:38
	← Moebius__ left	05:38
	← cakehero left	05:38
	→ skul joined	05:39
	→ ehsan joined	05:39
	← AlbireoX left	05:40
	→ AlbireoX joined	05:41
	→ guampa joined	05:42
	← akiress left	05:45
	← AlbireoX left	05:45
	← worstadmin left	05:45
	← albel727 left	05:47
	→ drougge joined	05:50
	← haberdasher left	05:51
	← guampa left	05:52
	← derpops left	05:52
	← madewokherd left	05:53
	→ leokaito joined	05:55
	← jcao219 left	05:55
	← drougge left	05:55
	→ jaseemabid joined	05:55
	→ BadDesign joined	05:56
	← BadDesign left	05:56
	→ BadDesign joined	05:56
	→ senny joined	05:58
	→ albel727 joined	05:58
	→ samuel02 joined	06:00
	→ skyf_ joined	06:01
	← metcalfc left	06:02
	← skyf left	06:02
	→ arturaz_ joined	06:03
	→ RaceCondition joined	06:04
	albel727 → GasaiYuno	06:06
	→ Steve_Ray joined	06:06
	← Steve_Ray left	06:06
	→ derpops joined	06:07
	→ MaximLacrima joined	06:07
	← iron_houzi left	06:07
	← wasanzy left	06:08
	← bloony left	06:08
	→ ThomasLocke joined	06:10
	← ehsan left	06:10
	→ ehsan_ joined	06:11
	← DarkClown left	06:12
	→ darkclown joined	06:12
	← simesy_work left	06:13
	→ simesy_work joined	06:14
	→ friskd joined	06:14
	→ dhruvasagar joined	06:15
	→ marthinal joined	06:15
	→ thirdknife_ joined	06:17
	→ jceb joined	06:17
	→ samphippen joined	06:18
	← thirdknife left	06:19
	→ koltroll joined	06:21
	→ xxc_michael joined	06:22
	GasaiYuno → albel727	06:23
	← dragon3_ left	06:23
	→ papegaaij joined	06:24
	→ e66 joined	06:25
	→ dwmw2_go` joined	06:28
	← arturaz_ left	06:28
	← lnostdal left	06:29
	← Zyrkon left	06:29
	← dwmw2_gone left	06:29
	← unreal left	06:29
	← BiggFREE left	06:30
	→ unreal joined	06:31
	← Goplat left	06:31
	← etcetera left	06:31
	← Chib left	06:32
	← noyb left	06:32
	← quazimodo left	06:34
	← harish left	06:34
	→ sebrock joined	06:35
	← codeFiend left	06:35
	→ Zyrkon joined	06:36
	→ Ecesis1 joined	06:36
	← Ecesis left	06:38
	← MrMeh left	06:38
	→ apok joined	06:39
	→ mmc1 joined	06:40
	← thorie left	06:41
	← aspotashev left	06:41
	← samphippen left	06:41
	← ReekenX left	06:43
	→ munichpython joined	06:44
	→ cbreak-work joined	06:44
	← dhruvasagar left	06:45
	← munichlinux left	06:45
	munichpython → munichlinux	06:45
	→ skorgon joined	06:47
	← skorgon left	06:47
	→ skorgon joined	06:47
	← mmc1 left	06:47
	→ thorie joined	06:48
	→ AdrienBrault joined	06:48
	→ mgue-mobile joined	06:50
	← jaseemabid left	06:51
	→ maleknet joined	06:52
	← friskd left	06:54
	← AdrienBrault left	06:55
	→ devsharpen joined	06:56
	← com4 left	06:57
	← thorie left	06:57
	→ papegaaij_ joined	06:57
	← papegaaij left	06:57
	→ thorie joined	06:58
	→ com4 joined	06:58
	← thirdknife_ left	07:00
	→ thirdknife__ joined	07:01
	→ afuentes joined	07:02
	→ psoo joined	07:02
	← dzan left	07:03
	← simesy_work left	07:03
	→ simesy_work joined	07:04
	→ osxorgate joined	07:04
	→ suy joined	07:06
	→ stodan joined	07:07
	→ dermatthias joined	07:07
	→ drougge joined	07:08
	→ lb joined	07:09
	← lb left	07:09
	→ lb joined	07:09
	← steveoliver left	07:11
	→ aisbaa joined	07:12
	→ irqq joined	07:12
	→ LeMike joined	07:14
	→ arex\ joined	07:14
xxc_michael	a quick question , i just committed to my local repo , i noticed that there are files that i didn't want to add to it.	07:14
	→ giallu joined	07:15
	→ flijten joined	07:15
xxc_michael	should i use git-reset HEAD^1 pathtofile	07:15
	in order to remove them from the commit	07:15
	gitinfo set mode: +v	07:15
arex\	If I'm in the release-candidate branch and want to merge in the feature/awesome branch as one single commit, how can I do that?	07:15
	→ resistivecorpse2 joined	07:16
_ikke_	merge --squash	07:17
	arex\: man git merge	07:18
gitinfo	arex\: the git-merge manpage is available at http://git-scm.com/docs/git-merge.html	07:18
	← resistivecorpse left	07:18
	resistivecorpse2 → resistivecorpse	07:18
	→ lindenle joined	07:19
	← Lgb left	07:20
arex\	_ikke_: thanks!	07:20
	→ quazimodo joined	07:21
	→ Lgb joined	07:21
	→ dsirijus joined	07:23
	→ shruggar joined	07:24
	→ lnostdal joined	07:24
	→ OOPMan joined	07:24
	→ AdrienBrault joined	07:26
	→ angelsl joined	07:26
	→ samphippen joined	07:26
	→ dzan joined	07:27
	← derpops left	07:27
	→ gusnan joined	07:28
arex\	When I'm integrating incomplete feature branches on the integration branch, CI triggers for each commit which means it usually triggers twice for each merge (because the merge produces two commits)	07:28
	What's the proper way of solving this?	07:28
	I was considering git merge --squash, but I'm not sure	07:29
	→ jargon- joined	07:29
_ikke_	arex\: can't your CI be setup to ignore merge commits?	07:31
arex\	_ikke_: didn't cross my mind, i'll look into that right away	07:32
	← samphippen left	07:32
arex\	_ikke_: doesn't look that way (teamcity)	07:32
	← witul left	07:34
arex\	_ikke_: the closest is ignoring commits where the commit message matches a certain regexp	07:34
	← simesy_work left	07:35
	→ fornext joined	07:36
	→ simesy_work joined	07:36
	→ derpops joined	07:36
	→ witul joined	07:36
	→ simenbrekken joined	07:36
simenbrekken	I keep running into this scenario where I'm working in a feature branch, switch to my master, pull changes and merge the new changes into my feature branch. However this litters my history with merge commits, any way to avoid this? I'm already using [branch] autosetuprebase = always	07:37
	→ samphippen joined	07:38
	→ blami_ joined	07:38
	← AdrienBrault left	07:39
EugeneKay	Stop being scared of merge commits. They won't bite. !unlearn your dependence upon linear history.	07:39
gitinfo	Users of centralized VCSes will need to unlearn a number of habits in order to learn git. Many commands, such as "checkout" and "revert" bear little in common to those holding the same name in other systems.	07:39
	→ AdrienBrault joined	07:39
EugeneKay	Yes, sometimes the line in log --graph uses a \ or a /. This happens. :-p	07:40
	→ Pipin joined	07:41
arex\	EugeneKay: It messes up my CI :P	07:41
	← Pipin left	07:41
EugeneKay	Tell your CI to be less lame.	07:41
	You could try cherry-pick	07:42
	See also !perfect	07:42
gitinfo	[!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.	07:42
	→ jkremser joined	07:42
	→ wasanzy joined	07:43
	→ TheHaven joined	07:44
	← beautifulmind left	07:44
	← derpops left	07:44
arex\	thanks EugeneKay	07:44
	← Error404NotFound left	07:45
	← OOPMan left	07:46
	← pantsman left	07:47
	→ lindenle_ joined	07:48
	← samphippen left	07:48
	← diegoviola left	07:49
lindenle_	/msg gitinfo .voice	07:50
esc	has anyone written an automatic tool to mirror ones own github repositories en-mass?	07:50
lindenle_	/msg gitinfo .voice	07:50
	gitinfo set mode: +v	07:50
lindenle_	Hi all, we have a repo made up of submodules. When we make a commit it is basically just a change in a reference to a specific submodule. I have a post recieve email hook (based on the example in the git book) that emails us this change. However I would like to dig into the submodule and actually send out the real change. Does anyone have an example of this? How can i get the diff from the submodule using the super project. Thanks.	07:50
	gitinfo set mode: +v	07:51
	← skyf_ left	07:51
	← FrenkyNet left	07:51
	gitinfo set mode: +v	07:51
	→ timj1 joined	07:52
	← mstsirkin left	07:52
	→ alexander__b joined	07:52
	← munichlinux left	07:52
	← niax left	07:52
alexander__b	hi. drupal uses tags for its releases. if I git clone and set up everything, let's say I'm on the tag for v7.3.7-r3. how do I revert to the version that's tagged v7.3.7-r2, if I only know the tag - not the commit?	07:53
	→ ReekenX joined	07:53
	← timj left	07:54
	→ gerryvdm_mbp joined	07:56
	← gerryvdm_mbp left	07:56
	→ gerryvdm_mbp joined	07:56
Sajbar	git checkout -b tag-name, would checkout the tag and create a new branch for it.	07:56
	← BadDesign left	07:58
	← LeMike left	07:58
	→ Error404NotFound joined	07:58
	← milligan left	07:58
	→ OOPMan joined	07:58
	← Error404NotFound left	07:59
	→ LeMike joined	07:59
	← mgorbach left	08:00
	→ mgorbach joined	08:00
	→ xiangfu joined	08:00
	→ Akufen joined	08:01
	← Akufen left	08:01
	→ Akufen joined	08:01
	→ Lord_DeathMatch joined	08:01
	← cilly left	08:01
	→ indel joined	08:03
	→ LimeBlast joined	08:03
	→ cilly joined	08:03
	← gerard0 left	08:04
	→ mikecmpbll joined	08:04
	← LeMike left	08:04
	→ gerard0 joined	08:06
	→ samphippen joined	08:06
	→ eijk joined	08:07
	→ niax joined	08:07
	← samuel02 left	08:08
arex\	When I do git merge --squash, it says "not updating HEAD"	08:11
	→ munichlinux joined	08:12
	← AdrienBrault left	08:12
	← Tommy[D] left	08:12
	← hpa left	08:13
	→ Tommy[D] joined	08:13
	→ rob_w_ joined	08:14
	← dermoth\|home left	08:15
	→ dangerousdave joined	08:15
	→ hpa joined	08:16
	→ gavin_huang joined	08:17
	← cilly left	08:18
	← rubious left	08:18
	→ dermoth\|home joined	08:19
	→ cilly joined	08:19
	→ Desproges joined	08:21
	← MaximLacrima left	08:22
	← artnez left	08:22
	→ mabrand joined	08:23
	← dsirijus left	08:23
	← hwrd\|work left	08:25
	← rob_w_ left	08:26
	→ tomaw_ joined	08:26
	← SiDz left	08:26
	→ SiDz joined	08:27
	← SiDz left	08:27
	→ SiDz joined	08:27
	→ Element9 joined	08:27
	→ hwrd\|work joined	08:28
	→ i42n joined	08:29
	← i42n left	08:29
	→ the_cybersphinx joined	08:29
	← apok left	08:32
	→ bddn joined	08:32
	← hwrd\|work left	08:32
	→ thillux joined	08:32
	→ nillian joined	08:33
	← Vile left	08:33
cmn	Sajbar: no	08:35
	→ alex179ohm joined	08:37
	← Desproges left	08:38
	← lindenle left	08:39
cmn	alexander__b: what do you mean by revert here?	08:40
	→ Desproges joined	08:40
cmn	do you want to get the files so you can put it somewhere, do development...?	08:40
alexander__b	cmn: I meant checking out to the files in that tag.	08:40
	← angelsl left	08:40
	← alex179ohm left	08:40
cmn	git checkout that-tag	08:41
	that will detach HEAD and put you at that commit	08:41
	→ thierryp joined	08:42
	→ achadwick joined	08:42
	← Slush- left	08:43
	← spyro left	08:45
	→ soee joined	08:45
	← hakunin left	08:45
	← shruggar left	08:45
	← notVert left	08:46
	→ hakunin joined	08:46
	← wasanzy left	08:47
	→ FrenkyNet joined	08:47
	→ marhaban joined	08:47
	← maleknet left	08:48
	← marhaban left	08:50
	← hakunin left	08:51
	→ BiggFREE joined	08:51
	← BiggFREE left	08:51
	← caseymcg left	08:53
	← j0ran left	08:53
	→ j0ran joined	08:54
	← Deck` left	08:56
	→ spyro joined	08:56
	← Desproges left	08:57
	→ Desproges joined	08:58
	→ Vile joined	08:59
	→ daniel_- joined	09:00
	← Bert left	09:01
	← babilen left	09:01
	← rchavik left	09:02
	← thiago left	09:02
	→ rchavik joined	09:03
	← cilly left	09:03
	→ cilly joined	09:05
	← adamm left	09:07
	→ Bert joined	09:07
	→ adamm joined	09:07
	tomaw_ → tomaw	09:08
	← jdunck left	09:08
	→ marhaban joined	09:08
	→ berserkr joined	09:08
	← j0ran left	09:08
	→ j0ran joined	09:09
arex\	For a single branch in the repository: git config branch.master.mergeoptions "--no-ff"	09:10
	For all branches in the repository (since Git 1.7.6): git config --add merge.ff false	09:10
	For all branches in all repositories (since Git 1.7.6): git config --global --add merge.ff false	09:10
	Seem right?	09:10
	→ AccessGranted joined	09:11
AccessGranted	git status -> # modified: projects/External/Zend (new commits)	09:11
	→ adam_ joined	09:11
_ikke_	AccessGranted: That's a submodule	09:12
AccessGranted	What should I do to get those commits - git submodule sync?	09:12
	→ Slush- joined	09:12
_ikke_	AccessGranted: No, that does something different	09:12
AccessGranted	Then how	09:12
_ikke_	git add projects/External/Zend; git commit\	09:13
	← aspiers left	09:13
	→ btree_ joined	09:14
	← dr_lepper left	09:14
	→ rath-work joined	09:15
	→ dr_lepper joined	09:16
	← dr_lepper left	09:16
	→ dr_lepper joined	09:16
	← btree__ left	09:18
	→ maleknet joined	09:18
	← tinti left	09:19
	→ drupin joined	09:20
drupin	how can i clone a specific folder from git repo	09:20
_ikke_	drupin: That's not something git supports	09:21
	→ notVert joined	09:21
drupin	ohhh	09:21
	the issue is the repo is big	09:21
	and i just want one part of it	09:21
	← cilly left	09:21
	← maleknet left	09:23
drupin	ok thankee _ikke_ u saved my time	09:23
_ikke_	oh, lol	09:23
	→ cilly joined	09:23
	→ soc42 joined	09:25
AccessGranted	Drupin, divide your source tree into submodules and clone whatever you want.	09:26
	← marhaban left	09:26
	→ arietis joined	09:26
	← Lord_DeathMatch left	09:26
	→ Lord_DeathMatch joined	09:27
	← soee left	09:27
	← sluther left	09:30
	← cilly left	09:30
	← antihero left	09:31
	→ wasanzy joined	09:31
	← Lord_DeathMatch left	09:31
	→ antihero joined	09:32
	→ cilly joined	09:32
	→ nelse_ joined	09:32
	→ Anders_J joined	09:33
	→ Lord_DeathMatch joined	09:33
	→ babilen joined	09:37
	← wasanzy left	09:37
	→ soee joined	09:40
	← cilly left	09:41
cmn	arex\: merge.ff isn't a multivar, don't use --add	09:42
	→ cilly joined	09:43
	→ madsy joined	09:44
	← madsy left	09:44
	→ madsy joined	09:44
	→ Slush-_ joined	09:46
	← letharion left	09:46
	← Slush-_ left	09:47
hendry	i want to do a `git fetch` without download the data in other branches. What should I be using to realise that?	09:48
_ikke_	hendry: git fetch <remote> <refspec>	09:48
	where refspec can be the branch that you want	09:48
	hendry: but: !fetchfour	09:48
gitinfo	hendry: Never use the four-word version of git-fetch or git-pull (e.g. git fetch remote refspec). It always ends in tears. Yes, if you understand the implications of FETCH_HEAD it can technically be done, but really it is easier to just fetch the whole remote (or perhaps edit the fetchspec if you never want other bits). If you must, see !fetch4why	09:48
	→ shruggar joined	09:49
_ikke_	hendry: It does something different then you expect	09:49
	→ Kriz1 joined	09:49
	← samphippen left	09:49
	← blami_ left	09:50
	SeoZ → SeoZ-work[AWAY]	09:50
hendry	!fetch4why	09:51
gitinfo	Firstly, the four-word version of git-fetch does not update the remote-tracking branches or tags. The default git fetch origin master fetches into FETCH_HEAD - ie the equivalent of git fetch origin master:FETCH_HEAD. If you use pull in this case, it will then do the equivalent of git merge FETCH_HEAD. Even updating the remote tracking branch with git fetch origin master:remotes/origin/master it still doesn't update tags	09:51
arex\	cmn: ok, thanks	09:51
_ikke_	hendry: I figure something like git fetch origin master:+remotes/origin/master for the master branch	09:51
	→ awelch0100 joined	09:51
	← KrizOne left	09:52
hendry	_ikke_: that works :-)	09:53
_ikke_	hendry: cool	09:53
	← frogonwheels left	09:54
	→ frogonwheels joined	09:55
	→ dhruvasagar joined	09:55
	← awelch0100 left	09:55
	→ maleknet joined	09:57
	→ letharion joined	10:01
	← osxorgate left	10:02
	← adam_ left	10:02
	→ aspiers joined	10:03
	→ osxorgate joined	10:03
	→ beautifulmind joined	10:03
	→ svetlyak40wt joined	10:04
aspiers	why do I keep getting auto-banned from this channel? some anti-join-flood bot with sensitivity thresholds set too low?	10:04
	← mikecmpbll left	10:04
FauxFaux	Under what nick? I don't see any bans.	10:04
	→ angelsl joined	10:04
	← cilly left	10:04
	→ Wowik joined	10:04
aspiers	FauxFaux: the ban expired	10:05
jast	aspiers: we don't have any automatic bans	10:05
aspiers	* aspiers #git :Cannot change nickname while banned on channel	10:05
jast	that's not due to bans	10:05
	→ mikecmpbll joined	10:05
jast	we have a +q on people who are not logged in, to prevent certain kinds of horrible spam	10:05
aspiers	oh right	10:05
hendry	_ikke_: another question. i noticed `git fetch` seems to download the entire history when there isn't a common ancestor. if there a way to force it to "fast forward". I.e. not bother with merge	10:05
jast	you can work around it by being logged in or following the instructions in the topic	10:06
	← Wowik left	10:06
	gitinfo set mode: +v	10:06
aspiers	yeah, I already logged in	10:06
	→ cilly joined	10:07
aspiers	but for some reason xchat doesn't automatically re-login on reconnect after timeout	10:09
	← maleknet left	10:09
	← Eridius left	10:11
	→ sam____ joined	10:12
alexander__b	if I cherry pick from remote/branch, and only want some older commits, what do I then do the next time I pull and want the newer commits?	10:13
	does git have some neat way of making me aware which ones I have pulled, and which ones I haven't?	10:13
jast	cherry-picks are not merges, so no	10:13
	→ samphippen joined	10:13
alexander__b	so I should use merge in some way?	10:13
jast	merge might magically do the right thing in some cases, though	10:13
alexander__b	jast: instead of using git terms, let me just explain what I actually want to do	10:13
	gitinfo set mode: +v	10:14
sam____	if I get the message 'Your branch is ahead of 'green/master' by 4 commits.' that means that git thinks I have 4 commits to push to 'green/master', correct?	10:14
	← hyperair left	10:14
jast	sam____: yep	10:15
alexander__b	I want to pull from a branch on a remote, and I might only want the changes in, let's say three older commits, but not the five newest. then at a later stage, I want those five changes - however there have been fifteen newer commits since then. is there a neat way to identify which changes I have in my repository, and which ones I haven't?	10:15
_ikke_	hendry: fastforward has to do with merging. git fetch doesn't merge anything	10:15
	→ maleknet joined	10:15
esc	so, mercurial on the server,git on the client, where can i find it?	10:15
_ikke_	find what?	10:16
	→ adamben joined	10:16
sam____	how can I see what those commits are?	10:16
_ikke_	git log green/master..	10:16
	(the .. are important)	10:16
sam____	thanks	10:16
alexander__b	what they used to do in svn was just create one branch per issue they were working on, and then merge those branches. which sounds a bit un-git.	10:17
_ikke_	alexander__b: Using topic branches is very typical in git	10:17
jast	alexander__b: if it's that cleanly cut, just do a 'git merge <ID of oldest commit you want to merge>'. that way it'll take everything up to that point, and future merges will work just fnie	10:17
alexander__b	jast: it's not very linear, and that will hardly ever be the case	10:18
jast	in general you can probably benefit from separating your work into branches more	10:18
	sounds like those 15 newer commits might belong on a separate branch	10:18
	← gavin_huang left	10:18
	← marthinal left	10:18
esc	the program to perform the above task :)	10:19
alexander__b	_ikke_: is that a sane solution for this issue: they want devs to work on different issues and not make one issue's solution rely on commits in the other issue-fix. they then want the maintainer to be able to use whatever commits he damn well pleases in his deployment repository.	10:19
	→ gavin_huang joined	10:19
sam____	hmm.. when I do a git log green/master.. I see commits which I actually see on the master branch when I look at the repo in GitHub	10:19
	why might that be?	10:20
m1sc	alexander__b: if your question is "can I fetch a certain object an its history instead of a branch with more commits than I need?" the answer is no. once you fetched the branch you can pick whatever you need	10:20
alexander__b	m1sc: the problem is: devs work on different issues. the different issue solutions can't rely on each other and must be possible to implement separately (crashes here might of course occurr, but that's up to the maintainer to fix). the maintainer needs to pull different issue-fixes in a non-linear and irregular fashion.	10:22
	http://git-scm.com/book/ch3-4.html seems like a possible solution.	10:22
esc	yeah, basically, i need the hg equivalent of git svn	10:23
	→ marthinal joined	10:24
m1sc	alexander__b: well, that's pretty much the basic workflow. you have a stable base (for example the branch master) and every feature or bug fix needs to cleanly apply on top of it	10:24
	← cilly left	10:25
alexander__b	m1sc: it's a bit difficult to think clearly due to the sheer ammount of repositories and submodules at work here, so I'm here, reaping some feedback, hehe.	10:25
	→ rgr joined	10:25
	← marthinal left	10:25
	→ marthinal joined	10:26
	→ cilly joined	10:27
m1sc	alexander__b: the maintainer would wait for pull requests from the dev ("he maintainer, shiny new feature is ready, please pull"), the maintainer would fetch it, review and then reject or merge / cherry-pick..	10:27
	← thirdknife__ left	10:27
	← Kriz1 left	10:27
	→ KrizOne joined	10:27
alexander__b	m1sc: it's more like, the maintainer is preparing for a new version. it gets a list of issues that are fixed by a project manager, and some of these needs to go to this release, some to that release. completely non-linear.	10:28
	m1sc: he does have to review and merge etc though.	10:28
	→ tvw joined	10:30
	→ blami_ joined	10:30
m1sc	alexanber__b: also, see http://nvie.com/posts/a-successful-git-branching-model	10:30
	← daniel_- left	10:30
	← gavin_huang left	10:30
	→ gavin_huang joined	10:35
	← drougge left	10:35
	← tinti_ left	10:35
	← madsy left	10:35
	→ tinti joined	10:36
	← maleknet left	10:38
	← Lord_DeathMatch left	10:38
	→ thirdknife__ joined	10:40
	← munichlinux left	10:40
	← rgr left	10:40
	→ Lord_DeathMatch joined	10:42
	← d3vic3 left	10:42
	← cilly left	10:43
	← tvw left	10:44
	→ tvw joined	10:44
	→ cilly joined	10:45
	→ hyperair joined	10:46
	→ rob_w joined	10:47
	→ daniel_- joined	10:47
	→ project2501a joined	10:49
	→ j0ran1 joined	10:51
	← Lord_DeathMatch left	10:51
	← j0ran left	10:52
	→ jbub joined	10:54
	→ maleknet joined	10:54
	→ ph^ joined	10:55
	← elbeardmorez left	10:56
	→ marhaban joined	10:57
	← irqq left	10:57
	← cilly left	10:59
	→ cilly joined	11:00
	→ rwestphal joined	11:01
	← papegaaij_ left	11:02
	← babilen left	11:03
	→ thiago joined	11:03
	→ babilen joined	11:04
	← jargon- left	11:08
	→ rgr joined	11:09
	→ spaceonline joined	11:11
	→ whitman joined	11:12
	→ dkeuyof joined	11:12
	← ph^ left	11:13
	← samphippen left	11:15
	→ dpk joined	11:16
	→ cobra-the-joker joined	11:16
	→ elbeardmorez joined	11:17
	← cbreak-work left	11:18
	← dpk left	11:22
	← marhaban left	11:24
	→ Gx4 joined	11:26
	→ prudnikov joined	11:27
	← xxc_michael left	11:28
	adhawkins-away → adhawkins	11:31
	← cilly left	11:32
	← OOPMan left	11:34
	→ sgambino joined	11:37
	→ cilly joined	11:39
	← LekeFly left	11:39
	← arietis left	11:40
	→ akiress joined	11:41
	→ LekeFly joined	11:41
	← akiress left	11:41
	→ akiress joined	11:43
	← cilly left	11:44
	→ drougge joined	11:44
	→ munichlinux joined	11:44
	← mikecmpbll left	11:45
	→ cilly joined	11:45
	→ ipalaus joined	11:45
	→ d3vic3 joined	11:47
	→ samphippen joined	11:48
	← TheHaven left	11:49
	→ papegaaij joined	11:50
	← cilly left	11:51
	→ cilly joined	11:52
	← soee left	11:52
	→ zenx joined	11:53
	← cobra-the-joker left	11:53
	← Anubisss_ left	11:55
	→ dpk joined	11:55
	→ mikecmpbll joined	11:55
	→ juvenal joined	11:56
	→ itatitat joined	11:57
	→ OOPMan joined	11:59
	← txomon\|nqas left	12:00
	← mikemol left	12:01
	→ pandeiro joined	12:03
	→ soee joined	12:04
	→ cirenyc joined	12:05
	← OOPMan left	12:05
	← _aeris_ left	12:06
	→ _aeris_ joined	12:07
	→ cannonball joined	12:08
	→ OOPMan joined	12:10
	→ erichynds joined	12:11
	← gusnan left	12:12
	← mgue-mobile left	12:13
	← alunduil left	12:14
	→ ajw0100 joined	12:15
	→ geekbri joined	12:16
	← prudnikov left	12:17
	→ williamherry joined	12:17
	→ prudnikov joined	12:17
	← talha left	12:17
	← cilly left	12:18
	← blami_ left	12:19
	← OPK left	12:20
	→ OPK joined	12:20
	→ cilly joined	12:20
	→ dhruvasa1ar joined	12:20
	← dkeuyof left	12:20
	→ crabmanX joined	12:22
	→ mstsirkin joined	12:22
	← dhruvasagar left	12:22
	→ dhruvasagar joined	12:23
	← cilly left	12:23
	→ cbreak-work joined	12:26
	→ skyf joined	12:26
	← dhruvasagar left	12:27
	→ dhruvasagar joined	12:27
	← dhruvasagar left	12:30
	→ dhruvasagar joined	12:30
	→ Anubisss joined	12:31
	→ glennpratt joined	12:31
	→ tmclaugh[work] joined	12:31
	→ SkAzZ joined	12:32
tmclaugh[work]	Hi, I've had a request to use Git to distribute and version control our internal apt package repository.	12:32
FauxFaux	Sounds like it's full of !big binaries.	12:33
gitinfo	[!large_files] Git isn't yet great at large files(larger than RAM). Look at !annex for solutions. You can find them (after gc) with: git verify-pack -v .git/objects/pack/pack-*.idx \| grep blob \| sort -k3nr \| head \| while read s x b x; do git rev-list --all --objects \| grep $s \| awk '{print "'"$b"'",$0;}'; done	12:33
tmclaugh[work]	This isn't a request to version control build files but the binary packages themselves and I'm hessitent to do this as it seems like we're abusing Git for a use case it wasn't intended for.	12:33
	→ adac joined	12:34
tmclaugh[work]	These files will be smaller than the RAM size of the server.	12:34
	→ chaiz joined	12:34
_ikke_	But they change often, don't they?	12:34
adac	Hi. can someone link me to a HOWTO where it is explaiend how to setup email on a git push?	12:34
	→ Dno joined	12:35
_ikke_	adac: setup email for what?	12:35
adac	_ikke_, to send an email notification if someone has pushed something	12:35
tmclaugh[work]	_ikke_: I don't see them changing all that much since each new package should have a different filename due to the version string.	12:36
	We'll just be adding packages.	12:36
	← itatitat left	12:36
_ikke_	tmclaugh[work]: Well, obviously, it's not where git was intended for	12:37
	tmclaugh[work]: But that doesn't mean that git can't be used at all	12:38
m1sc	adac: you need to setup a post receive hook. google should give you tons of resources to build your own	12:38
tmclaugh[work]	_ikke_: I'm just hesitant to abuse a tool that neither of us have sufficient background in.	12:38
	→ null0 joined	12:38
_ikke_	tmclaugh[work]: It's a choice you have to make yourself	12:39
tmclaugh[work]	_ikke_: I told the person my choice but that wasn't enough. Now I'm looking to make sure there aren't technical limitations.	12:40
	Problem is I'll build it and have to support it so if there become problems it'll become my job to fix them.	12:41
	← Anders_J left	12:41
	→ guampa joined	12:41
	← rwestphal left	12:42
	← mikecmpbll left	12:42
cmn	the apt/dpkg system already allows you to version packages	12:43
	→ mikecmpbll joined	12:44
cmn	and in any case, a distributed system is not what you want	12:44
tmclaugh[work]	cmn: he want's the binary blobs versioned.	12:44
	→ chrisdev joined	12:44
cmn	right	12:44
	use what apt already gives you	12:45
	← chrisdev left	12:45
cmn	if you absolutely need to put them under version control, a centralised system will fit much better	12:46
	← glennpratt left	12:46
	← cirenyc left	12:46
cmn	but it'd still be versioning on top of versioning	12:46
	→ glennpratt joined	12:46
tmclaugh[work]	What tools do .deb files give me?	12:46
	If we have foo-1.0 he wants to know if foo-1.0 changed in any way and who did it.	12:47
cmn	for that you version-control the sources	12:48
	if you generate a new package, you increase the version	12:48
tmclaugh[work]	I agree 100% with you.	12:48
cmn	I forget the actual name	12:48
muep	you could also cryptographically sign the packages	12:48
	→ gtrak joined	12:48
muep	to avoid someone faking the version-release metadata	12:48
tmclaugh[work]	That's not what I'm being asked to build though. :)	12:49
cmn	there's a reason apt debs have that -1, -2 at the end	12:49
	← munichlinux left	12:49
cmn	it tells you version package	12:49
	package version, even	12:49
tmclaugh[work]	and that's why I'm trying to find technical reasons why his idea is not that good of an idea.	12:49
cmn	it's implemented at another layer	12:49
	and using it with git is stupid, as you're not going to fork and merge the binary packages	12:50
	particularly not in a distributed fashion	12:50
tmclaugh[work]	And I will get back, "but what if someone recompiles foo-1.0 and doesn't increase the version number?"	12:50
_ikke_	!schwartzian	12:51
gitinfo	The Schwartzian Criterion of Git Usage: if you don't envision using branching and merging, then git probably isn't the right answer.	12:51
_ikke_	tmclaugh[work]: How is git going to help with that?	12:52
tmclaugh[work]	I will get back arguments ad nauseum if I don't come back with a technical limitation.	12:52
cmn	people not doing their job is not a technical problem	12:52
tmclaugh[work]	_ikke_: His answer will be, "But I'll see that such and such checked in an update to an existing package."	12:53
	for the record, I agree with you guys. I'm arguing my coworker's point. :-/	12:53
cmn	does the also only track the resulting binaries for this other projects?	12:53
tmclaugh[work]	he tracks source and compiles most things himself.	12:55
	← tewecske left	12:55
cmn	it's the same thing	12:55
tmclaugh[work]	He won't let me enable EPEL for our RHEL based hosts because "it's insecure".	12:55
cmn	you track the source, not the results	12:56
tmclaugh[work]	that's my feeling too.	12:56
	i'm googling schwartian criterion and all I get back is a link to a chatlog from this channel.	12:56
cmn	and if he's worried about people being careless, make the deb contain a timestamp or commit hash	12:56
	→ _ivar_ joined	12:56
cmn	which is what you do for debs that package development snapshots	12:57
	← gtrak left	12:57
	→ txomon\|nqas joined	12:58
	← txomon\|nqas left	12:58
	→ txomon\|nqas joined	12:58
tmclaugh[work]	ahh, Schwarz Criterion is an economics term	12:58
	screw this. I'll make my last argument and give up.	12:58
cmn	well, this one is about Randall Scwharz	12:58
tmclaugh[work]	thanks for at leats making me feel good that I'm right :)	12:58
	oh, because I read the economic term and it sort of fit.	12:59
	→ torbjorn joined	12:59
torbjorn	i keep running into branch/tracking information confusion	12:59
	i am now able to pull from repo, but when i try to push, it asks me to specify which branch to merge with	12:59
tmclaugh[work]	well, fit as well as I possibly understand economics terms	12:59
cmn	push won't ask you a branch to merge	13:00
torbjorn	isnt it a fair assumption that when I have pulled remote master to my own master, that i would like to push bach my mater to the rmeote master?	13:00
	but i just pulled from it, isnt that merged enough?	13:00
cmn	that's one situation, and git has no way of knowing whether that fits unless you tell it	13:00
_ikke_	torbjorn: git push -u	13:00
	← Gaga left	13:00
_ikke_	git push -u origin master	13:01
	for example	13:01
torbjorn	even if i do git pull origin master , it still doesnt remember that till next time	13:01
	thanks _ikke_	13:01
	→ freeed joined	13:01
torbjorn	it would be nice to discuss the logic though, i assume i am wrong as people who make stuff that goes on itnernets generally know better	13:01
	→ sonic_baker joined	13:02
cmn	what would git remember?	13:02
	you've told it to do a one-off	13:02
	!fetch4	13:02
gitinfo	[!fetchfour] Never use the four-word version of git-fetch or git-pull (e.g. git fetch remote refspec). It always ends in tears. Yes, if you understand the implications of FETCH_HEAD it can technically be done, but really it is easier to just fetch the whole remote (or perhaps edit the fetchspec if you never want other bits). If you must, see !fetch4why	13:02
torbjorn	that i pulled remote master to my own master	13:02
	← rgr left	13:02
	→ chaiz_ joined	13:02
cmn	you merged a remote branch into your own, that precisely means that you won't have anything more to do with it	13:02
_ikke_	torbjorn: git pull origin master == git fetch origin master:FETCH_HEAD; git merge FETCH_HEAD	13:02
sonic_baker	Hi there, trying to clone a repository over https gives me the following error: error: SSL certificate problem, verify that the CA cert is OK. Details:......	13:03
	I've read that the SSL check can be disabled with "env GIT_SSL_NO_VERIFY=true'	13:03
	← daniel_- left	13:03
cmn	isn't it CURL_?	13:03
sonic_baker	but I'm not sure how this effects security, can anyone enlighten me?	13:03
	→ daniel_- joined	13:04
cmn	it affects it in as much as you're not checking whether the other end of the connection is who they claim they are	13:04
_ikke_	sonic_baker: mitm are very is when you disable that check	13:04
	← chaiz left	13:05
sonic_baker	mitm?	13:05
_ikke_	man in the middle	13:05
sonic_baker	ok	13:05
cmn	this is all at the HTTP layer, though, nothing to do with git	13:05
	← keltvek left	13:06
sonic_baker	so, I've read that you have to install root certs	13:06
	→ chaz joined	13:06
sonic_baker	Is this a bit job?	13:06
	*big	13:07
	→ vekexasia1 joined	13:07
	→ keltvek joined	13:07
cmn	the root certs should come with your OS, if it's old, it can be that newer root CA certs aren't there	13:07
m1sc	sonic_baker: what's wrong with the certificate?	13:07
sonic_baker	error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed while accessing https://github.com/msanders/snipmate.vim.git/info/refs	13:07
	← chaiz_ left	13:08
	→ j0ran joined	13:08
	← j0ran1 left	13:08
	→ hellopat joined	13:09
	→ macabre joined	13:09
m1sc	sonic_baker: what happens when you do "curl https://github.com"? do you get a certificate warning when accessing https://github.com in your browser?	13:11
	→ jperry2_ joined	13:12
	← rchavik left	13:12
	← j0ran left	13:12
sonic_baker	browser is ok but curl gives:	13:12
	curl: (60) SSL certificate problem, verify that the CA cert is OK. Details:	13:12
	error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed	13:13
	More details here: http://curl.haxx.se/docs/sslcerts.html	13:13
	etc...	13:13
jast	so I suppose the DigiCert root CA is missing in your cert collection	13:13
_ikke_	sonic_baker: Does curl know where it has to look for the CA certificates?	13:13
m1sc	sonic_baker: seems liks curl doesn't see / use your system root certs. that's what you need to fix	13:13
cmn	is the browser on the same machine? this usually happens on older RHEL/CenOS machines	13:13
sonic_baker	yes, all on my mac	13:13
	→ snearch joined	13:14
sonic_baker	_ikke_: I'm not sure if curl knows where to look	13:14
cmn	ah, mac; chances are curl doesn't know where OSX keeps the certs	13:14
sonic_baker	ok, any idea how I can tell it?	13:14
	→ AaronMT joined	13:14
	← kcj left	13:15
jast	depends on whether curl is linked against openssl or gnutls	13:15
sonic_baker	em..... not sure there either. Is there a command I can run to check?	13:16
	→ tmcmahon joined	13:16
	→ brentratliff joined	13:17
sonic_baker	If I just clone with the git:// protocol am I still open to mitm?	13:17
jast	curl -V	13:17
	yeah... someone could manipulate the data you receive	13:18
wereHamster	sonic_baker: git:// is completely unprotected.	13:18
jast	of course there's no authentication that can be stolen, so the attack is on the data instead of on your credentials	13:18
	→ alunduil joined	13:18
sonic_baker	so curl -V mentions OpenSSL	13:18
muep	a mitm could cause you to clone some other repo than what you intended to clone	13:19
sonic_baker	aha, I get it	13:19
jast	openssl tends to demand its own storage form for ssl certs	13:19
sonic_baker	Sounds unlikely though, no? Would it be common?	13:19
	← Lgb left	13:20
sonic_baker	jast: so is it a big job to fix this?	13:20
jast	no idea. I have zero experience with OSX.	13:20
sonic_baker	ok, thanks for the help so far anyway	13:21
_ikke_	sonic_baker: google might have an answer there	13:21
	← samphippen left	13:21
	← alunduil left	13:21
	→ Lgb joined	13:21
	← flaguy48 left	13:22
	→ alunduil joined	13:22
sonic_baker	_ikke_: Yeah I have a few pages open but not sure if I'd be doing the right thing. Think I'll leave it for now, it's not something I need and don't have time at the moment to go messing with a load of stuff	13:22
	← john3 left	13:23
_ikke_	sonic_baker: Usually it's just one setting	13:23
	→ bartek joined	13:23
	→ john3 joined	13:24
	← maleknet left	13:25
	→ jez joined	13:25
	gitinfo set mode: +v	13:25
	→ TeckniX joined	13:25
jez	Hi. Is there a way to clone a git repo, but not have git setup "origin" to point to the source repo?	13:25
_ikke_	jez: What is the problem with that?	13:26
	→ dAnjou joined	13:26
jez	_ikke_: I don't want to associate the 2 repos	13:26
wereHamster	jez: clone the repo, then delete the origin remote.	13:26
jez	ok, that's the only way?	13:26
_ikke_	jez: yes	13:26
jez	there isnt one command i can use?	13:26
_ikke_	nope	13:27
	no one has needed that option before aparently :)	13:27
wereHamster	or use git init + git fetch url master + git checkout -b master FETCH_HEAD	13:27
	→ samphippen joined	13:27
dAnjou	hey, i installed this "extension" https://github.com/wmanley/git-meld but when i run "git meld", i get: fatal: cannot exec 'git-meld': permission denied although the path has proper permissions	13:27
_ikke_	But that's not exactly the same, is it?	13:27
	dAnjou: How have you verified the permissions?	13:28
	← jez left	13:28
dAnjou	_ikke_: ls	13:28
	drwxr-xr-x 3 max max 4096 Okt 2 15:14 git-meld	13:28
	alias line is: meld = !/home/max/bin/git-meld/git-meld.pl	13:29
comps	hi, what's with the "git merge <msg> HEAD <commit>..." syntax -- is it there "for historical reasons", or does it have a specific plumbing-like use case? .. thanks	13:29
dAnjou	without that thingy, that got pasted by mistake	13:29
	→ trungqtran joined	13:29
	← trungqtran left	13:29
	→ trungqtran joined	13:29
	← aspiers left	13:29
_ikke_	dAnjou: And you are user max?	13:30
	← OOPMan left	13:30
dAnjou	_ikke_: yes	13:30
	→ flaguy48 joined	13:30
cmn	do other extensions work?	13:30
dAnjou	cmn: how can i check that?	13:30
cmn	by running another one	13:30
dAnjou	i think i don't have any other	13:31
cmn	it could be that some dir in your $PATH doesn't have x permissions	13:31
	and git doesn't know how to continue	13:31
	→ tinti_ joined	13:31
cmn	there have been a few patches to try to figure out this vs other permission issues, but it's never clear	13:31
	← svetlyak40wt left	13:32
	← tinti left	13:32
dAnjou	cmn: i checked them all now, 755 for all	13:32
	← tmcmahon left	13:32
cmn	strace the process then, see what's throwing that permissions error	13:33
dAnjou	i did that already, a second	13:33
	← ehsan_ left	13:33
dAnjou	[pid 7411] execve("/home/max/bin/git-meld", ["git-meld"], [/* 114 vars */]) = -1 EACCES (Permission denied)	13:33
	fatal: cannot exec 'git-meld': Keine Berechtigung	13:33
	last thing is german for "permission denied"	13:34
cmn	isn't that path a dir?	13:34
dAnjou	yes it is	13:34
cmn	that's it then	13:34
dAnjou	but my alias says meld = !/home/max/bin/git-meld/git-meld.pl	13:34
cmn	it looks like aliases are the last to be tried	13:35
dAnjou	hmm	13:35
cmn	sounds like a genuine bug, it shouldn't try to exec dirs	13:35
	→ lacrymology joined	13:35
	→ tplaner_ joined	13:36
	← simenbrekken left	13:36
dAnjou	why always me .. :(	13:36
	i try linking it one dir level up	13:36
	← fornext left	13:37
cmn	looks like it's in master as well	13:37
dAnjou	same error, renameing dir	13:38
cmn	well, you can't have a dir and a file with the same name	13:39
dAnjou	i know	13:39
	← beautifulmind left	13:40
dAnjou	i have git-meld/ and a symlink git-meld.pl -> git-meld/git-meld.pl	13:40
	still didn't work	13:40
	now i have meld-git/ and git-meld.pl -> meld-git/git-meld.pl	13:40
	works	13:40
cmn	right, git is looking for exactly git-meld	13:40
	→ svetlyak40wt joined	13:40
dAnjou	but look at that:	13:41
	[pid 7783] execve("/home/max/bin/git-meld", ["git-meld"], [/* 114 vars */]) = -1 EACCES (Permission denied)	13:41
	[pid 7783] execve("/usr/games/git-meld", ["git-meld"], [/* 114 vars */]) = -1 ENOENT (No such file or directory)	13:41
	[pid 7783] execve("/home/max/bin/git-meld", ["git-meld"], [/* 114 vars */]) = -1 EACCES (Permission denied)	13:41
	→ gtrak joined	13:41
	→ maleknet joined	13:41
dAnjou	it checks the dir: error; checks a totally other dir: not found; checks same dir again: error; end of strace	13:42
	→ Jay_Levitt joined	13:42
cmn	odd, do you have $HOME/bin twice in your PATH?	13:42
dAnjou	hmm	13:42
txomon\|nqas	can anyone help me deleting a file from HEAD~~ ? I can't wait till git filter-branch does a --tree-filter...	13:42
dAnjou	cmn: yes .. damn	13:42
	cmn: will take care of that, thanks	13:43
cmn	txomon\|nqas: use rebase -i	13:43
txomon\|nqas	65000 commits to rewrite...	13:43
	cmn ok!	13:43
	→ les_sylvains joined	13:45
	→ derpops joined	13:46
txomon\|nqas	cmn, I always forget that -i magic option :S	13:47
	← daniel_- left	13:47
	← gtrak left	13:48
	→ episage joined	13:48
	→ gtrak joined	13:48
adhawkins	I've just realised I've done a couple of commits with a silly email address.	13:49
	And published them.	13:49
	→ crlane joined	13:49
adhawkins	Given !rewrite, is it a bad idea to amend the email addresses?	13:49
gitinfo	[!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to jump through hoops (and you have to tell them to), so it's infinitely better to just move on without rewriting. That said, you can use `git push -f` to force your new history through (may get rejected, though). See http://git-scm.com/docs/git-rebase.html#_recovering_from_upstream_rebase	13:49
cmn	it doesn't matter what for, rewriting is generally bad	13:49
adhawkins	That's what I thought.	13:50
	Bugger.	13:50
cmn	you can add a mailmap	13:50
	← sonic_baker left	13:50
	→ ayaka joined	13:51
adhawkins	Mailmap?	13:51
	→ Zefi joined	13:52
	← juvenal left	13:52
cmn	man git whatchanged has an explanation IIRC, it's a maping table for e-mail addresses	13:52
gitinfo	the git-whatchanged manpage is available at http://git-scm.com/docs/git-whatchanged.html	13:52
cmn	add it to the root of the repo and log should transform it on the fly	13:53
	← thirdknife__ left	13:53
adhawkins	Probably the wrong place, but will github use it too?	13:53
	→ frem joined	13:53
cmn	absolutely no idea	13:54
	← JPT left	13:54
adhawkins	Is this a relatively new feature?	13:54
cmn	nope	13:55
	← kermit left	13:55
cmn	I believe it dates back to CVS, and git had it pretty early on	13:55
	← svetlyak40wt left	13:55
adhawkins	Do I have to add it for it to be handled?	13:55
	→ JPT joined	13:55
	← samphippen left	13:55
	→ LeMike joined	13:55
cmn	you need to put the .mailmap file in the repo	13:56
	'cos you presumably want other people to have it as well	13:56
adhawkins	But will it be handled locally if it's not in the repo?	13:57
	→ scarlisle joined	13:58
torbjorn	_ikke_ and cmn: sorry got interrupted at work. i guess im doing something else wrong.. I typically don't set up a remote git repo until I feel projcets grow large enough or important enough, so later on I typically git init --bare somewhere, and push my local project git folder to this repo	13:58
	and i run into the confusion of master branches	13:58
adhawkins	cmn: http://pastebin.com/0wDzqW2G	13:58
torbjorn	git push -u will take care of my frustration though, thanks	13:58
	→ kermit joined	13:59
ayaka	if I want to set a git server , I need to use Gitosis or I can use git directly	13:59
	← vekexasia1 left	13:59
	← kerrick left	13:59
_ikke_	ayaka: !gitosis	13:59
gitinfo	ayaka: 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 -- if you're already stuck with gitosis we'll try to help, but no promises!	13:59
	→ cakehero joined	13:59
MacGyver	ayaka: gitosis is considered deprecated... yeah that.	13:59
	→ nwest joined	13:59
	← maleknet left	14:00
_ikke_	ayaka: You don' need any aditional software, but it is highly recomeneded	14:00
	recomended	14:00
ayaka	oh, I see	14:00
MacGyver	You can use git directly, but gitolite is very easy to set up and manage.	14:00
	→ svetlyak40wt joined	14:00
MacGyver	Probably easier than using git directly, even, but I have never gone that route so cannot really comment.	14:00
cmn	adhawkins: hm, that should work... can you check if git shortlog works?	14:01
txomon\|nqas	I have tried, and Sure gitolite rocks	14:01
_ikke_	For a single user it's doable, but otherwise you have to deal with file permisions and other things	14:01
	← soee left	14:01
txomon\|nqas	_ikke_, neither	14:01
adhawkins	cmn: Works as in what?	14:01
cmn	as in it correctly replaces the e-email	14:01
	→ revagomes joined	14:01
_ikke_	txomon\|nqas: what neither?	14:01
adhawkins	It doesn't show any emails.	14:01
	Ah, -e	14:02
	Yes, it shows the correct email address	14:02
ayaka	_ikke_, thank you	14:02
	← ayaka left	14:02
txomon\|nqas	_ikke_, for one user, it isn't either doable	14:02
cmn	hm, then log probably doesn't take it	14:03
txomon\|nqas	unless in the same computer...	14:03
adhawkins	man git log implies that it will process mailmap	14:03
gitinfo	the git-log manpage is available at http://git-scm.com/docs/git-log.html	14:03
	← soc42 left	14:03
adhawkins	In the format string:	14:03
	"%aN: author name (respecting .mailmap, see git-shortlog(1) or git-blame(1))"	14:03
_ikke_	txomon\|nqas: one user via ssh shouldn't give any problems	14:03
cmn	right, but the format string isn't necessarily what a vanilla 'git log' produces	14:03
adhawkins	Right	14:03
	Ah, there %an and %aN	14:03
cmn	that's why I thought git-log would change it as well	14:04
	← mgorbach left	14:04
	← JohnBat26 left	14:04
	→ mgorbach joined	14:05
	→ bitkiller joined	14:05
	→ thirdknife__ joined	14:05
adhawkins	Oh well, guess I'm stuck with those couple of commits then. :(	14:05
	adhawkins must be more careful	14:05
adhawkins	I spotted them, and did a commit --amend --reset-author, but it looks like it only changed the name	14:06
	Not the email	14:06
txomon\|nqas	_ikke_, in that case, you should have the repo in your home or a large path in your remote, anyway, gitolite does that in 2 steps...	14:06
cmn	does 'git var GIT_AUTHOR_IDENT' give you the right one?	14:07
	→ ankesh_ joined	14:07
	→ Mikien1 joined	14:07
	← gtrak left	14:08
	← Mikien1 left	14:08
	→ Destos joined	14:09
adhawkins	cmn: Yes	14:09
	→ marhaban joined	14:10
adhawkins	Thinking about it, these commits might be fairly old.	14:10
	I set up a VM to do some specific changes (cross compilation) and forgot to correctly setup git for name and email address.	14:10
	These commits could be from then.	14:10
	I suppose it's no big deal. There's only two of them.	14:10
	← snearch left	14:11
	gitinfo set mode: +v	14:11
LeMike	hi there. I want to ignore a folder "app" but not ignore it's child "app/code/local". I use .gitignore with this: /app/* \n !/app/code/local/*	14:11
	but it doesn't work. the rules seem valid to me.	14:11
	← spaceonline left	14:12
	← Zefi left	14:12
adhawkins	You might have to !/app/code/local/ ?	14:12
	→ duckxx joined	14:12
	→ sctt joined	14:12
	→ kevwil joined	14:13
LeMike	same one. `git status` doesn't show that the folder has changes or needs to be added	14:13
	← dAnjou left	14:14
adhawkins	I seem to remember having some similar issues with .gitignore	14:14
	Pretty sure a google brought up some useful info	14:14
_ikke_	LeMike: Try reversing the order	14:14
	← svetlyak40wt left	14:14
cmn	you can't unignore something that's not in the ignore list, app/* doesn't put app/code/local in the list, so you can't remove it	14:14
_ikke_	LeMike: Ignore my comment	14:15
	→ Zefi joined	14:15
cmn	it's stupid, I know, but those are the rules	14:15
_ikke_	* doesn't match / in .gitignore	14:15
adhawkins	cmn: Then git status should show the app/code/local stuff then shouldn't it?	14:15
cmn	not if it's ignored	14:15
LeMike	"git add app/code/local/" :: The following paths are ignored by one of your .gitignore files: app	14:15
adhawkins	But you said it wasn't ignored...	14:15
	← e66 left	14:15
	adhawkins is confused	14:15
LeMike	even if I turn the rules	14:15
cmn	he's trying not to ignore it, but the rules are making it hard	14:16
	you need to have that dir in the rules before you can unignore it	14:16
	← gerard0 left	14:16
cmn	putting something like /app//\n!/app/code/local might work	14:16
LeMike	i get it... so i need to ignore app/code/* and unignore app/code/local ?	14:16
	yee	14:16
	i try	14:16
adhawkins	My head hurts :)	14:17
	→ aristidesfl joined	14:17
	← lacrymology left	14:18
	← Zefi left	14:18
	← Ecesis1 left	14:18
	← marhaban left	14:18
	→ gerard0 joined	14:20
	← sveajobb left	14:20
	→ aantix joined	14:21
LeMike	cmn: thx!! that's it almost. the files within /app/ are not ignored. and adding /app/* doen't work. neither before the rules nor after.	14:21
cmn	add '*' in app/.gitignore	14:21
	top-level ignores that refer to sub-levels are bad for you	14:22
	← stodan left	14:22
jast	nah, just pretty confusing :)	14:22
cmn	they hurt performance in larger repos	14:22
LeMike	k. the trivial ones never come to my mind :P :D	14:22
cmn	we were looking at webkit, and peff reorganised the ignore rules into several smaller ones, and the performance increase wasn't trivial	14:23
	something like "top-level gitignores considered bad" in the ML should find the post	14:23
LeMike	no. i mean the solution by putting another .gitignore in the subfolder	14:24
	← lindenle_ left	14:24
cmn	right, but you should be doing that anyway	14:25
	http://thread.gmane.org/gmane.comp.version-control.git/194294/focus=194341	14:25
	← ankesh_ left	14:25
	→ chrisgeorge joined	14:26
	→ TheJH joined	14:26
	← dhruvasa1ar left	14:26
	← williamherry left	14:27
Meliorate	hi all, i'm looking for a git irc bot that will work dynamically with git repositories (EG: not like supybot, where configuration is required per repos). can anyone a decent one please?	14:28
	*recommend a decent one	14:28
LeMike	oh ok. i always liked git for only having some top-level elements and leaving the rest alone. but that is an impact for large repos. thx cmn	14:29
	→ AlbireoX joined	14:29
	← lb left	14:30
cmn	there's a point where a faster git-status is more convenient than a top-level gitignore, just something to keep in mind	14:30
	→ lb joined	14:30
	← lb left	14:30
	→ lb joined	14:30
_ikke_	it's a trade-off ;)	14:30
	→ mmc1 joined	14:32
	← RaceCondition left	14:33
	← dhruvasagar left	14:33
	← thiago left	14:33
	→ samuel02 joined	14:34
	→ alexisabril joined	14:34
	← thirdknife__ left	14:35
	→ thirdknife joined	14:35
	← sctt left	14:37
	← whaley left	14:37
	→ BSaboia joined	14:39
	← BSaboia left	14:39
	→ Zefi joined	14:40
	← papegaaij left	14:42
	← Zefi left	14:42
	→ torjus_ joined	14:43
	← aisbaa left	14:44
	← mikecmpbll left	14:44
	← psoo left	14:45
	→ Sky[x] joined	14:45
	→ ehsan joined	14:46
	← ISF left	14:46
const	is there a way to say "delete all branches that are a strict subset of master"	14:47
	or "delete all branches that don't have commits not in master" ?	14:47
	→ RaceCondition joined	14:48
	→ und3f joined	14:48
_ikke_	const: Well, to get those, you have git branch --merged and git branch --no-merged	14:48
const	_ikke_: I never merged	14:48
	→ gtrak joined	14:48
const	I use git svn: so my workflow has been to switch to master, cherry-pick, and then git svn dcommit	14:49
	→ tjholowaychuk joined	14:49
_ikke_	const: Well, git considers a branch merged if it contains all the commits found in other branches	14:49
	← Dno left	14:50
	→ sctt joined	14:50
const	_ikke_: oh, nice	14:50
	→ _numbers joined	14:51
const	_ikke_: so something like: git branch --merged \|grep -v master\|xargs -n 1 git branch -d ?	14:51
	← cagedwisdom left	14:53
	→ msmithng joined	14:54
	← skul left	14:54
	→ marcusbrandt joined	14:55
_ikke_	const: Something like that yeah	14:55
	→ samphippen joined	14:55
cmn	not quite	14:55
	← skorgon left	14:55
cmn	oh, nevermind, the -v is right	14:55
const	http://paste.pound-python.org/show/26341/ -> worked - thanks!	14:55
	← episage left	14:56
_ikke_	afaik, git branch --merged doesn	14:57
lb	if i want to move/transfer a subfolder of a git repo into a new git repo with it's history, will filter-branch be the right tool or am i wrong?	14:57
_ikke_	afaik, git branch --merged doesn't return the branch itself	14:57
cmn	it does	14:57
_ikke_	oh ok	14:57
cmn	it also annoying does so with the star	14:57
_ikke_	oh, right	14:58
	→ dkl joined	14:58
	← adamben left	14:58
cmn	git branch --merged \| grep -v '^*' would be a more generic version of the above	14:59
_ikke_	right	14:59
	→ svetlyak40wt joined	14:59
	→ chaiz joined	15:00
txomon\|nqas	/join #gitolite	15:02
_ikke_	That doesn't work ;)	15:02
	→ martinjlowm joined	15:02
	txomon\|nqas failed xD	15:02
	← jbub left	15:02
	← sgambino left	15:02
	← jceb left	15:02
	SirCmpwn → SirCmpwn_	15:03
	← sctt left	15:03
	→ intransit joined	15:03
	← thirdknife left	15:04
	← _numbers left	15:04
	← suy left	15:05
	→ NcA^ joined	15:05
	← aruiz left	15:06
	→ mikepack joined	15:07
	→ suy joined	15:08
	→ reuf joined	15:10
	← ReekenX left	15:12
	← crabmanX left	15:14
	→ Anubisss_ joined	15:14
	← sebrock left	15:14
	→ kukks joined	15:15
	← kukks left	15:15
	→ kukks joined	15:15
	← cbreak-work left	15:15
	→ irqq joined	15:15
	← torbjorn left	15:16
	← Anubisss left	15:17
	← prudnikov left	15:17
	← Anubisss_ left	15:18
	→ jbub joined	15:18
	→ Anubisss_ joined	15:18
	← und3f left	15:19
	adhawkins → adhawkins-away	15:19
	→ aruiz joined	15:21
	→ swiety joined	15:21
	← aristidesfl left	15:21
	← kpreid left	15:23
	← bitkiller left	15:23
	→ marhaban joined	15:23
	→ ShadeTornado joined	15:23
	→ kpreid joined	15:23
	→ aristidesfl joined	15:24
	← ShadeTornado left	15:24
	← lb left	15:24
	→ ShadeTornado joined	15:25
	← aristidesfl left	15:25
	← layke__ left	15:26
	→ SirCmpwn joined	15:26
	→ ReekenX joined	15:26
	→ episage joined	15:26
	→ aristidesfl joined	15:26
	fuller_afk → fuller	15:27
	← aristidesfl left	15:27
	→ aristidesfl joined	15:27
	→ mikecmpbll joined	15:27
	← AccessGranted left	15:27
	→ cybersphinx joined	15:27
	→ daniel_- joined	15:29
	← marhaban left	15:29
Nickeeh	How would I create a alias for commit that always appends --verbose to git commit? I tried "git config --global alias.commit "commit --verbose"" but that didn't work. :(	15:29
	( I really like that diff )	15:29
	→ madsy joined	15:30
	← madsy left	15:30
	→ madsy joined	15:30
	→ kenperkins joined	15:31
	← the_cybersphinx left	15:31
	→ talexb joined	15:32
	← bartek left	15:32
wereHamster	Nickeeh: AFAIK you can't alias builtin commands	15:33
	create a 'ci' alias or somethig	15:33
FauxFaux	Nickeeh: You can't override inbuilt commands at all. Some people make a wrapper for git in their shell that looks at the arguments and modifies them, or pick a different alias.	15:33
	← Milossh left	15:33
wereHamster	I WIN!	15:33
Nickeeh	Hmm. Can I specify "default arguments" for builtins?	15:33
	← jperry2_ left	15:33
FauxFaux	Only where they support it.	15:33
Nickeeh	Hmkay.	15:33
	Thanks guys.	15:34
FauxFaux	wereHamster: I saw your answer and decided my note about shell wrappers was worth continuing typing. :p	15:34
	→ Milossh joined	15:34
	→ dhruvasagar joined	15:35
	→ fletch_ joined	15:35
	fuller → fuller_afk	15:36
	→ svetlyak40wt_ joined	15:36
	→ OOPMan joined	15:38
	→ _numbers joined	15:38
	← svetlyak40wt left	15:38
	← mikepack left	15:38
	← dvide left	15:39
	→ jdunck joined	15:39
	→ torbjorn joined	15:39
	← dermatthias left	15:40
_numbers	my repo has grown too large in file size. i would like to split it into volumes. i'm thinking if i could backup existing repo, then truncate to only the latest HEAD commit ref, then i could add the old repo as a remote and merge across if i wanted but otherwise my new repo would only contain one commit and be smaller in file size	15:40
	is there an easy way to do something like this	15:40
	← metze left	15:40
	→ metze joined	15:41
FauxFaux	Any merge would /immediately/ make your repo huge again. The solution is to not commit big files. The man gitgrafts wiki page has some examples of grafting old history into place for interested parties.	15:41
	← samphippen left	15:42
	← daniel_- left	15:42
	← ShadeTornado left	15:43
	→ ShadeTornado joined	15:43
	→ beneggett joined	15:43
	← tvw left	15:45
	← rath-work left	15:45
	fuller_afk → fuller	15:45
	→ samphippen joined	15:45
	← flijten left	15:46
	← pandeiro left	15:46
	→ Fretta joined	15:46
	→ rudi_s joined	15:47
_numbers	ah i see. good point. i guess i would have to make patches instead if i wanted to do any merging	15:47
	→ thiago joined	15:48
	← Targen left	15:48
	→ funnyfingers joined	15:49
	← kevwil left	15:49
	→ gusnan joined	15:50
	→ devth joined	15:50
	← osxorgate left	15:51
	← adac left	15:52
	← elbeardmorez left	15:52
	→ steveoliver joined	15:52
	← devth left	15:52
	→ Synthead joined	15:53
	→ talha joined	15:53
	← hyperair left	15:53
	→ tewecske joined	15:54
	→ bartek joined	15:55
	← Milossh left	15:56
	→ evelyette joined	15:56
evelyette	hi, I would like to know if creating some branched automatically in an empty git is possible with git hooks ?	15:57
	→ juvenal joined	15:57
	→ sgambino joined	15:57
ldlework	If you have say 50 internal source repositories in gitolite that your company maintains internally, for packages that you want to share to the FOSS community do you: A) Maintain those packages internally, and push and pull to github when relevant or B) move these packages from the internal collection of repos and host them authoratatively at github, removing the internal repos entirely	15:57
	← xiangfu left	15:57
	→ fornext joined	15:58
	→ devth joined	15:59
	← gavin_huang left	16:00
	→ bartek_ joined	16:00
	→ madewokherd joined	16:00
	← BlindOracle left	16:01
	→ dnstbr joined	16:01
	← crlane left	16:01
	← drougge left	16:03
	→ chuckharmston joined	16:03
	→ kevwil joined	16:03
	← bartek left	16:03
	← skyf left	16:04
	← notVert left	16:04
	→ hodgy joined	16:04
	← Desproges left	16:05
	← dc5ala left	16:06
EugeneKay	ldlework - I use a mirroring script that I wrote to push them to github when I push into gitolite	16:06
	← ajw0100 left	16:06
	← tmclaugh[work] left	16:06
	← senny left	16:07
	→ SegFaultAX\|work joined	16:07
ldlework	EugeneKay: i don't think that will fly as policy	16:07
EugeneKay	It only pushes repos which have bene configured to mirror	16:07
	If your policy is to open-source the repo it sounds exactly like what you want :-p	16:07
	← Tuna-Fish left	16:07
	← samphippen left	16:08
	→ rcu joined	16:09
ldlework	EugeneKay: except that pushing implicitly to the external repo means you can't do clean up or otherwise manage what is published	16:09
EugeneKay	You could set up a "Publish" branch that is the only thing which will get mirrored.....	16:09
	← dr_lepper left	16:09
	→ Tuna-Fish joined	16:09
	← dkl left	16:09
	← gerryvdm_mbp left	16:10
EugeneKay	Here's my hook if you like https://gist.github.com/3731485	16:10
	That's a post-receive btw. Here's the script I use to enable multihooks for my gitolite repos https://gist.github.com/3731490	16:10
	← irqq left	16:12
	→ Mode-M joined	16:12
	← FrenkyNet left	16:12
	→ rubious joined	16:12
	← ReekenX left	16:13
	→ samphippen joined	16:13
	← Tuna-Fish left	16:13
	← les_sylvains left	16:14
	← hodgy left	16:15
	← d3vic3 left	16:15
	← fletch_ left	16:15
	← witul left	16:16
	→ spaceonline joined	16:16
	→ xiangfu joined	16:16
	→ BlindOracle joined	16:17
	← bartek_ left	16:19
	← xiangfu left	16:19
	→ boombatower joined	16:19
	← mikecmpbll left	16:20
	← samphippen left	16:20
	→ flijten joined	16:21
	← flijten left	16:21
	→ ajw0100 joined	16:21
	→ hakunin joined	16:21
	← angelsl left	16:22
	→ Tuna-Fish joined	16:22
	→ hwrd\|work joined	16:22
	→ skyf joined	16:22
	→ jceb joined	16:22
	→ bartek joined	16:23
	← SegFaultAX\|work left	16:23
	← mmc1 left	16:24
	→ samphippen joined	16:24
	← samphippen left	16:25
	→ Altreus joined	16:26
	← Altreus left	16:27
	→ Altreus joined	16:27
Altreus	lo. How do I get git blame to show me the file in the index rather than the file with the changes in the working tree?	16:27
	As in, how do I find out who authored the line I just changed without changing it back?	16:27
	← afuentes left	16:28
cmn	tell it to start looking at HEAD, git blame HEAD -- file	16:28
Altreus	thanks	16:29
	:) o/	16:29
	← Altreus left	16:29
	→ mikecmpbll joined	16:29
	← LimeBlast left	16:29
	← Mode-M left	16:30
	← mikecmpbll left	16:31
	→ Hasbro joined	16:31
	→ paolino73 joined	16:31
	← Tuna-Fish left	16:32
	← paolino73 left	16:32
	→ dr_lepper joined	16:32
	← dr_lepper left	16:32
	→ dr_lepper joined	16:32
	→ gregm_ joined	16:32
	→ Tuna-Fish joined	16:32
	← nillian left	16:33
	← tjholowaychuk left	16:33
	→ whaley joined	16:34
	→ skorgon joined	16:34
	← hwrd\|work left	16:35
	← leokaito left	16:35
	→ john_anderson joined	16:37
	← juvenal left	16:37
	→ SegFaultAX\|work joined	16:38
	→ ReekenX joined	16:38
	→ etcetera joined	16:38
	→ Sigma joined	16:39
	← Hasbro left	16:40
	→ Hasbro joined	16:40
	→ juvenal joined	16:40
	→ dv310p3r joined	16:41
	→ Chillance joined	16:41
	→ fletch_ joined	16:41
	→ donri joined	16:42
	→ Anubisss__ joined	16:42
	→ GameGamer43_ joined	16:44
	← mstsirkin left	16:44
	→ thierryp_ joined	16:44
	→ the_cybersphinx joined	16:45
	→ eijk_ joined	16:45
	→ SkAzZ1 joined	16:45
	→ chrisgeorge_ joined	16:45
	→ intripoon_ joined	16:45
	→ suy_ joined	16:46
	→ Shusshu joined	16:46
	← Shusshu left	16:46
	→ AlbireoX`Laptop joined	16:46
	→ frem_ joined	16:46
	→ jaylevitt joined	16:46
	→ Tuna-Fish2 joined	16:46
ldlework	EugeneKay: got a blog? wanna write up a quick configuration guide?	16:47
	→ steveoliver_ joined	16:47
	→ tavisto_ joined	16:47
	→ hellopat_ joined	16:47
	→ danielfi_ joined	16:47
	→ nelse__ joined	16:47
EugeneKay	ldlework - company blog, but that's for more involved stuff.	16:47
	→ squawk joined	16:47
	← steveoliver_ left	16:47
	→ SegFault1X joined	16:48
ldlework	hokay.	16:48
EugeneKay	I'll write up better inline docs when I get around to making it what I consider "user ready". The comments you see there are for my own sanity	16:48
	→ fornext_ joined	16:48
	→ aristidesfl_ joined	16:48
EugeneKay	I drop this sort of thing into this repo https://github.com/EugeneKay/scripts	16:48
aboudreault	In my dev branch, how can I merge all commits in only 1?	16:48
	← Anubisss_ left	16:48
	← Tuna-Fish left	16:48
	← intripoon left	16:48
	← mgorbach left	16:48
	← chrisgeorge left	16:48
	← skoop left	16:48
	← boombatower left	16:48
	← suy left	16:48
	← nelse_ left	16:48
	← eijk left	16:48
	← SegFaultAX left	16:48
	← dv310p3r left	16:48
	← steveoliver left	16:48
	← revagomes left	16:48
	← SkAzZ left	16:48
	← fireh left	16:48
	← danielfilho left	16:48
	← frem left	16:48
	← GameGamer43 left	16:48
	← thierryp left	16:48
	← tavisto left	16:48
	→ boombatower joined	16:48
	← fornext left	16:48
	← ThomasLocke left	16:48
	← cybersphinx left	16:48
	← aristidesfl left	16:48
	← chaiz left	16:48
	← Jay_Levitt left	16:48
	tavisto_ → tavisto	16:48
	aristidesfl_ → aristidesfl	16:48
	← boombatower left	16:48
	→ boombatower joined	16:48
	→ dv310p3r joined	16:48
	← AlbireoX left	16:48
	→ revagomes joined	16:48
	← hellopat left	16:48
	→ ThomasLocke joined	16:48
	← boombatower left	16:48
	→ boombatower joined	16:48
	← boombatower left	16:48
	→ boombatower joined	16:48
	← ThomasLocke left	16:48
	→ ThomasLocke joined	16:48
	← todd_dsm left	16:48
EugeneKay	aboudreault - !sausage	16:48
	→ chaiz joined	16:48
	→ Pupeno_W_ joined	16:48
	→ skoopty joined	16:49
gitinfo	aboudreault: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect	16:49
aboudreault	EugeneKay, thanks	16:49
EugeneKay	bot is slow this morning.	16:49
squawk	hey guys, what would be the easiest way to restrict developers to pushing to just one branch (-dev), and managers to pull that branch to -stable	16:49
	→ fireh joined	16:49
	← fireh left	16:49
	→ fireh joined	16:49
EugeneKay	squawk - !gitolite has branch-based ACLs	16:50
gitinfo	squawk: 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	16:50
	← GameGamer43_ left	16:50
	← Pupeno_W left	16:50
	→ GameGamer43 joined	16:50
	← _numbers left	16:50
	← babilen left	16:50
	→ les_sylvains joined	16:51
	→ mgorbach joined	16:52
	→ fisted joined	16:52
	← dnstbr left	16:52
	→ hyperair joined	16:52
	→ jperry2_ joined	16:53
	→ Pupeno_W joined	16:53
	← bartek left	16:53
	→ bartek joined	16:53
	← Pupeno_W_ left	16:53
	← Uriziel left	16:53
	← giallu left	16:54
	← zenx left	16:54
	← Pupeno_W left	16:55
	← fisted_ left	16:55
	← svetlyak40wt_ left	16:55
	← dv310p3r left	16:56
	→ jubei joined	16:56
jubei	guys I did git pull, I made some changes, commited and then I tried to push them back to the origin but got rejected	16:57
	http://codepad.org/Pc2FujCc	16:57
	pull tells me I'm on HEAD of this branch so what's wrong?	16:58
	→ apok joined	16:58
FauxFaux	jubei: That is not what 'pull' says.	16:58
	← Tuna-Fish2 left	16:59
jubei	FauxFaux: Already up-to-date	16:59
FauxFaux	That means that you're already up to date with whatever branch you're pulling from..	16:59
squawk	that's pretty cool, so say it's another user on another box, assuming ssh keys added for git to pull from other box, my main goal is to separate the ability to push from developers to dev, and the ability to push from dev to prod, preferably git pull from another box	16:59
jubei	FauxFaux: ah ic!	16:59
	→ codeFiend joined	16:59
	→ Tuna-Fish joined	16:59
	→ marhaban joined	16:59
	← Natureshadow left	17:00
squawk	but i don't have two boxen to work with	17:00
	just one	17:00
jubei	FauxFaux: anyway I've pulled the correct branch and I'm still up-to-date. So why can't I pusH?	17:00
	→ Milossh joined	17:00
squawk	so i have to create different branches, does anyone have examples on the branch restrictions by ssh key name?	17:00
	other than the update-paranoid hook?	17:00
jubei	FauxFaux: i just noticed I'm on the wrong branch.	17:01
	FauxFaux: nvm sorry^_^	17:01
	→ hwrd\|work joined	17:01
	← apok left	17:02
	→ apok joined	17:02
	→ notVert joined	17:02
	← shruggar left	17:02
	→ opus joined	17:02
	→ FrenkyNet joined	17:02
	← opus left	17:02
	→ skyf_ joined	17:03
	→ _iron joined	17:03
	← whaley left	17:03
jubei	FauxFaux: here's what happened. I did "git pull origin mybranch" and thought I was on that branch so I started working on it. So when I commited and tried to push I realized I was making changes on the master branch on the branch I'd pulled. Is there anyway to apply this commit to the branch instead of the master? somehow? :)	17:03
	II realized I was making changes on the master branch, not the branch I'd pulled*	17:04
	← devth left	17:04
	← skyf left	17:05
	→ devth joined	17:05
	← berserkr left	17:06
	→ mmc1 joined	17:06
	← timj1 left	17:06
	← hwrd\|work left	17:06
	→ hwrd\|work joined	17:07
	→ timj joined	17:08
	→ fluxdude joined	17:08
	← Fretta left	17:08
	→ Goplat joined	17:11
	← jubei left	17:11
	→ ncr100 joined	17:14
	← marhaban left	17:14
	→ tomaw_ joined	17:15
	→ vdedik joined	17:16
	← Akufen left	17:16
	← SamB_MacG5 left	17:16
	← cakehero left	17:19
	← msmithng left	17:19
	← Vile left	17:19
	→ Akufen joined	17:19
	← Akufen left	17:19
	→ Akufen joined	17:19
	← suy_ left	17:20
	← apok left	17:21
	→ apok joined	17:22
	← vdedik left	17:22
	→ flavius joined	17:23
	→ pandeiro joined	17:23
	→ derrekito joined	17:25
	← bartek left	17:25
	← achadwick left	17:27
	→ virako joined	17:27
	→ daniel_- joined	17:27
	← daniel_- left	17:27
	→ jesseFromYVR joined	17:27
	→ bartek joined	17:28
	← OOPMan left	17:28
	→ sonic_baker joined	17:28
sonic_baker	Hi there. Anyone using OSX10.5?	17:29
	I'm having one of those days when absolutely nothing is working. Now I'm trying to do a 'git clone' over https but get errors. Tried downloading new root certs, still no go. Tried combining certs with 'sudo cat curl-ca-bundle.crt DigiCertHighAssuranceEVRootCA.crt > new-ca-bundle.crt' and I get: '-bash: new-ca-bundle.crt: Permission denied'	17:29
	Can anyone tell me why permission would be denied with sudo?	17:29
FauxFaux	That's not how sudo works. Run sudo -s, then run the command.	17:30
	← notVert left	17:30
	→ vdedik joined	17:30
	← vdedik left	17:31
	→ psoo joined	17:31
	→ funnyfingers_ joined	17:31
	→ eletuchy joined	17:32
	→ e66 joined	17:32
	→ sebastorama joined	17:32
	← funnyfingers left	17:32
	← les_sylvains left	17:32
	→ danillonunes joined	17:33
	← dansan left	17:33
	→ notVert joined	17:34
	← _huoxito left	17:34
	← bartman`` left	17:34
	← bartek left	17:35
sonic_baker	FauxFaux: If you were here right now I'd buy you a pint of Guinness!!!!!!	17:35
	→ thirdknife joined	17:35
sonic_baker	Problem (from all day) solved	17:35
	thanks v much	17:36
	→ bartman`` joined	17:36
FauxFaux	You should think about why what you wrote doesn't work. :)	17:37
	→ bartek joined	17:37
	← _aeris_ left	17:39
	← maxandersen1 left	17:39
	← fireh left	17:39
	→ maxandersen joined	17:39
	← maxandersen left	17:39
	→ maxandersen joined	17:39
	→ look2thelight joined	17:39
	→ cakehero joined	17:40
sonic_baker	I've never used the -s flag before. I'm used to Ubuntu so I usually just use sudo	17:40
	Also on osx	17:40
	→ fairuz_ joined	17:42
	← dpk left	17:43
	→ breck joined	17:43
FauxFaux	That command wouldn't work on ubuntu either.	17:44
	→ dpk joined	17:44
	→ amcsi joined	17:44
	→ OOPMan joined	17:44
	← Odjuret left	17:45
	bremner uses "sudo tee" for that	17:45
bremner	sometimes, anyway.	17:45
	→ opus joined	17:45
	→ _aeris_ joined	17:46
	← _aeris_ left	17:46
	← thirdknife left	17:46
	← amcsi left	17:47
	→ _aeris_ joined	17:47
EugeneKay	Shell redirection is a hell of a thing	17:47
	← notVert left	17:48
	→ thirdknife joined	17:48
	← thirdknife left	17:49
	→ ncd\|leeN joined	17:49
	→ thirdknife joined	17:50
	← jesseFromYVR left	17:51
	← thirdknife left	17:51
	→ SirCmpwn__ joined	17:51
	→ giallu joined	17:52
	→ thirdknife joined	17:52
	→ dv310p3r joined	17:52
	→ notVert joined	17:52
	→ samphippen joined	17:53
	← leeN left	17:53
	← fornext_ left	17:53
	← samphippen left	17:53
	dwmw2_go` → dwmw2_gone	17:54
	→ les_sylvains joined	17:54
	← SirCmpwn_ left	17:54
	← dv310p3r left	17:54
	→ dv310p3r joined	17:55
	→ bigfg joined	17:56
	← bigfg left	17:56
	→ marhaban joined	17:56
	→ maestrojed joined	17:57
maestrojed	I need to add a site to my git repo. Its a lot of files and subdirectories. Some of those subdirectories are blocked by .gitignore as they should be. But this means if I "git add site/*" It errors out "The following paths are ignored by one of your .gitignore files:"	17:57
	→ phantomtiger joined	17:57
maestrojed	Its says I can add a "-f" and it will work but it will also add all those ignored files. I just want it to add all the files that are not ignored.	17:58
	← dpk left	17:58
FauxFaux	maestrojed: ...it did.	17:59
EugeneKay	maestrojed - an error does not mean a failure. Look at `git status` and see if it's what you expected.	17:59
maestrojed	EugeneKay I checked. Files were not added. Well, a lot of files were not added that should have been.	18:00
FauxFaux	They're probably ignored.	18:01
maestrojed	It was just recommended that I force add everything and them removed the unwanted subdirectories	18:01
	FauxFaux they are not	18:01
	→ pantsman joined	18:01
	← pantsman left	18:01
	→ pantsman joined	18:01
maestrojed	FauxFaux according to my .gitignore	18:01
	→ pandeiro_ joined	18:02
	→ rath joined	18:02
FauxFaux	maestrojed: So, find one you think hasn't been added, check it's not in git status, then try git add'ing it?	18:03
maestrojed	FauxFaux and I tested, added just one file that wasn't added with the catch all command. It worked fine. So this error was a failure or at least a "bail"	18:03
	FauxFaux :)	18:03
FauxFaux	Well, diagnose the bug and submit a patch to the mailing list?	18:03
	→ srayner joined	18:03
	→ SamB_MacG5 joined	18:04
	← Hasbro left	18:04
	← pandeiro left	18:05
maestrojed	FauxFaux Ok, I didn't know this was a bug. I figured git was operating correctly and I didn't know the proper way to do this	18:05
	← cespare left	18:06
	← squiddy left	18:06
	→ savid joined	18:07
	→ jesseFromYVR joined	18:08
savid	I was setting up a local repo, and staged my initial files, but didn't commit. I then set up the remote on github, which added a README.md and .gitignore file on the remote. After adding the remote, I accidentally did "git pull" instead of "git push", and my staged files have disappeared. Can I get them back?	18:09
	← dv310p3r left	18:09
	→ cespare joined	18:10
	→ Geralt joined	18:11
	← Geralt left	18:11
	→ Geralt joined	18:11
	← giallu left	18:11
	→ felipec joined	18:12
	→ tvw joined	18:12
	→ dpk joined	18:12
	← marhaban left	18:15
	← guampa left	18:15
	→ johnlcox joined	18:16
	← _aeris_ left	18:16
	← wolog left	18:17
	← rcu left	18:17
	→ guampa joined	18:17
	← thirdknife left	18:18
	→ thirdknife joined	18:18
	← thirdknife left	18:18
	← opus left	18:20
	→ dsirijus joined	18:21
	→ wolog joined	18:21
	→ _aeris_ joined	18:22
	→ aspotashev joined	18:23
	→ Targen joined	18:23
	→ opus joined	18:24
	→ marhaban joined	18:24
	→ dv310p3r joined	18:25
	→ eugen_ joined	18:25
	→ rednaks joined	18:25
	← rednaks left	18:25
	→ rednaks joined	18:25
	eugen_ → Guest78343	18:25
	→ flijten joined	18:26
	→ shruggar joined	18:26
	← flijten left	18:26
	← Guest78343 left	18:26
	→ EugenA joined	18:27
	← notVert left	18:27
EugenA	if i push to remote repository, i set also the file permission for some files in .git directory. So, other people cannot push anything any more	18:27
	how can i set different permissions on upload?	18:27
	uploading from windows with git for windows	18:28
	→ danlentz joined	18:28
	← chuckharmston left	18:29
	← intransit left	18:29
	← _aeris_ left	18:30
	→ babilen joined	18:30
	← chrisgeorge_ left	18:30
_ikke_	EugenA: There are better ways	18:31
	← erichynds left	18:31
	→ _aeris_ joined	18:31
EugenA	_ikke_: i'm listening :-)	18:31
_ikke_	EugenA: Using hooks	18:32
	pre-receive hooks to be more specific	18:32
	← shruggar left	18:33
EugenA	wow.. i'm not such advanced user yet :-)	18:33
	→ dnstbr joined	18:33
_ikke_	EugenA: Can you write simple scripts?	18:33
	EugenA: Do you want to prevent all pushes?	18:34
	→ chuckharmston joined	18:34
	← gtrak left	18:34
	→ gtrak joined	18:35
	← gtrak left	18:35
	→ metcalfc joined	18:36
	← pandeiro_ left	18:37
	→ gtrak joined	18:37
EugenA	_ikke_: i don't want to prevent the pushes, i want to prevent changing file rights	18:37
	← metcalfc left	18:37
	→ armenianeagle joined	18:37
	← chuckharmston left	18:37
	← Targen left	18:37
_ikke_	EugenA: Oh, I get it	18:37
	← gtrak left	18:37
	→ chuckharmston joined	18:37
	→ gtrak joined	18:38
	← psoo left	18:39
	→ lb joined	18:40
	← marcusbrandt left	18:41
	← Sargun left	18:41
	→ metcalfc joined	18:41
	→ ezrafree joined	18:41
	← chuckharmston left	18:42
	→ psoo joined	18:42
	→ patrickgamer1 joined	18:43
	← danlentz left	18:43
	→ dreiss joined	18:43
	← dpk left	18:43
	→ Eridius joined	18:44
	→ dpk joined	18:45
	→ pnkbst joined	18:46
	← dv310p3r left	18:47
pnkbst	I'm trying to cherry-pick from one branch to another. this has always worked before, but now I'm getting the error "fatal: bad object e9867b62e97ee4e55bc0f399076c89f0d14e2c6a"	18:48
	is there a fix for this or is this a git bug?	18:48
	→ rohan32 joined	18:49
cmn	your repo is busted	18:49
pnkbst	awesome	18:49
	← nwest left	18:49
	→ Sargun joined	18:49
	← indel left	18:49
lb	\o/	18:49
	← psoo left	18:50
cmn	your filesystem did something weird, you can use git fsck --no-dangling to see the extent of the damage	18:51
	← nelse__ left	18:51
pnkbst	it appears to be the server filesystem because I just cloned a new copy of the source and I'm still getting the error O_o	18:52
	→ shruggar joined	18:52
	→ lindenle_ joined	18:53
cmn	you can't clone a broken repo	18:53
pnkbst	joy. looks like it's time to slip schedule :P	18:55
	→ psoo joined	18:55
	→ jdmax joined	18:55
	← _aeris_ left	18:56
jdmax	ping git [newbie-question] is it possible to 'git cherry-pick' several commits into one?	18:57
	← ncr100 left	18:57
	← skorgon left	18:57
	→ aeris_ joined	18:57
	← patrickgamer1 left	18:58
FauxFaux	jdmax: cherry-pick with -n. Or learn to use rebase --interactive.	18:58
jdmax	FauxFaux: thanks	18:58
	← LeMike left	19:00
	→ _aeris_- joined	19:00
	← _aeris_- left	19:00
	→ Dno joined	19:00
	→ LeMike joined	19:01
	→ Targen joined	19:01
	→ _aeris_- joined	19:01
	→ aldodelgado joined	19:01
	← aeris_ left	19:02
	→ nitrate__ joined	19:02
	← kevwil left	19:02
	→ Bass10 joined	19:02
	→ dp joined	19:03
	← Bass10 left	19:03
	→ kevwil joined	19:03
	← dhruvasagar left	19:04
	→ Bass10 joined	19:04
	← ipalaus left	19:04
dp	I want to have git store my website, but want to use something like bitbucket or github. Is there a way, from my server, to pull the content directly from the remote, without having to set up a git repo on my server?	19:04
	← reuf left	19:04
	→ ipalaus joined	19:04
FauxFaux	dp: !deploy	19:04
gitinfo	dp: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html	19:04
	← rath left	19:04
	← ShadeTornado left	19:04
	→ ShadeTornado joined	19:05
dp	thanks	19:05
	← dp left	19:05
	← nitrate_ left	19:06
	→ nickpresta joined	19:06
	← NcA^ left	19:07
	→ NcA_ joined	19:07
	→ jschall_ joined	19:07
	→ kvanderw joined	19:07
	← psoo left	19:07
	→ takus_ joined	19:08
	← marthinal left	19:09
	→ patrickgamer1 joined	19:09
	← chaiz left	19:09
	← rubious left	19:09
	← jschall left	19:10
	← EugenA left	19:11
	← SegFaultAX\|work left	19:11
	← takus_ left	19:11
	→ The-Compiler joined	19:12
	→ chaiz joined	19:12
The-Compiler	heya. I'd like to delete a branch in a remote repository, how can I do that?	19:13
	→ takus joined	19:13
_ikke_	The-Compiler: git push --delete <remote> <branch>	19:13
	← ReekenX left	19:13
	← _aeris_- left	19:13
The-Compiler	_ikke_: perfect, thanks	19:14
	→ noscript joined	19:14
	→ msmithng joined	19:15
C8H10N4O2	how to reset to last commit	19:15
	i deleted images I didnt want to	19:15
bremner	C8H10N4O2: !fixup	19:15
gitinfo	C8H10N4O2: 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!	19:15
C8H10N4O2	thanks	19:15
	← tvw left	19:17
	→ tvw joined	19:18
	→ marthinal joined	19:18
	→ aeris_ joined	19:19
	→ duckx joined	19:19
maxandersen	i got a remote branch called origin/master and origin/trunk - i've managed to delete it remotely (git push origin :origin/master and git push :origin/trunk) ….but how do I get the local representation deleted so when I do a git push it wont push them too ?	19:19
	← etcetera left	19:19
	← Lgb left	19:20
_ikke_	maxandersen: git remote prune origin	19:20
maxandersen	what does that do ? :)	19:21
	ah it has a dry run…good ;)	19:21
	→ Lgb joined	19:21
	← duckxx left	19:21
	→ pandeiro joined	19:22
maxandersen	_ikke_: doesnt seem to do anything ;(	19:22
_ikke_	maxandersen: Because you didn't delete the actual branches	19:22
maxandersen	_ikke_: they aren't listed remotely anymore.	19:23
_ikke_	Hmm, that syntax is off	19:23
	← jesseFromYVR left	19:23
maxandersen	_ikke_: git branch -d origin/trunk doesn't work	19:23
	← revagomes left	19:23
_ikke_	git branch -rd origin/trunk	19:23
cmn	origin/trunk isn't a branch, it's a remote-tracking branch	19:23
	← les_sylvains left	19:24
pnkbst	it is possible for only one branch in a git repo to be borked, right?	19:24
	→ erichynds joined	19:24
	→ revagomes joined	19:24
	→ etcetera joined	19:24
_ikke_	pnkbst: A branch is only a pointer	19:24
cmn	it's possible for only some of the objects to be broken	19:24
	and if those objects are only referenced by one branch, you could say that, maybe	19:24
maxandersen	yeah so how do i delete this remote tracking branch so it does not keep being pushed :)	19:25
	← hoschi left	19:25
	← dreiss left	19:25
cmn	that doesn't happen	19:25
	remote-tracking branches don't get pushed	19:26
	what is the situation? do you have a branch in a remote that you don't want anymore?	19:27
	→ EugenA joined	19:27
	← imMute left	19:27
	→ pheaver joined	19:27
	← dnstbr left	19:28
	← skoopty left	19:28
	→ skoop joined	19:28
	← aeris_ left	19:28
	→ sluther joined	19:29
EugenA	so, if i clone repository from the server over ssh and then push my changes back to it, the file permissions getting wrong	19:29
	→ svetlyak40wt joined	19:30
EugenA	i had write access for group, after pushing group doesn't have write access any more. So noone can push	19:30
FauxFaux	Friends don't let friends use --shared; use !gitolite.	19:30
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	19:30
	→ aeris_ joined	19:30
	← aeris_ left	19:30
_ikke_	FauxFaux: kik	19:32
	lol	19:32
	→ aeris_ joined	19:32
	→ dnstbr joined	19:32
	→ waynr joined	19:33
maxandersen	cmn: yes I have a branch in remote that was accidentally pushed.	19:33
cmn	and is that branch named origin/trunk on the remote or is that just the remote-tracking name?	19:33
_ikke_	maxandersen: git branch -rd origin/trunk	19:33
maxandersen	cmn: i got a git svn fetched repo that is setup to get rebased every 15minutes and then do a git push	19:33
EugenA	so i cannot manage this only with git?	19:34
	← Mogget left	19:34
waynr	hi, i am trying to figure out a command that, given two commits, only lists the files that changed between those two commits so i can narrow down a problem introduced by a merge of to really large trees	19:34
_ikke_	EugenA: You can, but it is a mess	19:34
EugenA	ko	19:34
	ok	19:34
	→ Mogget joined	19:34
maxandersen	_ikke_: i have no idea why that worked now….	19:35
cmn	waynr: git diff --name-only A B	19:35
	→ ph^ joined	19:35
	← svetlyak40wt left	19:35
_ikke_	maxandersen: Because of the -r	19:35
maxandersen	_ikke_: but…but…(fail) :)	19:36
	→ rubious joined	19:36
	→ chrisgeorge joined	19:36
	→ svetlyak40wt joined	19:36
waynr	very nifty, thanks cmn	19:36
maxandersen	thanks _ikke_	19:36
	← sonic_baker left	19:37
	→ jesseFromYVR joined	19:37
	← svetlyak40wt left	19:37
	→ svetlyak40wt joined	19:37
	→ SegFaultAX\|work joined	19:37
	← Dno left	19:38
	← svetlyak40wt left	19:39
	→ svetlyak40wt joined	19:39
	→ pdtpatrick joined	19:39
	→ arietis joined	19:39
	← nitrate__ left	19:40
	← NcA_ left	19:41
	→ aselder joined	19:41
	← macabre left	19:42
	← hwrd\|work left	19:43
	← svetlyak40wt left	19:44
	→ svetlyak40wt_ joined	19:44
	← erichynds left	19:44
	← e66 left	19:44
	← null0 left	19:45
	→ nelse_ joined	19:45
	← Sigma left	19:45
	← svetlyak40wt_ left	19:45
	→ svetlyak40wt joined	19:46
	← beneggett left	19:46
	→ [1]srayner joined	19:48
	← aselder left	19:49
	← srayner left	19:49
	→ beneggett joined	19:51
	→ macabre joined	19:52
	→ john2496 joined	19:53
	← jceb left	19:55
	← EugenA left	19:56
	→ sorin joined	19:57
	→ hwrd\|work joined	19:57
	→ MyTallest joined	19:58
	← patrickgamer1 left	19:58
	← savid left	19:58
	← rob_w left	20:00
	ChanServ set mode: -v	20:00
	→ savid joined	20:00
	→ thillux_ joined	20:01
	← rubious left	20:01
	→ bloony joined	20:01
	← hwrd\|work left	20:02
	← marthinal left	20:03
	→ jesseFromYVR_ joined	20:04
	← frsk left	20:04
	← thillux left	20:04
	→ frsk joined	20:06
	← aldodelgado left	20:06
	← nelse_ left	20:06
	← ThomasLocke left	20:07
	← jesseFromYVR left	20:07
	jesseFromYVR_ → jesseFromYVR	20:07
	← skyf_ left	20:08
	← opus left	20:08
	← enigma32 left	20:09
	→ dc5ala joined	20:10
	← svetlyak40wt left	20:10
	← dpk left	20:10
	→ opus joined	20:10
	→ cybersphinx joined	20:13
	← jdunck left	20:14
	→ hwrd\|work joined	20:15
	← koltroll left	20:15
	→ sq-one joined	20:16
	← the_cybersphinx left	20:17
jackyyll	so i have a branch that i made changes to code with, that eventually got merged into master. my changes were then overwritten by another person and i'm trying to re-merge my branch to redo my changes but it just says "Already up-to-date.". How can i re-merge that branch?	20:17
milki	jackyyll: what do you mean by "overwritten"	20:18
	← zeen left	20:18
	← maestrojed left	20:18
	← Geralt left	20:19
	← yhager left	20:20
	← cehteh left	20:21
jackyyll	sorry milki	20:22
	well	20:22
	im not really sure what happened	20:22
milki	git log should tell you	20:22
	o.O	20:22
jackyyll	im assuming the person had a conflict, and deleted my changes	20:22
	→ cehteh joined	20:22
milki	ok, so they were undone in subsequent commits	20:22
jackyyll	yes sorry that's what i mean	20:23
milki	so you cant merge commits that have been merged before	20:23
	because those commits are already in the history	20:23
jackyyll	i see.	20:23
	→ Vile joined	20:23
milki	you can rebase your branch which effectively makes all your commits different commits	20:23
	→ macrover joined	20:23
milki	and then merge the newly rebased branch	20:23
	→ AdrienBrault joined	20:24
jackyyll	so i'd goto my branch for that feature/change... and then type git rebase .. what do i put here?	20:24
m1sc	probably you should fix the social / git issues first	20:24
	← geekbri left	20:24
	→ rubious joined	20:25
	→ todd_dsm joined	20:25
	→ kcj joined	20:27
	← aantix left	20:27
	← danillonunes left	20:27
	← SegFaultAX\|work left	20:27
	← chaiz left	20:28
	← waynr left	20:29
	→ deanclkclk joined	20:32
	→ svetlyak40wt joined	20:32
	→ dv310p3r joined	20:32
	→ irqq joined	20:32
	← svetlyak40wt left	20:33
	← noscript left	20:33
	→ zastern joined	20:33
	← savid left	20:33
	← rubious left	20:34
	← spaceonline left	20:34
	→ ajacom joined	20:34
	→ daniel_- joined	20:34
	→ chaiz joined	20:35
	← kevwil left	20:35
	→ Natureshadow joined	20:35
	← ajacom left	20:36
	→ cheriv joined	20:37
	→ kevwil joined	20:38
	→ fireh joined	20:39
	← fireh left	20:39
	→ fireh joined	20:39
	← Element9 left	20:39
	→ florin joined	20:39
	→ rubious joined	20:40
	florin → Guest75212	20:40
	→ vdedik joined	20:40
	← vdedik left	20:41
	← rubious left	20:41
	← samuel02 left	20:41
	→ sjohnson joined	20:41
sjohnson	hi. I noticed git status says, (use "git reset HEAD <file>..." to unstage). what happens if i want to unstage a lot of files? just suck it up and copy and paste the names?	20:42
thiago	or type a directory name	20:42
	that unstages all that match	20:42
	. to unstage absolutely everything	20:42
sjohnson	what happens to files in the "not staged for commit" section? nothing?	20:42
	→ ncr100 joined	20:43
	← kvothe left	20:43
	← [1]srayner left	20:43
	← LittleFool left	20:43
thiago	sjohnson: same procedure, but it's git checkout	20:43
sjohnson	i gotta be careful then	20:43
thiago	git checkout <file>	20:43
	or git checkout HEAD <file>	20:43
sjohnson	i don't want them checked out	20:44
thiago	reset modifies the index, checkout modifies the checkout	20:44
sjohnson	i want them to do the "nothing" part in the above scenario	20:44
	← torjus_ left	20:44
sjohnson	sounds like you're saying "nothing will happen"	20:44
	← drupin left	20:44
	← ph^ left	20:45
	→ ph^ joined	20:45
	→ ajacom joined	20:46
	→ danillonunes joined	20:46
	← jbub left	20:46
	→ crabmanX joined	20:48
	← AaronMT left	20:48
	← aspotashev left	20:49
	→ witul joined	20:49
	→ dpk joined	20:51
	← aeris_ left	20:51
	← deanclkclk left	20:51
	→ deanclkclk joined	20:52
	← macrover left	20:52
	← cheriv left	20:53
	→ _Vi joined	20:53
	← Targen left	20:53
	→ aeris_ joined	20:53
	← aeris_ left	20:53
	→ cheriv joined	20:53
	→ deanclkclk473 joined	20:54
	→ aeris_ joined	20:54
	gitinfo set mode: +v	20:56
deanclkclk	hello	20:56
gitinfo	deanclkclk: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	20:56
NfNitLoop	I've always been curious -- why is 'git annotate <file>' nearly instant, but 'git gui blame <file>' takes forever to gradually fill in blame annotations?	20:56
deanclkclk	I am having a problem	20:57
	← marhaban left	20:57
deanclkclk	http://tinypic.com/r/2iiur6/6	20:57
	why my tree looks like this?	20:57
	← deanclkclk473 left	20:57
NfNitLoop	deanclkclk: You may find http://eagain.net/articles/git-for-computer-scientists/ useful.	20:58
	It looks like you've made some local commits that haven't been merged into origin/master yet.	20:59
	fairly normal.	20:59
sjohnson	thiago: just to make sure i don't screw this up.. if i do git reset HEAD ., it won't modify / checkout / do anything to the actual contents of the files under the "not staged for commit" section?	20:59
	← freeed left	20:59
	→ wonder95 joined	20:59
	→ nutron\|w joined	20:59
	← john2496 left	21:00
deanclkclk	NfNitLoop: but, I am trying to resolve conflicts	21:00
	and I try to merge..I am getting an error	21:00
	not sure what it is	21:00
	← armenianeagle left	21:01
	← cannonball left	21:01
	→ jcao219 joined	21:01
	→ jimmyeatworld joined	21:01
dimka	I have commits `A → B → C → D → E → F` in `br` branch. I wanna merge `br` branch in `master` branch, but with merge history like `A → X → E → F`, where X is B,C,D commits collapsed in one. How can I do that?	21:02
	← bartek left	21:02
	← Zenopus left	21:02
sjohnson	thiago: you're probably afk. i'll do an md5sum check and zip backup just to make sure	21:03
	→ samphippen joined	21:04
deanclkclk	Some conflicting changes cannot be merged automatically. These changes will have to be merged manually. Some conflicting changes cannot be merged automatically. These changes will have to be merged manually.	21:04
	→ robustus joined	21:04
	← dc5ala left	21:05
	← jdmax left	21:05
sjohnson	thiago: md5sum test shows it worked as expected. thanks again!!	21:06
	← rohan32 left	21:06
	→ LucasTizma joined	21:06
	← whitman left	21:06
	→ antigremlin joined	21:07
NfNitLoop	deanclkclk: see "Basic Merge Conflicts" in: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging	21:07
	→ rohan32 joined	21:08
	← tplaner_ left	21:08
	← Guest75212 left	21:09
	← robustus left	21:10
	← wongon left	21:10
	← dzonder left	21:11
	→ worstadmin joined	21:12
	→ jdmax joined	21:12
	← jdmax left	21:12
	→ jdmax joined	21:12
	→ SegFaultAX\|work joined	21:13
	← aeris_ left	21:13
	→ _aeris_ joined	21:13
	← pandeiro left	21:14
	← OOPMan left	21:14
	→ linguini joined	21:14
	← mabrand left	21:15
	← _Vi left	21:15
	← irqq left	21:15
	→ mabrand joined	21:15
	→ _Vi joined	21:15
	← lindenle_ left	21:15
	→ jpmelos joined	21:15
deanclkclk	# On branch master # Your branch and 'origin/master' have diverged, # and have 2 and 9 different commits each, respectively. # # Changes to be committed:	21:16
	→ Geralt joined	21:16
	← Geralt left	21:16
	→ Geralt joined	21:16
deanclkclk	ok git status gives me this ^	21:16
linguini	I have a temporary branch I want to incorporate into another branch, and then throw away the original. I think I can do this through 'git merge', 'git rebase', or 'git cherry-pick'. Is one of these "best"?	21:16
deanclkclk	# On branch master # Your branch and 'origin/master' have diverged, # and have 2 and 9 different commits each, respectively. # # Changes to be committed:	21:16
linguini	git branch # master, tmp, topic	21:17
	← thierryp_ left	21:17
deanclkclk	linguini: I believe what u are looking for is rebase	21:17
	← adam_g left	21:17
linguini	deanclkclk: Thanks; in that case, I'll continue trying to understand 'man git-rebase.'	21:18
gitinfo	deanclkclk: the git-rebase manpage is available at http://git-scm.com/docs/git-rebase.html	21:18
	← jcao219 left	21:18
	→ jcao219 joined	21:18
	→ Ecesis joined	21:19
	← antigremlin left	21:19
	← opus left	21:20
	→ reuf joined	21:20
	← jdmax left	21:21
	← lb left	21:22
	← swiety left	21:22
	← devsharpen left	21:23
	← Geralt left	21:23
	← C8H10N4O2 left	21:23
	← SegFaultAX\|work left	21:23
	← hellopat_ left	21:24
	→ cagedwisdom joined	21:24
	← virako left	21:25
	→ aircan joined	21:25
	→ Aprogas joined	21:27
	→ C8H10N4O2 joined	21:29
	← alexisabril left	21:31
	← _iron left	21:31
	← bubbles10101 left	21:31
	→ irqq joined	21:31
	→ oddityoverseer joined	21:31
	→ bubbles10101 joined	21:31
	← jpmelos left	21:33
	← oddityoverseer left	21:33
	→ oddover joined	21:33
	→ bubbles1_ joined	21:33
	→ dogarrhea2 joined	21:34
	← bubbles10101 left	21:34
	← kevwil left	21:34
	← ajacom left	21:34
	→ oddityoverseer joined	21:34
	← bapa left	21:35
	→ nelse_ joined	21:35
	← LeMike left	21:35
	← oddover left	21:36
	gitinfo set mode: +v	21:36
	→ oddover joined	21:36
	gitinfo set mode: +v	21:36
	← oddover left	21:36
	← tvw left	21:37
oddityoverseer	Hey all. Is there a git command to get all the revision hashes for a remote repo (like ls-remote gives tags)	21:37
	← codeFiend left	21:37
milki	oddityoverseer: what do you mean by all?	21:37
	oddityoverseer: every single commit ever made?	21:38
oddityoverseer	doesn't have to be	21:38
	could be last 100 or something	21:38
	or 20	21:38
milki	you cant do that	21:38
	← deanclkclk left	21:38
milki	you can only get refs	21:38
	← jkremser left	21:38
	← funnyfingers_ left	21:38
milki	from those refs, you can get the ref history though after you've fetched them	21:38
oddityoverseer	ok	21:39
	→ funnyfingers joined	21:39
	← rednaks left	21:39
	← hwrd\|work left	21:40
	← oddityoverseer left	21:40
	→ LeMike1 joined	21:40
	← aristidesfl left	21:40
	← irqq left	21:40
	← sebastorama left	21:40
	← cakehero left	21:41
	← MyTallest left	21:41
	→ bapa joined	21:41
	← felipec left	21:43
	→ jbrechtel joined	21:43
	→ cakehero joined	21:45
	← tinti_ left	21:45
	← jesseFromYVR left	21:45
	→ tinti joined	21:45
	← arietis left	21:45
	→ jdunck joined	21:45
	← sq-one left	21:46
	→ kevwil joined	21:47
	→ opus joined	21:47
maxandersen	besides doing that !big tells you that finds the largest blobs …. is there a way to find out "space stealing" files ? i.e. which directories that are the biggest (i.e. things that over all gets big because of many small/medium files changing often?)	21:48
gitinfo	[!large_files] Git isn't yet great at large files(larger than RAM). Look at !annex for solutions. You can find them (after gc) with: git verify-pack -v .git/objects/pack/pack-*.idx \| grep blob \| sort -k3nr \| head \| while read s x b x; do git rev-list --all --objects \| grep $s \| awk '{print "'"$b"'",$0;}'; done	21:48
	→ theshadow joined	21:48
	gitinfo set mode: +v	21:48
	rohan32 → rohan32\|afk	21:51
	→ _huoxito joined	21:52
	← ajw0100 left	21:52
	→ hwrd\|work joined	21:53
	← talha left	21:53
	← daniel_- left	21:55
	← dv310p3r left	21:56
	← talexb left	21:56
	← bapa left	21:57
	→ hays_ joined	21:58
	→ felipec_ joined	21:58
	felipec_ → felipec	21:59
	→ PatF joined	22:00
	→ dv310p3r joined	22:01
	← jperry2_ left	22:01
	← alunduil left	22:02
	← tinti left	22:02
	→ psoo joined	22:02
	→ bunni joined	22:02
maxandersen	anyway to git grep on filenames in the history ? i.e. git grep for any *.class files accidentally committed?	22:03
	← Destos left	22:03
	→ tinti joined	22:03
	← kermit left	22:04
wereHamster	maxandersen: git log -- '*.class'	22:04
	← PatF left	22:04
maxandersen	oh...	22:04
	hmm … donest seem to work.	22:05
	→ kermit joined	22:05
	→ daniel_- joined	22:05
	← RaceCondition left	22:05
maxandersen	wereHamster: i.e. git log — '*.jar' doesnt work and i know for sure it exists in this repo	22:05
	← jbrechtel left	22:05
	→ mvensky joined	22:06
felipec	maxandersen: double dash: - -	22:06
maxandersen	yeah, its there --	22:07
	no result	22:07
felipec	if you want to search in all the branches, then: git log --all -- '*.jar'	22:07
maxandersen	nada	22:07
	← ShadeTornado left	22:07
maxandersen	'*.html' hits nothing either	22:08
	and i for sure know they are there ;)	22:08
cmn	rae you using an old git vresion?	22:08
wereHamster	maxandersen: how about git log --name-status \| grep 'jar$' ? Does it produce any output?	22:08
	← bunni left	22:08
maxandersen	yup plenty ;)	22:08
felipec	maxandersen: I wouldn't be so sure	22:09
	← psoo left	22:09
maxandersen	git version 1.7.4.4	22:09
	← scarlisle left	22:09
cmn	that'll be why	22:09
maxandersen	is that old ? :)	22:09
	← hwrd\|work left	22:09
cmn	magic pathspecs came in later	22:09
wereHamster	maxandersen: Date: Wed Apr 6 10:50:06 2011 -0700	22:09
	→ AaronMT joined	22:09
maxandersen	damn apple ;)	22:10
	or is it macports…i forget ;)	22:10
cmn	don't use that if they provide such old versions	22:11
	homebrew has newer IIRC, and there are prebuilt packages	22:11
	→ bapa joined	22:12
	← tinti left	22:12
	→ tinti_ joined	22:12
	→ tvw joined	22:12
	← derpops left	22:13
	→ jperry2_ joined	22:13
Aprogas	I get repeatable "early EOF" and "unpack-objects abnormal exit" when doing git push from Windows (1.7.11.msysgit.0) to FreeBSD (1.7.11.1) over ssh. http://pastebin.com/5r13iujw	22:14
	But when I am on my home network it seems to not occur.	22:14
	→ arietis joined	22:15
	← _Vi left	22:15
cmn	have you tried doing an scp of a file of comparable size between those two machines?	22:15
	← martinjlowm left	22:16
	← TeckniX left	22:16
	← cyphase left	22:16
	→ _Vi joined	22:16
	→ TeckniX joined	22:17
	← sgambino left	22:17
	← sh4rm4 left	22:17
	← pantsman left	22:18
	← Milossh left	22:18
	← revagomes left	22:18
	→ sh4rm4 joined	22:19
	← jperry2_ left	22:19
	→ runvnc joined	22:19
runvnc	Can 'git remote rm origin' delete files? I spent like 2 hours working on this, it was perfect, then I started messing with git	22:20
Aprogas	Using pscp.exe I get "Server sent command exit status 128", I will investigate this.	22:20
runvnc	now all the files are gone except the folder that was in .gitignore	22:20
	← opus left	22:20
runvnc	cant figure out how to just get my files back	22:20
	→ jesseFromYVR joined	22:20
	← dangerousdave left	22:21
cmn	git remote doesn't touch your worktree	22:21
	if you haven't committed yet, git checkout -f will put the files back where they belong	22:21
	← arietis left	22:21
runvnc	cmn thanks	22:22
	f u [	22:23
	I mean darn double darn. what the heck did I do	22:23
	https://gist.github.com/3823706	22:23
	maybe I should rm the new origin	22:24
	← ncd\|leeN left	22:24
	← AdrienBrault left	22:25
	← Dreamer3 left	22:25
	→ macrover joined	22:26
	← gusnan left	22:26
runvnc	maybe I can get my files out of .git/objects	22:28
Aprogas	Using my own user for the pscp.exe test does transfer the file, using git as user does not.	22:28
	← tvw left	22:28
	→ tvw joined	22:29
	← bapa left	22:29
cmn	runvnc: !fixup	22:29
gitinfo	runvnc: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	22:29
	→ AdrienBrault joined	22:29
	← dnstbr left	22:29
runvnc	thanks	22:29
	← crabmanX left	22:30
	→ armenianeagle joined	22:30
	← shruggar left	22:31
	← macrover left	22:32
	← duckx left	22:33
	→ Dreamer3 joined	22:34
	← bubbles1_ left	22:35
runvnc	I have dangling blobs	22:35
	→ bubbles10101 joined	22:35
	→ aselder joined	22:36
runvnc	I see my files! yay. I am crying a little	22:36
	→ rubious joined	22:36
	→ jesseFromYVR_ joined	22:37
milki	o noes!	22:37
	o	22:37
	you want the dangling blobs	22:37
runvnc	no they are tears of joy/relief	22:37
milki	yay	22:38
runvnc	I think I am going to recover the files with this fsck thing and start over with a new working dir and type the right things into git	22:38
	← jesseFromYVR left	22:38
	jesseFromYVR_ → jesseFromYVR	22:38
	→ hwrd\|work joined	22:39
Aprogas	cmn: My user git has git-core/git-shell as shell. Do I need to put /usr/bin/scp in ~/git-shell-commands to use scp?	22:40
	← hwrd\|work left	22:40
	← ncr100 left	22:40
runvnc	thanks you cmn	22:41
	or thank you even	22:41
	→ opus joined	22:42
	→ hwrd\|work joined	22:44
	← aselder left	22:45
	← jimmyeatworld left	22:45
	← chrisgeorge left	22:46
	← macabre left	22:46
	→ cyphase joined	22:46
	← patrick85 left	22:46
	← mabrand left	22:49
	← tvw left	22:50
	← TheJH left	22:51
	→ Hasbro joined	22:52
	← zastern left	22:56
	→ Davey joined	22:57
	← simesy_work left	22:57
	→ simesy_work joined	22:58
	← AdrienBrault left	22:59
	← SirCmpwn left	22:59
	← kukks left	23:00
	→ kukks joined	23:00
	← kukks left	23:00
	→ kukks joined	23:00
	← FrenkyNet left	23:00
	← kevwil left	23:01
	← kukks left	23:01
	← Sky[x] left	23:01
	← trungqtran left	23:01
	← frem_ left	23:02
	← nutron\|w left	23:04
	← simesy_work left	23:05
	← quazimodo left	23:06
	→ simesy_work joined	23:06
	→ BSaboia joined	23:06
	SirCmpwn__ → SirCmpwn	23:09
	← AaronMT left	23:10
	← simesy_work left	23:10
	→ Destos joined	23:10
	→ simesy_work joined	23:11
	← tonyj left	23:12
	← tinti_ left	23:12
	← sorin left	23:12
	→ aristidesfl joined	23:13
	→ bartek joined	23:15
	← Destos left	23:16
	← KrizOne left	23:16
	← nickpresta left	23:16
	← eijk_ left	23:17
	← Davey left	23:17
	TeckniX → TeckniX_AFK	23:20
	← dougsland left	23:21
	→ dougsland joined	23:22
	→ davidban_ joined	23:22
	→ tonyj joined	23:22
	→ retro\|cz joined	23:22
	→ notfunk joined	23:24
	→ alunduil joined	23:25
	→ itatitat joined	23:26
	← john_anderson left	23:27
	← _Vi left	23:27
	→ _Vi joined	23:28
	← davidban_ left	23:29
	← hwrd\|work left	23:29
	← roland_ left	23:30
	← Chillance left	23:31
	→ marhaban joined	23:31
	→ gavin_huang joined	23:32
	← boombatower left	23:32
	→ the_cybersphinx joined	23:33
	← samphippen left	23:34
	→ diegoviola joined	23:35
	← episage left	23:35
	← cybersphinx left	23:36
	← marhaban left	23:37
	→ ajw0100 joined	23:37
	← gavin_huang left	23:37
	→ hwrd\|work joined	23:37
	→ rchavik joined	23:37
	← rchavik left	23:37
	→ rchavik joined	23:37
	→ roland joined	23:38
	← etcetera left	23:40
	← thiago left	23:40
	→ Mannequin joined	23:41
	← dv310p3r left	23:42
	← danillonunes left	23:44
	→ jokajak` joined	23:46
	← cyphase left	23:47
	← jokajak left	23:47
	→ ikolev joined	23:48
	→ gavin_huang joined	23:48
	← tchan left	23:49
Aprogas	I was able to resolve my git push error by using the ssh.exe provided by git, instead of plink.exe from putty	23:49
	← jokajak` left	23:50
	→ jokajak joined	23:51
retro\|cz	Hello. Is there any chance to format diff in git diff style?	23:51
	← simesy_work left	23:51
milki	im seen a --git flag in diff before	23:52
	ive*	23:52
	→ etcetera joined	23:52
	→ simesy_work joined	23:52
	→ Davey joined	23:52
	→ cyphase joined	23:53
	← simesy_work left	23:53
	→ simesy_work joined	23:53
	→ les_sylvains joined	23:55
	← opus left	23:55
	← flavius left	23:57
	→ bigkm joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation