IRCloggy #git 2013-11-23

Provider of IRC logs since 2005.

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

	2013-11-23
	← rhombus left	00:00
m0viefreak	in a 'script' file	00:00
	and then run	00:00
canton7	you can - rebase -i and change each line to 'edit'. filter-branch should work, though, and it'll be a lot easier	00:00
damccull	hmm. as a script huh?	00:00
m0viefreak	git filter-branch -f --tree-filter "./script"	00:00
	just to make sure there is no character escaping issue	00:00
	→ mmlac-bv joined	00:00
	← warthog9 left	00:00
damccull	brb and then i'll try it	00:00
canton7	^^ I'd also write the script long-hand... if [ -e ... ]; then \n sed ... \n fi \n exit 0	00:01
	→ kermit joined	00:02
damccull	ok thanks. will let you know	00:02
	do i need like a #!bin/bash or similar at the top?	00:02
	← tang^ left	00:03
canton7	yeah	00:03
	and chmod +x it	00:03
m0viefreak	#!/bin/bash	00:03
canton7	make sure you can ./script in isolation, and it'll work	00:04
	← ravigehlot left	00:04
	← gasbakid_ left	00:05
	← Admin_ left	00:05
	→ diphtherial joined	00:06
	← damccull left	00:07
	→ el3ctron joined	00:07
	← regreddit left	00:07
	← TomyLobo left	00:08
	← eletuchy left	00:09
	→ eletuchy joined	00:09
	← decotii left	00:09
	→ infynyxx joined	00:10
	→ johnkevinmbasco joined	00:10
	→ Droolio joined	00:11
	← Kayra left	00:13
	← eletuchy left	00:13
	← mightyiam left	00:14
	← jimi_ left	00:14
	← jason237 left	00:14
	← noyb left	00:15
	← diphtherial left	00:15
	→ arvind_khadri joined	00:15
	← arvind_khadri left	00:16
	→ AWinterman joined	00:16
	← bamj0rb left	00:17
	← leeN left	00:19
	← Squarism2 left	00:19
	→ dhruvasagar joined	00:19
	← psyl0n left	00:20
	← whunt left	00:20
	→ psyl0n joined	00:20
	← boombatower left	00:20
	→ kwmiebach joined	00:21
	← el3ctron left	00:22
	→ jimi_ joined	00:23
	→ el3ctron joined	00:24
	← Mars` left	00:24
	← primitive left	00:25
	→ Mars` joined	00:25
	→ hwrd\|work joined	00:25
	← Mars` left	00:25
	→ sbeyer joined	00:25
	→ Mars` joined	00:25
	← infynyxx left	00:26
	→ dkpi joined	00:26
	→ RaceCondition joined	00:27
	→ noyb joined	00:29
	→ ajm203 joined	00:29
	→ MattStratton joined	00:30
	← zhost left	00:30
	→ decotii joined	00:32
	← maxorator left	00:32
	← MattStratton left	00:32
	→ h0rrorvacui joined	00:33
	→ codeman joined	00:33
	← mr_red left	00:34
	← RaceCondition left	00:34
	→ arvind_khadri joined	00:34
	→ maxorator joined	00:35
	← arvind_khadri left	00:35
	← CAP5158 left	00:35
	→ arvind_khadri joined	00:35
	← arvind_khadri left	00:36
	→ sgambino joined	00:36
	→ Kayra joined	00:37
	← jkline left	00:37
	← AWinterman left	00:38
	→ AWinterman joined	00:38
	← AWinterman left	00:39
	→ AWinterman joined	00:40
	→ treaki__ joined	00:41
	← bwreilly left	00:42
	← treaki_ left	00:43
	→ dwgill joined	00:44
	← hwrd\|work left	00:44
	← beepbeep_ left	00:44
	→ breck7 joined	00:44
	← alp82 left	00:45
	→ hwrd\|work joined	00:45
	← donmichelangelo left	00:45
	→ donmichelangelo joined	00:46
	← canoon left	00:46
	← grzesag left	00:46
	← AWinterman left	00:46
	→ AWinterman joined	00:47
	→ bwreilly joined	00:47
	← PaulCapestany left	00:48
	→ AWinterm_ joined	00:48
	← AWinterman left	00:48
	← AWinterm_ left	00:48
	→ sayanee joined	00:48
	→ AWinterman joined	00:49
	→ halu joined	00:49
	← Zarthus left	00:49
	← thelorax123 left	00:49
	← dwgill left	00:49
	← hwrd\|work left	00:49
	← AWinterman left	00:50
	→ AWinterman joined	00:50
	← tvw left	00:51
	→ thelorax123 joined	00:51
	→ arvind_khadri joined	00:52
	← arvind_khadri left	00:53
	→ Lancien joined	00:53
	→ dsdeiz joined	00:54
	← beastd left	00:55
	→ canoon joined	00:56
	← pbrobst left	01:00
	← ajm203 left	01:01
	→ ajm203 joined	01:02
	← ErKa left	01:02
	← halu left	01:02
	← King_Hual left	01:02
	Fernandos → Fernandos_away	01:03
	→ jkline joined	01:04
	→ raonyguimaraes joined	01:04
	← raonyguimaraes left	01:04
	← BiggFREE left	01:05
	→ refried_ joined	01:06
	← Brmm left	01:08
	← mmlac-bv left	01:08
	← sbeyer left	01:09
	← nephyrin left	01:09
	← sohail left	01:09
	→ arvind_khadri joined	01:10
	→ eletuchy joined	01:10
	→ sohail joined	01:10
	← arvind_khadri left	01:10
	→ Katafalkas joined	01:10
	→ jason237 joined	01:11
	→ boombatower joined	01:11
	← decotii left	01:15
	← Katafalkas left	01:17
	→ Katafalkas joined	01:17
	← jimi_ left	01:18
	← Katafalkas left	01:19
	← eletuchy left	01:19
	→ john2x joined	01:21
	← johnkevinmbasco left	01:22
	→ shinnya joined	01:23
	→ kadoban joined	01:24
	← nnyk_ left	01:24
	← AWinterman left	01:25
	→ AWinterman joined	01:25
	→ arvind_khadri joined	01:26
	→ leandrosansilva_ joined	01:27
	← arvind_khadri left	01:27
	← leandrosansilva left	01:27
	← DonRichie left	01:27
	→ DonRichie joined	01:28
	← jkline left	01:28
lolmaus	How do i create an empty branch? So that it does not inherit any commits and code?	01:29
rjhunter	lolmaus: --orphan	01:30
lolmaus	rjhunter, git branch --orphan? git --checkout --orphan?	01:30
	oops	01:30
	← ehmatthes left	01:30
	← sohail left	01:30
	← m_ke left	01:30
grawity	lolmaus: the latter	01:30
lolmaus	grawity rjhunter, thank you	01:31
	→ nnyk_ joined	01:31
	← Naoe-Kanno left	01:32
	← refried_ left	01:33
	→ karavanjo__ joined	01:34
lolmaus	I did `git checkout --orphan branchname` but there are still master's files. I tried `git reset --hard` and `git clean -f -d -x`, but they didn't work. How do gracefully remove the files and folders from the other branch?	01:34
	← karavanjo_ left	01:35
	← breck7 left	01:35
	← ajm203 left	01:35
lolmaus	Git makes me feel miserable like no other piece of software does. :( Every step other than add/commit/push is a pain, and cryptic documentation is of little help. :(	01:35
	→ lite_ joined	01:36
	→ Admin_ joined	01:36
	← dhruvasagar left	01:36
grawity	well, it /was/ written by kernel developers for themselves	01:37
	so it's going to take a while to fix the odd places in the interface	01:37
	→ jkline joined	01:37
lolmaus	grawity, do you know how to gracefully remove code of the old branch after `git checkout --orphan newbranch`?	01:38
osse	pimping your shell prompt and getting proper completion goes a long way	01:38
	→ robbyoconnor joined	01:38
grawity	lolmaus: well, `git reset --hard` did it for me	01:39
	← corygibbons left	01:39
lolmaus	grawity, it says that there's not ref to reset to. The branch is orphaned, remember?	01:39
	← glebihan_ left	01:39
	← Gavrisimo left	01:39
	← rouf_ left	01:40
grawity	lolmaus: yep http://sprunge.us/EjVa	01:40
	→ rouf_ joined	01:40
grawity	maybe it was fixed in one of the newer releases.	01:40
	← kwmiebach left	01:40
lolmaus	osse, it's not a matter of command autocompletion. If cars were like git then people would set themselves on fire, get chewed into the engine and locked out all the time.	01:41
	grawity, $ git reset --hard	01:41
	fatal: Failed to resolve 'HEAD' as a valid ref.	01:41
	→ kwmiebach joined	01:41
	→ jimi_ joined	01:41
	← thiago left	01:42
osse	lolmaus: my point was merely that an informative prompt and command completion makes the whole experience less painful	01:42
grawity	yeah, it's like adding a dashboard to a car =)	01:42
	← Mars` left	01:42
grawity	so anyway, which version of git do you have?	01:42
osse	lolmaus: and I don't refer to thing specific situation (or any other), just in general	01:43
	→ Mars` joined	01:43
lolmaus	grawity 1.8.1	01:43
osse	and it sounds a bit to me that you want a seperate repo. you can combine them later	01:43
	← SocalNick left	01:44
	→ arvind_khadri joined	01:44
	← AWinterman left	01:44
	→ ehmatthes joined	01:44
lolmaus	osse, nope, i need the same repo. I'm trying to build my project and publish it on Github Pages.	01:44
grawity	yeah, looks like this was fixed in 1.8.2, and the commit message says `git rm -r --cached .` was the previous way	01:44
	← arvind_khadri left	01:44
	→ AWinterman joined	01:44
lolmaus	grawity, thx	01:44
grawity	https://github.com/gitster/git/commit/166ec2e96e31bac913f44823dadd6c732d353172	01:44
osse	lolmaus: hmm I see. Carry on, then	01:45
	→ nerdfiles joined	01:45
	→ eletuchy joined	01:46
lolmaus	osse, thx. :) :P	01:47
	→ pheaver joined	01:47
	← lavaman left	01:47
	← Mars` left	01:48
	← KK4MGV left	01:48
	← teran left	01:48
	→ teran joined	01:49
	← AWinterman left	01:49
	← hahuang65 left	01:50
	← psyl0n left	01:50
	← asQuirreL left	01:51
	← guampa left	01:52
	→ KK4MGV joined	01:52
	← abelsiqueira left	01:53
	← teran left	01:53
	→ glebihan_ joined	01:53
	← Pullphinger left	01:53
	→ hellopat joined	01:54
	← eletuchy left	01:56
	→ angelsl joined	01:57
	← Kayra left	01:58
	→ Kayra joined	01:59
	← DrShoggoth left	02:00
	→ arvind_khadri joined	02:02
	← bwreilly left	02:02
	← arvind_khadri left	02:03
	← ws2k33 left	02:03
	← pheaver left	02:04
	← motto left	02:04
	← penguin42 left	02:05
	→ PaulCapestany joined	02:05
	→ oojacoboo joined	02:07
	← dkpi left	02:09
	← leandrosansilva_ left	02:11
	→ leandrosansilva joined	02:11
	→ k4rtik joined	02:12
	→ paolooo joined	02:14
	← Vampire0 left	02:14
	← ItSANgo left	02:15
	← nicedice left	02:16
	→ karavanjo joined	02:17
	← karavanjo left	02:17
	→ kpreid joined	02:18
	← aberrant left	02:20
	→ arvind_khadri joined	02:20
	→ phipes joined	02:21
	← arvind_khadri left	02:21
	→ eletuchy joined	02:23
	← KK4MGV left	02:24
	← SpNg left	02:26
	← looper left	02:26
	← Bombe left	02:27
	← bitkiller left	02:27
	fangism → fangism-ctrl-Z	02:27
	→ looper joined	02:28
	→ Vampire0 joined	02:30
	→ KK4MGV joined	02:30
	← maqr left	02:32
	← jaimef left	02:32
	← chrisss404 left	02:33
	← eletuchy left	02:33
	→ Goplat joined	02:33
	→ canooon joined	02:34
	← jimi_ left	02:36
	→ jaimef joined	02:37
	→ ewnd9 joined	02:37
	→ Bombe joined	02:38
	← Bombe left	02:38
	→ Bombe joined	02:38
	→ arvind_khadri joined	02:38
	← Admin_ left	02:40
	← cenuij left	02:41
	→ chrisss404 joined	02:42
	→ JSharpe joined	02:43
	← JSharpe_ left	02:46
	→ Georg3 joined	02:47
	→ npnp joined	02:48
	← npnp left	02:48
	→ npnp joined	02:48
	← npnp left	02:48
	→ teran joined	02:49
	→ npnp joined	02:49
	← Kayra left	02:49
	← npnp left	02:49
	→ npnp joined	02:49
	← jkline left	02:50
	← npnp left	02:50
	→ nicedice joined	02:50
	← Skrypter left	02:51
	← MattMaker left	02:52
	→ setmeaway joined	02:52
	→ JSharpe_ joined	02:53
	← JSharpe left	02:53
	→ Mars` joined	02:54
	→ JSharpe joined	02:55
	← noyb left	02:56
	← teran left	02:56
	→ JSharpe__ joined	02:56
	← dsdeiz left	02:56
	← JSharpe left	02:57
	← Mars` left	02:58
	← tefnut left	02:58
	→ JSharpe joined	02:58
	← JSharpe_ left	02:58
	→ eletuchy joined	03:00
	→ HicksD_ joined	03:00
	← HicksD left	03:00
	← robbyoconnor left	03:01
	→ silviof2 joined	03:01
	→ robbyoconnor joined	03:02
	← JSharpe__ left	03:02
	← dreiss left	03:03
	→ hahuang65 joined	03:04
	← silviof1 left	03:04
	← rjhunter left	03:08
	→ bwreilly joined	03:08
	→ ItSANgo joined	03:09
	← eletuchy left	03:09
	← nicedice left	03:13
	← bwreilly left	03:13
	→ thiago joined	03:14
	← Fandekasp left	03:16
	← guns left	03:17
	→ Davey joined	03:18
	→ Fandekasp joined	03:18
	→ ajm203 joined	03:20
	← ewnd9 left	03:21
	→ nicedice joined	03:22
	← kpreid left	03:22
	→ kpreid joined	03:22
	← thelorax123 left	03:23
	→ amortimer_mbp joined	03:24
	→ Pyrogerg joined	03:24
	← joelm left	03:25
	→ thelorax123 joined	03:25
	→ codeman_ joined	03:27
	← CheckDavid left	03:28
	← m0viefreak left	03:28
	← codeman left	03:31
	→ beautifulmind joined	03:32
	← JSharpe left	03:33
	→ dsdeiz joined	03:33
	→ eletuchy joined	03:36
	← eletuchy left	03:36
	→ Watabou joined	03:36
	← shinnya left	03:36
	→ eletuchy joined	03:36
	← alvaro_o left	03:38
	→ maqr joined	03:38
	← Exdaix left	03:40
	← kukks left	03:41
	→ Exdaix joined	03:41
	← Argure left	03:42
	← maqr left	03:44
	← robbyoconnor left	03:44
	← eletuchy left	03:45
	← kwmiebach left	03:46
	→ ezekielnoob3 joined	03:46
	→ pheaver joined	03:46
	→ eletuchy joined	03:46
	← eletuchy left	03:46
	→ eletuchy joined	03:47
	← mribeirodantas left	03:48
	← mfulz left	03:49
	← mdiers left	03:50
	→ carbon2 joined	03:51
	← carbon2 left	03:51
	→ nhmood joined	03:55
	→ ewnd9 joined	03:55
	← arvind_khadri left	03:55
	→ fflush joined	03:56
	→ revyd joined	03:56
	→ AWinterman joined	03:56
	← mino left	03:57
	← roflin left	03:57
	← Tectu left	03:57
	← AWinterman left	03:57
	→ mino joined	03:57
	← mino left	03:57
	→ mino joined	03:57
	→ AWinterman joined	03:57
	→ roflin joined	03:58
	← FrodoTheHobbit left	03:58
	→ Tectu joined	03:58
	← richwestcoast left	04:00
	← AWinterman left	04:02
	← pheaver left	04:04
	← roflin left	04:05
	← jason237 left	04:05
	← preflex left	04:05
	→ preflex joined	04:07
	← sayanee left	04:07
	← beautifulmind left	04:08
	→ rjhunter joined	04:09
	→ roflin joined	04:11
	← rjhunter left	04:14
	→ damccull joined	04:14
damccull	canton7: i fixed it finally :D had to write this script like you guys suggested https://gist.github.com/damccull/51b4fc82a650a4376eb5	04:15
	although now that I look at it again, I don't think I needed the if	04:15
	→ Entomo joined	04:16
	→ misterpink joined	04:17
	← Fandekasp left	04:17
	→ rjhunter joined	04:17
	→ Fandekasp joined	04:19
	← codeman_ left	04:19
	→ pheaver joined	04:20
	→ sayanee joined	04:20
	→ codeman_ joined	04:20
	← rjhunter left	04:22
	→ FrodoTheHobbit joined	04:26
	← luxgeek left	04:27
	← revyd left	04:31
	→ Balliad joined	04:31
	→ KeiKun_ joined	04:32
KeiKun_	how to deal with this?	04:32
	missing blob 36a90d305a337302f4c689a8189a9120334e04d6	04:32
	← FrodoTheHobbit left	04:32
	→ ErKa joined	04:32
KeiKun_	fatal: unable to read 36a90d305a337302f4c689a8189a9120334e04d6	04:33
	← Dougie2187 left	04:34
	→ Dougie2187 joined	04:34
	← paolooo left	04:35
	→ arvind_khadri joined	04:36
	← arvind_khadri left	04:36
	→ krisp1 joined	04:37
	→ paolooo joined	04:38
	→ rchavik joined	04:40
	→ FrodoTheHobbit joined	04:42
	← FrodoTheHobbit left	04:42
	→ FrodoTheHobbit joined	04:42
	→ revyd joined	04:45
	→ sohail joined	04:48
	← sohail left	04:48
	→ sohail joined	04:48
	→ sam113101 joined	04:48
	→ wlemuel joined	04:48
	← Dougie187 left	04:48
	← wlemuel left	04:48
	← Dougie2187 left	04:49
	← bgerber left	04:49
	→ bgerber joined	04:50
	→ dort joined	04:51
	← axfcampos left	04:51
nhmood	Does anyone know how I can change the tab width (in spaces) to the files in my repo and then commit the tab width size change?	04:52
	← codeman_ left	04:52
	→ arvind_khadri joined	04:53
	← ajm203 left	04:54
	← arvind_khadri left	04:54
	→ dravidan joined	04:54
	← h0rrorvacui left	04:55
	← Balliad left	04:56
	← dort left	04:56
	← amortimer_mbp left	04:58
	→ aberrant joined	04:58
	← DrNick left	04:58
	← aberrant left	04:59
	← sgambino left	04:59
	← donmichelangelo left	05:00
	→ subhojit777 joined	05:00
	→ donmichelangelo joined	05:01
	← Davey left	05:03
	emmajane → [emmajane]	05:03
	→ Davey joined	05:03
	← phipes left	05:05
	→ jaseemabid joined	05:05
	→ kesha joined	05:07
	← oojacoboo left	05:07
	← krisp1 left	05:10
	→ arvind_khadri joined	05:11
	← arvind_khadri left	05:12
	→ arvind_khadri joined	05:12
	→ irqq joined	05:12
	← imachuchu left	05:13
	← arvind_khadri left	05:13
	← nnyk_ left	05:14
	→ DrNick joined	05:14
	← ewnd9 left	05:15
	→ KeiKun joined	05:15
	→ nnyk_ joined	05:16
	→ ewnd9 joined	05:16
	→ jkline joined	05:17
	→ rjhunter joined	05:18
	← KeiKun_ left	05:19
	→ dreiss joined	05:21
	← el3ctron left	05:21
	→ robbyoconnor joined	05:22
	← rjhunter left	05:23
	→ master_j joined	05:26
	→ AWinterman joined	05:28
	→ arvind_khadri joined	05:30
	← arvind_khadri left	05:30
	→ arvind_khadri joined	05:31
	← arvind_khadri left	05:32
	→ hobodave joined	05:32
	→ amjam joined	05:32
	→ arvind_khadri joined	05:32
	← nnyk_ left	05:32
	← arvind_khadri left	05:33
	→ arvind_khadri joined	05:33
	← arvind_khadri left	05:34
	← Davey left	05:34
	→ arvind_khadri joined	05:35
	← arvind_khadri left	05:36
	← ErKa left	05:36
	← AWinterman left	05:36
	← Tommy[D] left	05:36
	→ User458764 joined	05:37
	← sohail left	05:38
	→ sohail joined	05:39
	← sohail left	05:39
	→ sohail joined	05:39
	← revyd left	05:39
	← k4rtik left	05:45
	→ revyd joined	05:45
	→ GT4066 joined	05:47
	← robbyoconnor left	05:47
	→ beautifulmind joined	05:49
	← User458764 left	05:49
	← karavanjo__ left	05:49
	→ karavanjo_ joined	05:49
	← sam113101 left	05:51
	→ Tommy[D] joined	05:51
	→ arvind_khadri joined	05:52
	← arvind_khadri left	05:53
	← hobodave left	05:53
	→ arvind_khadri joined	05:53
	← kerrick left	05:54
	← arvind_khadri left	05:54
offby1	nhmood:	05:58
	nhmood: I think there's a common tool called "expand" what will convert spaces to tabs, and vice-versa	05:59
	the Emacs editor will do it too	05:59
	→ warthog9 joined	06:01
	← Garen left	06:02
	→ AWinterman joined	06:03
	← PaulCapestany left	06:04
	→ Garen joined	06:05
	→ arietis joined	06:08
	← KeiKun left	06:10
	→ arvind_khadri joined	06:11
	← arvind_khadri left	06:11
	→ arvind_khadri joined	06:12
	→ breck7 joined	06:12
	← arvind_khadri left	06:12
	← _Vi left	06:13
	← AWinterman left	06:13
	← hellopat left	06:18
	← the_cybersphinx left	06:18
	→ hellopat joined	06:19
	→ rjhunter joined	06:19
	→ el3ctron_ joined	06:22
	← hellopat left	06:23
	← rjhunter left	06:24
	← kesha left	06:25
	← codeFiend left	06:26
	→ pilgrum joined	06:26
	← pilgrum left	06:27
	← seanz left	06:27
	← Grant484 left	06:28
	→ hugo_dc joined	06:28
	→ seanz joined	06:29
	→ dsdeiz_ joined	06:30
	→ arvind_khadri joined	06:30
	← arvind_khadri left	06:30
	← dsdeiz left	06:31
	→ arvind_khadri joined	06:31
	→ freestyl3r joined	06:31
	← arvind_khadri left	06:32
	→ kerrick joined	06:32
	← beautifulmind left	06:34
	→ k4rtik joined	06:34
	← paolooo left	06:35
	→ andref_dias joined	06:35
	← paulweb515 left	06:38
	→ wrouesnel joined	06:39
	→ pantsman joined	06:39
	→ snow_ru joined	06:39
snow_ru	hi all	06:39
	→ AWinterman joined	06:39
EugeneKay	Welcome, to zombocom	06:39
snow_ru	Hi All ?	06:39
	zobocome ?	06:39
	← dreiss left	06:40
EugeneKay	YOu can do anything at zombocom	06:40
	→ arjun_ joined	06:40
	← arietis left	06:42
	← Gamecubic left	06:43
	→ ErKa joined	06:45
	← Lancien left	06:45
	→ rjhunter joined	06:45
	→ Lancien joined	06:45
	← sayanee left	06:45
snow_ru	anyone here code for git ?	06:46
	i feel that this code is silly	06:46
	int main(int argc, char **av)	06:47
	{	06:47
	const char argv = (const char ) av;	06:47
	const char *cmd;	06:47
	int main(int argc, char **av)	06:47
	{	06:47
	const char argv = (const char ) av;	06:47
	← KK4MGV left	06:48
	← bdavenport left	06:48
	→ KK4MGV joined	06:48
	← KK4MGV left	06:49
	→ wrouesnel1 joined	06:49
	← wereHamster left	06:49
	→ arietis joined	06:49
	← bgerber left	06:50
	→ arvind_khadri joined	06:50
	← ErKa left	06:50
	← wrouesnel left	06:50
Nevik	nothing better than a double paste	06:50
	← arvind_khadri left	06:50
	← Lancien left	06:50
	← AWinterman left	06:52
	← revyd left	06:52
	← Goplat left	06:52
	← Bucciarati left	06:52
	→ bdavenport joined	06:52
	→ wereHamster joined	06:53
	→ bgerber joined	06:54
	→ Bucciarati joined	06:54
	← warthog9 left	06:55
	→ kesha joined	06:55
	→ paulweb515 joined	06:56
rjhunter	snow_ru: is your question about re-assigning argv to a const after accepting it without const?	06:56
snow_ru	yes	06:56
	← Bucciarati left	06:56
snow_ru	rjhunter,	06:57
rjhunter	snow_ru: I don't know the true answer but I imagine it's to get consistent const behaviour across platforms.	06:57
	← kerrick left	06:57
rjhunter	snow_ru: I wouldn't be surprised if some compilers didn't like a const argument to main	06:58
	→ ruby\|angry_hamst joined	06:59
rjhunter	snow_ru: why don't you check the history of that line in the codebase? see if it was added after the fact, and what the commit message says	06:59
	→ hellopat joined	06:59
rjhunter	i find that's always a good step to take when i find some seemingly non-sensical code	07:00
	→ toordog joined	07:00
	← pantsman left	07:00
	→ nnyk_ joined	07:00
	← Exio4 left	07:01
toordog	Hi, I'm new to git and i face an issue where i git init a new repository and on my client, i try to create a new file, I stage it and when i try to commit and push it, the remote repository return an error : Not all ref have been pushed. master rejected non fast forward	07:01
	what I did wrong?	07:01
	I did a git clone from the remote repository to create my local repository and I did a pull also after	07:02
	→ marthinal joined	07:03
	← thelorax123 left	07:03
	← compact left	07:04
	→ hyperair joined	07:04
	→ compact joined	07:04
rjhunter	snow_ru: yep, it's a compiler compatibility thing -- see commit 84d32bf7678259c08406571cd6ce4b7a6724dcba	07:04
	← hellopat left	07:04
	→ thelorax123 joined	07:05
	→ Bucciarati joined	07:05
	→ wlemuel joined	07:06
	→ evangeline joined	07:06
	← kesha left	07:06
	→ arvind_khadri joined	07:06
	← wlemuel left	07:06
rjhunter	toordog: "master rejected non-fast-forward" means that the commits you're pushing don't form a straight line on top of what the server already has	07:07
	→ bryan-boyan-lin joined	07:07
	← arvind_khadri left	07:07
rjhunter	toordog: the main reason for that is if 1) someone else has pushed since the last time you pulled	07:07
	→ Exio4 joined	07:07
rjhunter	toordog: or 2) someone has re-written history inconsistently (possibly using rebase)	07:08
toordog	when i did a pull i did a rebase as it was suggested option	07:08
	that would be my problem?	07:08
	→ wlemuel joined	07:09
	← wlemuel left	07:09
	← breck7 left	07:09
rjhunter	toordog: not necessarily -- rebase is a perfectly reasonable option a lot of the time, as long as you know what's happening	07:09
	toordog: first step of diagnosis -- try pulling again	07:09
	toordog: (for the record, "pull" is just a shortcut for "fetch" and either "merge" or "rebase" depending on configuration)	07:10
	→ shoshin joined	07:10
	→ john2x_ joined	07:11
	← pheaver left	07:13
	→ robbyoconnor joined	07:14
	shoshin → BlueOrg	07:14
	← kcm1700 left	07:14
toordog	i did pull	07:14
	but a push would return the error again	07:14
	← john2x left	07:15
toordog	it's like it's been commited local but i cannot push it	07:15
	→ breck7 joined	07:15
rjhunter	toordog: OK, let's go a little bit deeper	07:15
	→ HelloComputer15 joined	07:15
rjhunter	toordog: I mentioned that "pull" is a shortcut for "fetch" + "merge"... let's just do "fetch" on its own to see where the remote repository is	07:16
snow_ru	rjhunter, ok thanks	07:17
	need to talk to pclouds	07:17
Moult	i use git-cola as a convenient way to quickly switch between diffs of multiple files. is there a native git command which can provide similar funtionality? git diff foo is too slow. perhaps something similar to git add -i ?	07:18
	→ AWinterman joined	07:18
rjhunter	toordog: and then you can see what it has that you don't with something like `git log origin/master..master` (if your local branch is called "master" and the remote you're pushing to is called "origin")	07:18
	→ Gooder joined	07:19
	→ Curtisbeef joined	07:20
	← ewnd9 left	07:21
	← andref_dias left	07:21
	→ ewnd9 joined	07:21
rjhunter	toordog: sorry, i meant the other way around. what origin/master has that your local master doesn' have yet: `git log master..origin/master`	07:22
toordog	on the git repository server, i run git log origin *i get an error : unknown revision ...	07:22
	when i do git log master i get my last commit log	07:22
	ok	07:22
	← nilg left	07:22
rjhunter	toordog: the dots and slashes are important	07:22
toordog	same error the only thing i removed was the ' '	07:22
	` ` i meant	07:23
rjhunter	toordog: perhaps the names are wrong? see what `git branch -a` calls them	07:23
toordog	it returns master	07:24
	← Bass10 left	07:24
rjhunter	toordog: it doesn't mention any remotes?	07:24
toordog	that server is suppose to be my git repository server on which my client connect to	07:25
	i cloned on my client that repository	07:25
rjhunter	toordog: in that case I'd expect to see branches like "remotes/origin/master" (as well as your local "master")	07:27
	toordog: does anything show up in `git remote -v` ?	07:27
toordog	is a simple git init would created that?	07:27
	nothing	07:27
SamB	toordog: are you looking at a clone?	07:27
rjhunter	toordog: `git clone` usually creates a remote called "origin" pointing back to whatever you cloned	07:28
	→ Kicer86 joined	07:29
	→ CreativeEmbassy joined	07:29
rjhunter	i gotta go, but I'm sure someone else will help you figure out what's happening	07:29
	back later	07:29
toordog	thanks rjhunter :)	07:29
	SamB On my server, I created a new repository from which my client will connect to for a new project. On the server, I did a git init	07:30
	and I commited a README file	07:30
	→ eletuchy_ joined	07:30
	Fernandos_away → Fernandos	07:30
toordog	after, i got on my laptop client and I cloned the server repository	07:30
SamB	you should really have created a bare repository	07:30
toordog	i can always redo it	07:30
	if you explain me how	07:31
	→ dsdeiz joined	07:31
	← dsdeiz_ left	07:31
	← Fernandos left	07:31
	← AWinterman left	07:32
	← breck7 left	07:32
SamB	"git init --bare"	07:32
	← master_j left	07:32
	← CreativeEmbassy left	07:33
	→ h0bbit_ joined	07:33
toordog	ha ok, i got more files now :)	07:34
	← eletuchy left	07:34
	← neal__ left	07:35
	← eletuchy_ left	07:35
toordog	ok, so i connected my client to it	07:35
	using clone	07:35
	creating a file local and commiting/pushing return the same error :(	07:37
	did a pull/merge, try to push again, still the error	07:37
	← Forkk left	07:38
	→ Forkk joined	07:38
	→ neal__ joined	07:39
	→ mitz joined	07:40
	← rjhunter left	07:41
	→ kerrick joined	07:41
	→ harobed_ joined	07:42
	← harobed_ left	07:42
	→ a-l-e joined	07:43
	→ harobed_ joined	07:43
toordog	realized that i didn't empty the directory correctly before doing git init --bare.	07:44
	my fold .git was still there from previous initisalization	07:44
	→ dsdeiz_ joined	07:44
	← dsdeiz left	07:46
	← Grum left	07:50
	→ Grum joined	07:50
	← lc0dd0cl left	07:51
	→ Shusshu joined	07:52
	← Shusshu left	07:53
	→ asQuirreL joined	07:56
	→ AWinterman joined	07:58
	← el3ctron_ left	07:59
	→ dreiss joined	08:00
	→ john2x joined	08:01
	→ el3ctron joined	08:01
	trout is sad at how slow git is being :(	08:04
	← john2x_ left	08:04
	← BlueOrg left	08:05
	← AWinterman left	08:08
	→ AWinterman joined	08:08
	→ rjhunter joined	08:11
	← harobed_ left	08:11
	← asQuirreL left	08:11
	→ teran joined	08:13
	→ maleknet joined	08:13
trout	load: 0.89 cmd: git 74577 [zio->io_cv] 68.15r 0.03u 0.30s 0% 30908k	08:13
	trout said	08:13
	← AWinterman left	08:13
	← HelloComputer15 left	08:13
trout	* sad	08:13
toordog	damn git make folder disapear :(	08:16
	git clone init --bare .git ../currentfolder and boom disapear	08:16
milki	i dont even know what thats supposed to do .O	08:18
	← Mmike left	08:20
	← subhojit777 left	08:21
	→ Zarthus joined	08:22
	→ halu joined	08:24
	→ cff joined	08:24
	← hyperair left	08:30
	← lite_ left	08:31
	→ sabgenton joined	08:31
	→ lite_ joined	08:32
	← przemkovv left	08:32
	→ n111234n joined	08:32
sabgenton	is there a command that reports clean or dirty? It'd be cool to have something like that to substitute into $PS1 (like you can with __git_ps1)	08:33
	→ subhojit777 joined	08:34
	← Watabou left	08:36
	→ danicampa901 joined	08:36
	→ tadasZ joined	08:39
	← tadasZ left	08:40
	→ hoschi joined	08:40
	→ nilg joined	08:40
	← terminalRepeat left	08:45
	← thiago left	08:45
	→ ngladitz joined	08:46
	← ngladitz left	08:46
	→ ngladitz joined	08:46
	→ carbon2 joined	08:46
	← bgerber left	08:48
	→ bgerber joined	08:48
	← fairuz left	08:49
	← frgtn left	08:50
	← carbon2 left	08:52
	← nnyk_ left	08:53
rjhunter	sabgenton: GIT_PS1_SHOWDIRTYSTATE=yesplease	08:53
	← teran left	08:53
	→ Ozch joined	08:54
	→ takamichi joined	08:54
rjhunter	sabgenton: or if colour-coding is enough GIT_PS1_SHOWCOLORHINTS=yeahawesome	08:55
	← sabgenton left	08:57
	→ axrfnu joined	08:57
	→ sabgenton joined	08:57
	sabgenton nickserv identify sabgenton	08:58
sabgenton	woops lol	08:58
	→ valgrind joined	08:58
sabgenton	/msg NickServ help commands	08:59
moritz	another password dead	08:59
sabgenton	:S .. :P	09:00
	← Georg3 left	09:00
	→ leeN joined	09:01
	← Rob___ left	09:02
sabgenton	moritz: first time I ever changed password!	09:03
	← lite_ left	09:04
sabgenton	moral of story is don't try typing in passwords whilst 3 year old daughter pulls arm ...	09:04
	and preferably not in a channel ..	09:04
	← jaseemabid left	09:04
	→ lite_ joined	09:04
	→ bitkid joined	09:05
	← halu left	09:05
	moritz can relate	09:06
	→ Rob___ joined	09:06
	← john2x left	09:06
	← nerdfiles left	09:07
	→ halu joined	09:07
sabgenton	rjhunter: exporting that didn't work does it have to be in bashrc ?	09:08
	→ john2x joined	09:08
sabgenton	or where you just having me on ...	09:09
Luke-Jr	any way to set the rename-detection limit lower for git cherry-pick? :/	09:11
rjhunter	sabgenton: I was reading from the documentation in git-prompt.sh (also available in HTML git-prompt_sh.html somewhere)	09:12
	→ tvw joined	09:12
	rjhunter was looking for a nice link to the HTML doc but couldn't find one.	09:12
	→ dc5ala joined	09:13
sabgenton	I'm on windows I'll go find a real *nix shell	09:14
	→ Jackneill joined	09:14
	← bryan-boyan-lin left	09:15
	← sohail left	09:16
rjhunter	it works for me -- removing a tracked file shows up with a * in the prompt. Touching an untracked file doesn't show up unless you have GIT_PS1_SHOWUNTRACKEDFILES set to something non-empty	09:16
	→ sundjango joined	09:17
	→ jaseemabid joined	09:17
	← lite_ left	09:18
rjhunter	Luke-Jr: git diff has a `--no-renames` option, but I don't think cherry-pick works that way	09:19
Luke-Jr	rjhunter: that's the opposite..	09:20
	→ HelloShitty joined	09:20
	Luke-Jr wishes git just tracked renames, sigh	09:20
	→ nnyk_ joined	09:21
	→ grzesag joined	09:21
	→ rurufufuss joined	09:22
rjhunter	Luke-Jr: git diff (and more to the point, git format-patch) also know `--find-renames=90%`	09:23
	← dreiss left	09:24
sabgenton	rjhunter: ah lol I was trying with touched new files	09:24
rjhunter	Luke-Jr: `git format-patch --stdin \| git am` can be used in a roughly equivalent way to `git cherry-pick`	09:24
	→ lite_ joined	09:25
	← dravidan left	09:28
	← dsdeiz_ left	09:28
sabgenton	rjhunter: yeah I have seen https://raw.github.com/git/git/master/contrib/completion/git-prompt.sh before I should have thought, thanks I got dirty and untracked on now :D	09:30
	→ Guest28802 joined	09:31
	← evangeline left	09:31
	← jkline left	09:31
	← arjun_ left	09:33
	→ demiurgo joined	09:34
	→ Skrypter joined	09:36
	← axrfnu left	09:36
	→ noname001__ joined	09:37
	→ Admin__ joined	09:37
	← ThomasKaufmann left	09:37
	← Ozch left	09:38
	→ axrfnu joined	09:38
	gitinfo set mode: +v	09:39
	← bdavenport left	09:40
	→ jnavila joined	09:42
	← Admin__ left	09:43
	→ cilly joined	09:44
	→ bdavenport joined	09:44
	→ ThomasKaufmann joined	09:46
	→ arjun_ joined	09:46
	→ Vampire0_ joined	09:50
	← Vampire0 left	09:50
	← cilly left	09:51
	→ evangeline joined	09:51
	→ lmwood joined	09:52
	← evangeline left	09:59
	→ zivester joined	10:00
	← donmichelangelo left	10:00
	→ evangeline joined	10:00
	→ donmichelangelo joined	10:00
	bambams never should have drank 500 ml of Red Bull...	10:04
bekks	Now you feel like a gummy bear :>	10:06
	→ Balliad joined	10:08
	→ Lancien joined	10:10
	← looper left	10:12
	→ sabgenton_ joined	10:12
	← sabgenton left	10:13
	sabgenton_ → sabgenton	10:13
	← leandrosansilva left	10:13
	→ aChatir joined	10:14
	← dc5ala left	10:14
	← sabgenton left	10:14
	→ leandrosansilva joined	10:14
	→ Sendoushi joined	10:15
	← cff left	10:16
	→ mloskot joined	10:18
	→ fairuz joined	10:18
	→ hyperair joined	10:19
	← Skrypter left	10:20
	← aChatir left	10:22
	→ kriks joined	10:25
	← maslowbeer_ left	10:25
	← Balliad left	10:27
	← zumba_addict left	10:32
	← grzesag left	10:34
	→ hellopat joined	10:36
	→ irqq_ joined	10:38
	← irqq left	10:40
	irqq_ → irqq	10:40
	← hellopat left	10:41
	← subhojit777 left	10:41
	→ liamkeily joined	10:43
	← kriks left	10:44
	→ abelsiqueira joined	10:44
	← hyperair left	10:48
	← n111234n left	10:49
	← joelrobichaud left	10:53
	→ raonyguimaraes joined	10:55
	→ User458764 joined	10:55
	→ m0ltar joined	10:58
	← nnyk_ left	11:00
	→ mdiers joined	11:02
	→ Acidnerd joined	11:06
	← HicksD_ left	11:07
	← mitz left	11:10
	→ pheaver joined	11:12
	→ teran joined	11:13
	← evangeline left	11:13
	→ mishok13 joined	11:14
	→ evangeline joined	11:15
	← liamkeily left	11:15
	→ eletuchy joined	11:17
	← m0ltar left	11:18
	→ znode joined	11:19
	→ mmlac-bv joined	11:21
	← jaseemabid left	11:21
	→ shinnya joined	11:22
	← zivester left	11:22
	→ jaseemabid joined	11:23
	→ liamkeily joined	11:23
	← donmichelangelo left	11:25
	→ donmichelangelo joined	11:26
	→ leflaw joined	11:26
	→ CheckDavid joined	11:27
	→ codeFiend joined	11:28
	→ zhost joined	11:29
	→ the_cybersphinx joined	11:31
	← ruby\|angry_hamst left	11:33
	← Sendoushi left	11:36
	→ SHyx0rmZ joined	11:36
	← teran left	11:37
	→ teran joined	11:37
	← mmlac-bv left	11:37
	→ zivester joined	11:38
	← User458764 left	11:39
	→ hvoigt joined	11:39
	← snow_ru left	11:40
canton7	damccull, no, you didn't need that if :P glad you got it working!	11:40
	← zivester left	11:40
	→ bryan-boyan-lin joined	11:41
	→ tadasZ joined	11:41
	→ zivester joined	11:41
	← tvw left	11:42
	→ Zero-G joined	11:43
	← maleknet left	11:45
	← bryan-boyan-lin left	11:46
	→ mmlac-bv joined	11:48
	← teran left	11:48
	→ teran joined	11:49
	→ Josh1986 joined	11:51
	← halu left	11:51
	← Kicer86 left	11:51
	← Acidnerd left	11:52
	← teran left	11:53
	← ewnd9 left	11:55
	← k4rtik left	11:57
	→ k4rtik joined	11:58
	← tadasZ left	11:58
	→ Ivo joined	11:59
	→ Acidnerd joined	11:59
	← Zero-G left	12:00
	← zivester left	12:01
	→ SASDOE joined	12:03
SASDOE	hi all	12:03
gitinfo	SASDOE: 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.	12:03
	← rjhunter left	12:03
	→ Kicer86 joined	12:04
SASDOE	i am looking to have my pc automatically backup all code inside a given directory, containg various projects. i need versionning and was wondering if git was the best tool for this	12:04
	backup to a remote server	12:05
	← pheaver left	12:05
canton7	git is a version control system, not a backup tool. if you use git as part of your development, you'll get code backups for free. don't just try and add all existing projects to git repos, and commit automatically, though	12:05
	saying that, !etckeeper is a thing	12:06
gitinfo	etckeeper is a collection of tools to let /etc be stored in a git, mercurial, darcs, or bzr repository. It hooks into various package managers. http://kitenet.net/~joey/code/etckeeper/	12:06
SASDOE	from what i get git is more a project oriented tool rather than a backup prog, but tools like rsync dont seem to offer the same versionning	12:06
canton7	There's duplicity which does incrementals	12:06
	though I got sick of that, discovered that tar also does incrementals, and wrote a little wrapper around it to backup to s3 - https://github.com/canton7/s3-tar-backup if you're interested	12:06
SASDOE	what are incrementals? sorry..!	12:07
	→ zivester joined	12:07
canton7	an incremental backup starts with a full snapshot, then each day it figures out what's changed, and saves that	12:07
SASDOE	excatly what i need	12:07
canton7	so you can construct a snapshot of your backed up dir for every day, without saving a full snapshot for every day	12:08
	← arjun_ left	12:08
SASDOE	and how do you backup to your s3? rsync?	12:08
	if so a cron tar rsync combo might be better than a git solution	12:08
canton7	the caveat is if one part of the chain of incrementals since the snapshot gets corrupted, that's it. so you still have to make full snapshots every now and again	12:08
	← zivester left	12:08
	→ _Vi joined	12:08
canton7	erm, I used the ruby AWS API	12:08
	→ shoshin joined	12:08
	← Burer left	12:08
	← shoshin left	12:08
	← kcj left	12:09
	→ Burer joined	12:09
SASDOE	ok not the same server "topology" but i guess rsync should work	12:09
canton7	I got royally pissed off with Duplicity (slow POS), but it might be worth taking a look	12:09
	→ johu joined	12:09
SASDOE	i'll give both a look cheers	12:09
canton7	yeah, it's pretty easy to get tar generating incrementals. the slightly tricky bit is managing them, so you get an easy way of restoring a particular day, or removing stale snapshots	12:10
	→ zivester joined	12:10
	→ ncd\|leeN joined	12:11
	← ncd\|leeN left	12:12
	→ Kayra joined	12:12
	← akersof left	12:12
	→ penguin42 joined	12:13
	→ _iron joined	12:14
	← Burer left	12:14
	← leeN left	12:15
	→ Burer joined	12:15
	→ akersof joined	12:17
	← jaseemabid left	12:18
	→ leeN joined	12:19
	→ maleknet joined	12:19
	→ Cromulent joined	12:22
	← raonyguimaraes left	12:23
	→ hellopat joined	12:25
	→ freestyl1 joined	12:25
	← freestyl1 left	12:25
	→ Xethron joined	12:26
	← Xethron left	12:26
	→ Xethron joined	12:26
	← freestyl3r left	12:28
	→ Argure joined	12:28
	← hellopat left	12:30
	← fairuz left	12:30
	→ kriks joined	12:31
	→ whitby joined	12:32
	→ freestyl3r joined	12:34
	→ pfFredd joined	12:35
	→ arjun_ joined	12:37
	→ pfFred joined	12:39
	← pfFredd left	12:41
	→ BiggFREE joined	12:41
	← zivester left	12:43
	← mmlac-bv left	12:44
	→ teran joined	12:45
	→ rchavik_ joined	12:46
	→ bitkiller joined	12:46
	→ dbuch joined	12:47
	→ zivester joined	12:47
	→ Gavrisimo joined	12:48
	→ TomyLobo joined	12:49
	→ dort joined	12:49
	← rchavik left	12:49
	← teran left	12:49
	← zivester left	12:50
	→ zivester joined	12:50
	← canooon left	12:51
	← dbuch left	12:52
	→ eijk joined	12:53
	← Cap_J_L_Picard left	12:53
	→ Katafalkas joined	12:54
	→ tadasZ joined	12:54
	→ HicksD joined	12:55
	← canoon left	12:56
	→ dbuch joined	12:56
	→ Cap_J_L_Picard joined	12:57
	→ mfulz joined	12:59
	→ rhombus joined	12:59
	← Katafalkas left	13:00
	→ Katafalkas joined	13:00
	→ ws2k33 joined	13:01
	→ fairuz joined	13:01
	← Katafalkas left	13:02
	← Gavrisimo left	13:02
	→ ewnd9 joined	13:02
	→ Gavrisimo joined	13:03
	← eijk left	13:04
	→ timthelion joined	13:05
	→ Cassiel joined	13:06
	→ JSharpe joined	13:07
	← Gavrisimo left	13:07
	→ pengunix joined	13:08
	→ hyperair joined	13:08
	→ lite__ joined	13:09
	← lite_ left	13:09
	← boombatower left	13:10
	← lite__ left	13:10
	→ lite_ joined	13:11
	→ m0ltar joined	13:11
	← pengunix left	13:11
	← lite_ left	13:14
	→ pengunix joined	13:15
	← ewnd9 left	13:18
	← fairuz left	13:20
	→ frgtn joined	13:21
	← Kayra left	13:21
	← Droolio left	13:22
	→ fairuz joined	13:22
	← BiggFREE left	13:23
	← Josh1986 left	13:23
	← Cromulent left	13:23
	→ przemkovv joined	13:25
	→ pfFreddd joined	13:28
	← Sonderblade left	13:29
	← pfFred left	13:29
	→ m0viefreak joined	13:29
	→ ajm203 joined	13:29
	→ Gavrisimo joined	13:31
	← conan left	13:33
	← rchavik_ left	13:33
	← Gavrisimo left	13:34
	→ Gavrisimo joined	13:35
	← frgtn left	13:35
	→ alp82 joined	13:36
	→ jason237 joined	13:38
	← Gavrisimo left	13:40
	← ajm203 left	13:40
	← angrysiamese left	13:41
	→ sgambino joined	13:42
	→ angrysiamese joined	13:43
	→ amjam_ joined	13:43
	← timthelion left	13:43
	← amjam left	13:47
	→ frgtn joined	13:47
	→ Davey joined	13:48
	→ ajm203 joined	13:49
	→ ewnd9 joined	13:50
	← frgtn left	13:51
	← arjun_ left	13:52
	← eletuchy left	13:52
	→ eletuchy joined	13:53
	→ Josh1986 joined	13:53
	→ kwmiebach joined	13:54
	← CheckDavid left	13:56
	→ Sendoushi joined	13:57
	← eletuchy left	13:57
	← ValicekB left	13:57
	← el3ctron left	13:58
	← Josh1986 left	13:58
	← kriks left	13:58
	→ kriks joined	13:59
	← m0ltar left	13:59
	← Sendoushi left	14:00
	→ pantsman joined	14:01
	← znode left	14:01
	→ Josh1986 joined	14:02
	→ znode joined	14:02
	→ CheckDavid joined	14:04
	← compact left	14:04
	→ compact joined	14:04
	→ Bass10 joined	14:04
	→ ValicekB joined	14:05
	← liamkeily left	14:06
	← Burer left	14:07
	← zivester left	14:08
	→ nerocrux joined	14:09
	← nerocrux left	14:09
	→ wlemuel joined	14:09
	→ mikecmpbll joined	14:11
	← leflaw left	14:13
	→ hellopat joined	14:13
	→ VictorCL joined	14:14
	→ carbon2 joined	14:14
	← znode left	14:15
	→ Droolio joined	14:15
	→ znode joined	14:15
	← Fandekasp left	14:16
	← kriks left	14:17
	← hellopat left	14:18
	→ sohail joined	14:18
	← sohail left	14:18
	→ sohail joined	14:18
	→ kriks joined	14:18
	→ liamkeily joined	14:19
	→ dkpi joined	14:19
	→ thierryp joined	14:19
	→ frgtn joined	14:21
	← valgrind left	14:23
	→ eletuchy joined	14:24
	← kwmiebach left	14:25
	→ kwmiebach joined	14:25
	→ Goplat joined	14:26
	→ lithiumn joined	14:31
	← lithiumn left	14:31
	→ King_Hual joined	14:33
	← mikecmpbll left	14:34
	→ BuuGhost joined	14:34
	← Zarthus left	14:34
	→ mikecmpbll joined	14:34
	← mikecmpbll left	14:35
	← frgtn left	14:36
	→ mikecmpbll joined	14:36
	← mikecmpbll left	14:36
	→ mikecmpbll joined	14:38
	← mikecmpbll left	14:38
	→ mikecmpbll joined	14:39
	→ pfFred joined	14:39
	→ sq-one joined	14:39
	← pfFreddd left	14:40
	← dort left	14:41
	→ asQuirreL joined	14:41
	→ Kronuz joined	14:43
	← h0bbit_ left	14:45
	← kriks left	14:45
	→ kriks joined	14:46
	← Lekensteyn left	14:48
	→ Norm_ joined	14:49
	→ axfcampos joined	14:52
	→ frgtn joined	14:54
	← k4rtik left	14:55
	← runa1 left	14:55
	→ lc0dd0cl joined	14:56
	→ k4rtik joined	14:57
	→ blahdodo joined	14:59
	← Kronuz left	15:00
	→ m0ltar joined	15:01
	← kenyon left	15:01
	← tadasZ left	15:01
	→ kenyon joined	15:02
	→ tadasZ joined	15:06
	→ timthelion joined	15:07
	← thierryp left	15:09
	← tadasZ left	15:10
	← timthelion left	15:11
	→ paolooo joined	15:12
	→ raonyguimaraes joined	15:14
	← kriks left	15:14
	→ kriks joined	15:15
	→ znode_ joined	15:16
	← yacks left	15:16
	← liamkeily left	15:16
	→ liamkeily joined	15:16
	← znode left	15:18
	← rasto left	15:19
	→ richwestcoast joined	15:20
	→ tadasZ joined	15:21
	→ groglogic joined	15:21
	→ mitz joined	15:23
	← frgtn left	15:23
	→ koda joined	15:24
	← koda left	15:24
	← JSharpe left	15:25
	→ kukks joined	15:26
	← kukks left	15:26
	→ kukks joined	15:26
	→ valgrind joined	15:26
	← donmichelangelo left	15:30
	← mitz left	15:31
	→ donmichelangelo joined	15:31
	← thelorax123 left	15:31
	→ rasto joined	15:32
	→ Roots47 joined	15:33
	→ thelorax123 joined	15:33
	→ mitz joined	15:33
	← liamkeily left	15:34
	→ guns joined	15:34
	→ liamkeily joined	15:34
	← sundjango left	15:34
	→ King_Hual` joined	15:34
	← tadasZ left	15:35
	→ leflaw joined	15:35
	→ librerak joined	15:35
	→ shoshin joined	15:36
	← King_Hual left	15:36
	← john2x left	15:38
	← amjam_ left	15:38
	→ Dougie187 joined	15:39
	rainbowdash` → Mapley	15:40
	Mapley → rainbowdash`	15:40
	→ Gamecubic joined	15:40
	→ arjun_ joined	15:42
	← m0ltar left	15:43
	← Roots47 left	15:46
	← librerak left	15:47
	→ tadasZ joined	15:47
	← leflaw left	15:48
	→ Katafalkas joined	15:48
	← demiurgo left	15:48
	→ Balliad joined	15:49
	→ closures999 joined	15:50
	← aartist left	15:50
	→ Ronald_Reagan joined	15:51
	← mikecmpbll left	15:51
	← tadasZ left	15:51
	→ cads joined	15:51
	← maleknet left	15:52
	→ frgtn joined	15:52
	→ amjam joined	15:52
	← arjun_ left	15:52
	← Droolio left	15:53
Ronald_Reagan	I'm a dev on a ~7 year old project. We have used SVN for the majority of that time. We are now switching to github because we were on SF (finally). We have a couple team members who are converting the repo, and we are at a loss of what to put down for inactive devs (who we have no way to contact) to tie git identities properly.	15:54
cbreak	Ronald_Reagan: git doesn't care about identities	15:55
	you can give them invalid addresses if you want.	15:55
	→ aard joined	15:55
	→ mikecmpbll joined	15:56
Ronald_Reagan	Alright, how easy would it be to add them back into the project if by some magical way they came back to the project?	15:56
cbreak	technically easy	15:56
	but you'd rewrite history	15:56
	so every single person on the project has to throw away his or her repository and start fresh	15:56
	(after manually transfering their local changes)	15:57
	so it's a pain in the ass to actually do in bigger projects	15:57
moritz	Ronald_Reagan: well, you can give them commit access without rewriting the meta data	15:57
cmn	you can use a .mailmap data	15:57
moritz	Ronald_Reagan: which would mean that only their new commits have the correct email address	15:57
cmn	but the only time where it'd be an issue is where you'd want to do stats, and your tool doesn't understand mappings	15:58
	→ snow_ru joined	15:58
cmn	for anything else, it's not an issue	15:58
moritz	so, odon't worry too much right now	15:58
	*don't	15:58
Ronald_Reagan	Awesome, thanks :)	15:59
	← kriks left	15:59
	→ kriks joined	16:00
	← liamkeily left	16:01
	→ hellopat joined	16:01
	→ liamkeily joined	16:01
	← hellopat left	16:04
	→ juliohm joined	16:05
	→ danslo joined	16:05
	← CodeShark left	16:05
danslo	can I revert a change to a specific file in a specific commit? ex. git revert --in 82c614eed3377d52d77f6cd9432c9f532fabbaef^ some_file.c	16:05
	→ ChanSavr joined	16:06
	← mikecmpbll left	16:06
ChanSavr	how do I rebase all my commits on top of the latest upstream commits?	16:06
danslo	or perhaps, reverse a diff	16:06
	ChanSavr, I prefer doing a fetch, then git rebase FETCH_HEAD	16:07
	disregard my question above, I'll just 'git diff -R' and apply it	16:07
osse	danslo: diff the commit against it sfsscdsv	16:08
	that was what I was going to suggest :P	16:08
	The only real downside is that you have to write the commit message yourself. But imho. reverts require some extra explanation than the default message anyway	16:08
alindeman	You could probably `git revert --no-commit` and checkout the changes you don't want	16:08
ChanSavr	danslo: FETCH_HEAD or master ?	16:09
danslo	osse, that was fine, I had to rewrite history anyway... so I just made a tmp commit and fixup it during an interactive rebase	16:09
	ChanSavr, just 'git fetch some_remote some_branch', then 'git rebase FETCH_HEAD'	16:10
	← pfFred left	16:11
	→ psyl0n joined	16:11
	← psyl0n left	16:11
	→ psyl0n joined	16:11
	← kriks left	16:12
	→ pfFred joined	16:12
	→ kriks joined	16:12
danslo	ChanSavr, I believe you can also just 'git pull --rebase', but it gives you a little less control imo (you'd have to check which remote your current branch is tracking etc)	16:14
ChanSavr	I have a merge conflict I need to sort out	16:15
alindeman	If your upstream is set correctly, that should work, yah	16:15
	→ AWinterman joined	16:15
	→ Pullphinger joined	16:19
	→ khaije\|io joined	16:20
	← SASDOE left	16:21
	← a-l-e left	16:21
khaije\|io	is there a way to checkout/merge content from one branch to another, but into a particular subdirectory?	16:21
	→ cenuij joined	16:21
	← cenuij left	16:21
	→ cenuij joined	16:21
khaije\|io	i'm trying to consolidate a bunch of mini-project branches that all use very similar formating without clobbering what is in place each time	16:22
	→ halu joined	16:23
	← valgrind left	16:23
	← angelsl left	16:24
cbreak	khaije\|io: git has subtree merging capabilities	16:24
	but you should REALLY not put several projects into the same repo	16:24
khaije\|io	these are all documentation/testing branches w/ different subtopics of the same topic, but I get what you mean	16:26
	→ madewokherd joined	16:26
	← Dougie187 left	16:26
	→ angelsl joined	16:26
	→ Grant484 joined	16:27
cbreak	if they are different temporal state, then merge them normaly	16:27
khaije\|io	cbreak: were you suggesting the subtree strategy for merging? when i read about it i couldn't tell	16:28
	← takamichi left	16:28
khaije\|io	nope, different subtopics, not temporally correlated	16:28
	← dbuch left	16:28
	← wrouesnel1 left	16:28
cbreak	subtree is for merging different spatial things (other projects) into a subdirectory	16:28
	→ takamichi joined	16:28
	← rhombus left	16:29
cbreak	khaije\|io: if it's the same topic, then merge normally	16:29
	← johu left	16:29
	← Norm_ left	16:29
	→ Norm_ joined	16:29
	→ nerdfiles joined	16:30
	← cagedwisdom left	16:31
	← VictorCL left	16:31
	→ mizu_no_oto joined	16:32
	→ Ozch joined	16:34
	→ thiago joined	16:35
	← marthinal left	16:35
khaije\|io	cbreak: a normal merge won't work in this case, but thank you I'll read up more on subtree and read-tree	16:36
	→ pfFreddd joined	16:36
	← pfFred left	16:38
	← cenuij left	16:38
	← frgtn left	16:40
	← kriks left	16:41
	→ kriks joined	16:41
	← eletuchy left	16:43
	→ eletuchy joined	16:43
	→ frgtn joined	16:44
	← paolooo left	16:47
	← kukks left	16:47
	→ mklappstuhl joined	16:47
	← danicampa901 left	16:48
	→ eijk joined	16:48
	→ FrodoTheHobbit1 joined	16:49
	← liamkeily left	16:50
	← guardian left	16:51
	→ liamkeily joined	16:51
	← FrodoTheHobbit left	16:52
	→ ciampix joined	16:52
	← ciampix left	16:52
	← angelsl left	16:53
	→ relipse2 joined	16:54
relipse2	How do i change my last commit message	16:54
	← takamichi left	16:54
	← ChanSavr left	16:54
	→ mikecmpbll joined	16:54
osse	relipse2: commit --amend	16:55
	→ angelsl joined	16:55
relipse2	k thanks	16:55
	← angelsl left	16:55
	← sonOfRa left	16:55
	← BtbN left	16:55
	→ angelsl joined	16:55
	→ dreiss joined	16:57
	→ ciampix joined	16:57
	→ takamichi joined	16:57
	→ BtbN joined	16:57
	→ sonOfRa joined	16:57
	← snow_ru left	16:59
	← liamkeily left	16:59
	→ liamkeily joined	17:00
	→ tadasZ joined	17:01
	→ Gavrisimo joined	17:01
	← kwmiebach left	17:02
	← Ronald_Reagan left	17:03
	← Josh1986 left	17:03
	← ezekielnoob3 left	17:03
	← liamkeily left	17:04
	← frgtn left	17:04
	→ liamkeily joined	17:04
	← rurufufuss left	17:04
	← tadasZ left	17:05
	→ snuffeluffegus joined	17:05
	← Norm_ left	17:06
	→ tadasZ joined	17:06
	← mikecmpbll left	17:07
	→ demiurgo joined	17:08
	← tadasZ left	17:08
	→ lc0dd0cl2 joined	17:08
	← amjam left	17:09
	← Balliad left	17:10
	← ciampix left	17:11
	← Gavrisimo left	17:11
	→ Gavrisimo joined	17:11
	← lc0dd0cl left	17:11
	← angelsl left	17:12
	→ nedbat joined	17:12
	→ ciampix joined	17:12
	→ dort joined	17:13
nedbat	when using "add -p" i may have a chunk of 12 contiguous lines changed in a file, but I only want to add the first 4. The "s" command just shows me the same 12-line chunk again. Is there a way to make chunk splitting more aggressive?	17:13
	← abelsiqueira left	17:13
	→ kukks joined	17:14
	← kukks left	17:14
	→ kukks joined	17:14
	→ angelsl joined	17:14
thiago	nedbat: no	17:14
luto	not a cli-answer but I like git-cola for this	17:15
thiago	nedbat: they need to be separated by non-changed lines	17:15
luto	nedbat --^	17:15
nedbat	thiago: what would you do in that situation?	17:15
thiago	nedbat: e	17:15
nedbat	thiago: to do what? unchange half the lines?	17:15
thiago	yes	17:15
	remove the lines with +	17:15
	change the lines with - to space	17:15
luto	sounds painfull :P	17:16
thiago	luto: it can be worse	17:16
	try using e when doing git reset -p	17:16
	I've never successfully managed it, to date!	17:16
	← Gavrisimo left	17:16
nedbat	thiago: so that's editing the patch, essentially? The file keeps all the changes?	17:17
	← cn28h left	17:17
osse	nedbat: yes	17:17
thiago	nedbat: yes	17:17
_rgn	yes	17:17
	← liamkeily left	17:17
nedbat	I see, I was thinking e was editing the file, makes sense, thanks!	17:17
	→ liamkeily joined	17:18
	← jason237 left	17:18
osse	thiago: I once spent about an hour fiddling with patches and stuff just to create "atomic commits". I had discovered several bugs at the same time and ended up mini-refactoring. I almost threw my computer out the window.	17:18
	→ pheaver joined	17:18
	→ d2dchat joined	17:20
	← kriks left	17:20
thiago	osse: bugs in git or bugs in your code?	17:21
	→ kriks joined	17:21
	← pheaver left	17:21
	→ tadasZ joined	17:21
osse	thiago: my own code.	17:21
	→ pheaver joined	17:22
osse	I would app -p, fail to apply, edit, fail to apply, reset. add -p, fail to apply, edit, apply! commit! add -p, fail to apply......	17:22
	← liamkeily left	17:23
	← k4rtik left	17:24
	← kriks left	17:25
	← tadasZ left	17:25
	→ kriks joined	17:25
thiago	sometimes it's easier to modify in the editor, save, undo, commit, then save in the editor	17:26
	← parcs left	17:26
osse	I may have done that at some point too. I can't remember, it's all a blur :P	17:27
	← demiurgo left	17:27
	→ k4rtik joined	17:28
	→ maestrojed joined	17:28
	← wlemuel left	17:31
	→ parcs joined	17:32
	→ jason237 joined	17:32
	→ noyb joined	17:32
	← k4rtik left	17:34
	← _iron left	17:35
	← mklappstuhl left	17:38
	→ warthog9 joined	17:39
	→ mikecmpbll joined	17:40
	← Pullphinger left	17:40
	→ mklappstuhl joined	17:41
	← mitz left	17:43
	→ snow_ru joined	17:44
	← d2dchat left	17:44
	← eletuchy left	17:44
	→ eletuchy joined	17:45
	← eletuchy left	17:45
	← mklappstuhl left	17:45
	→ tadasZ joined	17:46
	← Guest28802 left	17:47
	→ d2dchat joined	17:49
	← d2dchat left	17:49
	→ hellopat joined	17:50
	→ daito joined	17:50
	← bgerber left	17:51
_rgn	someone mentioned git-cola. finally installed after compiling qt for ages.	17:52
	what are some good uses?	17:52
	→ revyd joined	17:53
	← sgambino left	17:54
	← hellopat left	17:55
	← mikecmpbll left	17:56
	← Gamecubic left	17:56
	→ bgerber joined	17:57
	→ RaceCondition joined	17:57
	← daito left	17:59
	← kukks left	17:59
	→ conan_ joined	18:00
	← ewnd9 left	18:00
	← shoshin left	18:00
	→ nnyk_ joined	18:02
	← jnavila left	18:02
	→ jnavila_ joined	18:02
	jnavila_ → jnavila	18:02
	← RaceCondition left	18:03
	← pheaver left	18:03
	→ PaulCapestany joined	18:05
	← AWinterman left	18:05
	← tadasZ left	18:06
	← wooy left	18:06
	→ tadasZ joined	18:07
	← zackiv31 left	18:07
	← tadasZ left	18:07
	← kriks left	18:08
	→ kriks joined	18:09
	← dreiss left	18:10
	→ wooy joined	18:10
	← raonyguimaraes left	18:12
	→ aard__ joined	18:14
	→ Cromulent joined	18:15
	← sq-one left	18:15
	→ rath joined	18:17
	← aard left	18:17
	← nnyk_ left	18:18
	→ AWinterman joined	18:18
	← revyd left	18:19
	← codeFiend left	18:21
	→ matanya joined	18:22
	← matanya left	18:22
	← psyl0n left	18:22
	→ pheaver joined	18:22
	→ matanya joined	18:23
	← groglogic left	18:23
	→ hobodave joined	18:24
	← evangeline left	18:24
	← matanya left	18:24
	→ ErKa joined	18:25
	→ pfFredd joined	18:26
	← noyb left	18:26
snow_ru	hi all	18:26
	← pheaver left	18:27
	← pfFreddd left	18:27
	→ pheaver joined	18:29
	→ Georg3 joined	18:29
	→ hellopat joined	18:29
	← mizu_no_oto left	18:31
	← shinnya left	18:33
	→ h0bbit_ joined	18:33
lb	snow_ru: !hi	18:34
gitinfo	snow_ru: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	18:34
	← hellopat left	18:34
	← angrysiamese left	18:35
snow_ru	hmm	18:35
	→ angrysiamese joined	18:36
	→ hellopat joined	18:36
	← hvoigt left	18:37
	→ matanya joined	18:41
	← misterpink left	18:42
	← relipse2 left	18:45
	← thelorax123 left	18:45
	→ thelorax123 joined	18:47
	→ mribeirodantas joined	18:48
	← angrysiamese left	18:49
	← rath left	18:49
	← lc0dd0cl2 left	18:49
	→ angrysiamese joined	18:49
	→ lc0dd0cl joined	18:50
	→ jkline joined	18:50
	→ silviof3 joined	18:51
	→ raonyguimaraes joined	18:52
	→ do0ob joined	18:52
	← Katafalkas left	18:53
	→ wfq joined	18:53
	→ Katafalkas joined	18:53
wfq	hi guys	18:53
gitinfo	wfq: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	18:53
	→ frgtn joined	18:53
do0ob	hi	18:53
gitinfo	do0ob: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	18:53
do0ob	I want to put all my config files on github, so if i make another git hub repo a submodule in my repo, if that repo is deleted will mine still remain?	18:54
wfq	is there any robust web interface to manage a git repository? Anything that allows to do nearly everything you can do in the command line. There are a few of them such gitweb, git-php etc... but I'd like to have your opinion please	18:55
	→ mikecmpbll joined	18:55
	← silviof2 left	18:55
	← matanya left	18:55
	← bdavenport left	18:55
do0ob	wfq: what are you trying to do?	18:55
wfq	Obviously we'd like to have our own source code hosted on our servers	18:55
	→ psyl0n joined	18:56
	← psyl0n left	18:56
	→ psyl0n joined	18:56
do0ob	!backup	18:56
gitinfo	Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	18:56
wfq	do0ob, well I need someone who is not extremely technical to take care of our source code and want to introduce him git. I have no time to learn this and he is not very skillfl on Linux	18:56
	→ cenuij joined	18:57
	← cenuij left	18:57
	→ cenuij joined	18:57
do0ob	oh god	18:57
osse	wfq: there are several github-like solutions out there (including github itself, but it's expensive)	18:57
	wfq: gitlab, gitorious	18:57
	→ matanya joined	18:57
	→ rednaks joined	18:57
	← Davey left	18:57
osse	but you need to be technical etc to set them up	18:57
	← Katafalkas left	18:58
do0ob	wfq: take care? as in audit?	18:58
wfq	osse, weill I am. I can do this one-off but need to set up this so that another person can do everything on the web and leave me alone \|:)	18:58
	do0ob, well not. If we need to branch out the code that he can do it. If we need to revert back he can do it. He is clueless about linux console	18:59
do0ob	so it doesn't have to be a web interface does it?	19:00
	← _Vi left	19:00
wfq	do0ob not necessarily as long as there is a sort of interface that allows him to handle what he should have to do on a console	19:01
	← pfFredd left	19:01
wfq	any desktop app that can connect remotely?	19:01
	osse, gitorious is hosted	19:02
	→ _Vi joined	19:02
osse	I think it would be easier to make the person "clueful" about the CLI than to find an app like that	19:02
	wfq: you can run a local install too	19:03
	← asQuirreL left	19:03
osse	but that also costs a lot of money I think	19:03
	← AWinterman left	19:04
do0ob	CLI isn't that hard, surely a developer could learn it very quickly	19:04
osse	never mind, you can get it for free too: https://gitorious.org/gitorious/pages/Installation	19:04
	→ JesseC joined	19:04
	→ AWinterman joined	19:04
	← jkline left	19:04
	→ tadasZ joined	19:05
wfq	osse, looking at it	19:06
	thank you	19:06
do0ob	what about an IDE plugin?	19:07
	← mikecmpbll left	19:08
	→ kinExtRa joined	19:08
	→ Skrypter joined	19:08
	← maestrojed left	19:08
	← Skrypter left	19:08
_ikke_	do0ob: Nice, but not enough	19:09
	← AWinterman left	19:09
_ikke_	not enoug on it's own*	19:09
	→ Skrypter joined	19:09
	← Skrypter left	19:09
	→ Skrypter joined	19:10
do0ob	I spent a week with eclipse and it wasn't too bad, then cli+komodo, then vim, now i'm going to try emacs	19:10
	→ pfFredd joined	19:11
	← drager left	19:11
	→ drager joined	19:11
	→ moppersmurf joined	19:11
_ikke_	I hear good things about magit	19:12
	(for emacs)	19:12
	→ dalias joined	19:12
	← matanya left	19:13
do0ob	wfq: what if you put them in front of kde, with dolphin as the text editor and open the nested terminal window? then it'd get an understanding of cd, and could explore the folder as they've done before, but then run git commands in the terminal, you could setup difftool to meld and that should go a long way	19:13
dalias	hi. what's the proper way to transition from having code in a non-bare repo (checked-out) to bare repo?	19:14
	← kriks left	19:14
do0ob	the only thing they'd really need to learn are the git commands	19:14
	← hyperair left	19:14
_ikke_	dalias: git clone --bare path/to/non-bare-repository	19:14
	→ kriks joined	19:15
	→ matanya joined	19:15
dalias	if people have checked-out clones from the old non-bare repo (exposed via read-only git://) can i just drop the new bare repo in its place and have things keep working?	19:15
	← Cromulent left	19:16
osse	yes	19:16
	→ hyperair joined	19:16
j416	dalias: clones are not checkouts, they are clones :)	19:17
_ikke_	dalias: note that when doing a bare clone, git appends .git to the dir name	19:17
	← angrysiamese left	19:17
j416	dalias: the only connection a clone has to what it was cloned from, is a link. You can see it in .git/config	19:17
	← SHyx0rmZ left	19:17
	→ angrysiamese joined	19:17
_ikke_	or git remote show -n <remote-name>	19:18
dalias	j416, yes. so if i replace the non-bare repo with a bare one, it should just keep working for everyone?	19:18
	(e.g. if they pull from it)	19:18
j416	dalias: if the link is the same.	19:18
dalias	nod	19:18
	← matanya left	19:19
dalias	and is there a way to update the original tree to treat it as a clone of the bare one, so i can push to the bare one?	19:19
	or do i just have to make a new clone to do that?	19:19
j416	you can simply add the remote	19:19
	or just clone the bare repo anew if you prefer that	19:20
	same same	19:20
	→ runa1 joined	19:20
	→ maestrojed joined	19:20
	← axfcampos left	19:20
_ikke_	dalias: yeah, just add the new repo as a remote: git remote add <name> <path>	19:21
	or url instead of path if you prefer	19:21
	→ matanya joined	19:21
dalias	how to make it the default one, so plain "git push" pushes to it?	19:21
	→ corygibbons joined	19:22
_ikke_	dalias: It's a per branch setting	19:23
dalias	for master?	19:23
_ikke_	dalias: Easiest is to use git push -u <remote> <branch> once	19:24
	→ SHyx0rmZ joined	19:25
	← matanya left	19:25
	→ AWinterman joined	19:26
	← zarubin left	19:27
	→ matanya joined	19:27
	← mribeirodantas left	19:28
	→ mattattaque_ joined	19:29
dalias	_ikke_, btw does git actually use the directory extension of .git to make decisions about how to process the tree, or is it just a convention?	19:29
	→ mattattaque joined	19:30
	← mattattaque_ left	19:30
_ikke_	the latter	19:30
	← halu left	19:31
	← sohail left	19:31
	→ kukks joined	19:32
	← kukks left	19:32
	→ kukks joined	19:32
	← pheaver left	19:33
	← ErKa left	19:33
	→ amjam joined	19:33
toordog	back to fight to create a clean repo that works without issue. Stand 2	19:33
	→ jas4711 joined	19:34
toordog	yesterday i tried to create a git init and commit af ile and to clone this repository to my local computer. But I couldn't push without having error.	19:34
	← snuffeluffegus left	19:34
	← tureba left	19:34
_ikke_	toordog: Do you use smartgit/	19:34
toordog	i've been advised to create a git init --bare on my server instead, but my push were accepted, but I couldn't see my file on the server which probably mean my code is not backed up on the server.	19:34
	on the client side I use smartgit hg	19:35
	on the server, i use the native git	19:35
	→ pfFred joined	19:35
_ikke_	right	19:35
toordog	my code is mostly web and i just want to have the dev.domain updated with the latest code i do locally	19:35
grawity	if you cannot see the files, it does not mean they aren't there	19:35
_ikke_	toordog: What is the exact error you get (not the smartgit one, but from the remote)	19:36
	toordog: Something like this? http://stackoverflow.com/questions/16394209/not-all-refs-have-been-pushed-error-in-smartgit	19:36
toordog	ok this is counter intuitive i must admit. particularly that I've seen directory disapeared yesterday when I ran a git command and i couldn't retrieve it	19:36
	← pfFredd left	19:36
	→ sagittarian joined	19:36
toordog	_ikke_ that's exactly it	19:36
_ikke_	toordog: Right, it indeed means you are trying to push to a non-bare repository	19:37
	→ ibizaman joined	19:37
_ikke_	toordog: read about !bare	19:37
gitinfo	toordog: an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	19:37
toordog	brb the time to read that	19:37
	→ VictorCL joined	19:38
	→ socksandsandals joined	19:38
	← conan_ left	19:38
	← angrysiamese left	19:38
	→ angrysiamese joined	19:39
	→ trusktr joined	19:39
socksandsandals	is there a way to find out when a branch was created, even if that branch has since been deleted?	19:40
	→ marthinal joined	19:40
grawity	you can try looking in HEAD's reflog, although it would only show when you checked out that branch, not merely when you created it	19:41
ibizaman	Hi, I'm following the SubmittingPatches document and I'm stuck at the sending of the email: I should cc the email to people referenced in git blame and git shortlog --no-merges but I don't see any email address, how can I cc an email to them ?	19:41
	→ zarubin joined	19:41
grawity	ibizaman: git shortlog --email	19:41
	→ maleknet joined	19:42
ibizaman	grawity: thanks	19:42
toordog	_ikke_ let me know if my understanding is correct. If I want to have a copy of my file visible and usable let say by a web server in a httpdocroot folder, I would need to create a bare git repository on my server one project per website, I would need to create a local repository working space and I would finally require to create a clone repository for each website inside the httpdocroot	19:43
	which would fetch only the file of the specific website project?	19:43
cbreak	toordog: no	19:44
	toordog: you don't need to involve git at all.	19:44
	you could rsync your page manually	19:45
	→ Bahman_Dool joined	19:45
cbreak	if you want to involve git, then there are plenty of ways to do that	19:45
	see !deploy	19:45
gitinfo	Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html	19:45
Bahman_Dool	who the git are you?	19:45
	← amjam left	19:45
	→ pfFreddd joined	19:45
cbreak	for example, you could have one bare repository, which, when pushed to, will git archive \| tar xf - the data into some directory and then change some symlink or what ever	19:45
	→ conan_ joined	19:46
	← closures999 left	19:46
	→ amjam joined	19:46
	← Bahman_Dool left	19:47
toordog	for me it was more like i just push a change and the website get update without having to do extra step.	19:47
	← m0viefreak left	19:47
	← pfFred left	19:47
	← kriks left	19:48
toordog	doing a rsync is an extra step or raring ... my context is very simple by the way. i'm the only one coder and the only one sysadmin	19:48
	i'm basically a sysadmin and not a dev or web dev	19:48
	→ kriks joined	19:48
cbreak	toordog: then do what I said above	19:48
	just write the correct post-receive hook that does the deployment	19:49
toordog	i'm reading the link you suggested. It says don't do use git as deploy tools lol gonna check why now	19:49
cbreak	I'd do it with archive and tar, but you can use different methods	19:49
	← PaulCapestany left	19:49
_ikke_	I recently created something like that	19:49
toordog	ok	19:49
	→ Kayra joined	19:49
	→ liamkeily joined	19:49
_ikke_	A hook that does a git merge --no-ff to a remote tracking branch I push to from the other repo	19:50
	Locally, I basically do: git push prod master:refs/remotes/staging/master	19:50
cbreak	merging in a hook? Now that sounds dumb.	19:50
_ikke_	cbreak: no-ff merge	19:50
	← trusktr left	19:50
_ikke_	ff-only I mean	19:51
	← bbloom left	19:51
cbreak	those can fail	19:51
_ikke_	yes	19:51
cbreak	you designed your hook to fail?	19:51
	← conan_ left	19:51
_ikke_	I designed it to be fairly simple	19:51
cbreak	I'd use archive because it can not fail	19:51
_ikke_	sure	19:51
cbreak	one could use a working dir and reset --hard or similar as well	19:51
	← deanrock0_ left	19:52
	← hobodave left	19:52
	→ deanrock0_ joined	19:52
	← noname001__ left	19:53
	→ hahuang61 joined	19:54
	← hyperair left	19:54
	← deanrock0_ left	19:55
	→ noname001__ joined	19:55
	→ mikecmpbll joined	19:56
	→ deanrock joined	19:56
	← hahuang65 left	19:57
	← echo-area left	19:57
	← wfq left	19:57
	← carbon2 left	19:58
	→ petey joined	19:59
	→ conan_ joined	19:59
	← zarubin left	20:00
	→ trusktr joined	20:01
	← jas4711 left	20:02
	← angrysiamese left	20:04
	→ sgambino joined	20:05
	← socksandsandals left	20:05
	← amjam left	20:06
	→ zarubin joined	20:06
	→ angrysiamese joined	20:06
	← mikecmpbll left	20:07
_ikke_	Normally I would opt for git-archive	20:07
	← liamkeily left	20:08
	→ demiurgo joined	20:08
_ikke_	But this is a simple situation with only me developping on it	20:08
	→ bbloom joined	20:08
toordog	i like the git_deploy project and seems good for all context rather than hacking something with high risk of issue.	20:08
	→ liamkeily joined	20:09
toordog	but the doc i just read is flacky, i guess it's intend to people willing to go read the source code.	20:09
	going to play with it if i can get somewhere	20:10
BtbN	Is there a reason github is no longer listing the git:// based clone-urls?	20:10
	only https and ssh	20:11
	they still seem to work	20:11
_ikke_	I guess they don't really want to promote it anymore	20:11
BtbN	does it cause more server load/is less efficient than https://?	20:12
	→ Watabou joined	20:13
_ikke_	I couldn't tell	20:13
	← thelorax123 left	20:13
	→ zumba_addict joined	20:13
	→ thelorax123 joined	20:15
	← VictorCL left	20:17
	← kriks left	20:18
	→ kriks joined	20:18
	→ teran joined	20:20
	← kinExtRa left	20:20
	← khaije\|io left	20:22
	→ Brmm joined	20:22
	→ mikecmpbll joined	20:24
	→ yacks joined	20:27
	→ VictorCL joined	20:27
	← Watabou left	20:27
	← avantgeek_ left	20:28
	← ibizaman left	20:28
	→ hyperair joined	20:28
	← AWinterman left	20:28
	→ axfcampos joined	20:29
	→ AWinterman joined	20:29
	→ avantgeek_ joined	20:29
	← Kayra left	20:30
	← cenuij left	20:31
	← avantgeek_ left	20:31
	→ valgrind joined	20:31
	→ avantgeek_ joined	20:32
	→ budio joined	20:32
	← joki left	20:32
	→ brian__ joined	20:33
	← AWinterman left	20:33
	→ cenuij joined	20:33
	← cenuij left	20:33
	→ cenuij joined	20:33
	← zarubin left	20:35
	→ el3ctron_ joined	20:36
	← budio left	20:36
	← hellopat left	20:37
	→ hellopat joined	20:37
	→ apipkin joined	20:38
	→ joki joined	20:38
	→ zivester joined	20:38
	← liamkeily left	20:39
	← arietis left	20:40
	← dkpi left	20:40
	→ Watabou joined	20:41
	← skorgon left	20:41
	← VictorCL left	20:41
	← hellopat left	20:41
	→ joshbetz joined	20:42
	→ RaceCondition joined	20:43
	← Kwpolska left	20:43
	← RaceCondition left	20:43
	← corygibbons left	20:45
	qsusOFFcs → qsuscs	20:45
	← snow_ru left	20:45
	← moppersmurf left	20:45
	→ jkline joined	20:48
	→ jbrechtel joined	20:48
	← Brmm left	20:49
	← joshbetz left	20:50
	← demiurgo left	20:50
	← h0bbit_ left	20:50
	← jkline left	20:50
	← takamichi left	20:51
	→ pfFred joined	20:52
	← conan_ left	20:53
	→ dkpi joined	20:54
	← pfFreddd left	20:54
	→ liamkeily joined	20:54
	→ slut_tits joined	20:54
	← kriks left	20:54
	→ kriks joined	20:55
	→ conan joined	20:56
	→ noyb joined	20:56
	← valgrind left	20:57
	← alp82 left	20:59
	← mikecmpbll left	20:59
	← maestrojed left	21:01
	← brian__ left	21:01
	→ valgrind joined	21:02
	← Jackneill left	21:03
	→ pfFreddd joined	21:04
	← pfFred left	21:04
	→ MattMaker joined	21:06
	← sagittarian left	21:06
	→ sagittarian joined	21:07
	→ jkline joined	21:08
	← guns left	21:08
	→ Guest28802 joined	21:09
	→ aChatir joined	21:09
	→ RaceCondition joined	21:11
	← noyb left	21:11
	→ mikecmpbll joined	21:13
	→ slassh joined	21:13
	← redrocket left	21:15
	← mikecmpbll left	21:16
	← whitby left	21:16
	→ Kayra joined	21:16
	← maleknet left	21:17
	← Skrypter left	21:18
	→ asQuirreL joined	21:19
	→ BiggFREE joined	21:19
	→ SocalNick joined	21:20
	← Xethron left	21:21
	→ Skrypter joined	21:22
	→ Davey joined	21:22
	→ trang joined	21:23
	← slassh left	21:23
	← rednaks left	21:24
	→ Mars` joined	21:24
	← jkline left	21:25
	← nedbat left	21:25
trang	i have removed some files. how do I remove them from git tracking also?	21:25
	← SocalNick left	21:26
trang	currently when I do git add . i get "..path like x.png that are removed from working tree are ignored… what does that mean	21:26
_ikke_	trang: git rm --cached <file>	21:26
	→ mizu_no_oto joined	21:26
trang	i want both my local git and remote git to reflect my dir	21:26
	← leandrosansilva left	21:26
	→ leandrosansilva_ joined	21:26
	← valgrind left	21:26
	← axrfnu left	21:26
atrus	if git status says they're removed, you can just do a commit.	21:26
	then the history shows the file existing, and then being removed.	21:27
	then you can push that to the remote (or submit a pull request, or however your changes get to the remote).	21:27
	→ axrfnu joined	21:28
	← Mars` left	21:28
	gitinfo set mode: +v	21:28
	→ Mars` joined	21:29
atrus	trang: does that help?	21:29
	← trang left	21:32
	← King_Hual` left	21:33
	← frgtn left	21:33
	← Davey left	21:33
	← kukks left	21:33
	← Mars` left	21:34
	→ SocalNick joined	21:35
	← Ozch left	21:36
	← conan left	21:36
	← kermit left	21:37
slut_tits	hi	21:37
gitinfo	slut_tits: 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.	21:37
	→ Nicholas_Rishel joined	21:38
	← pfFreddd left	21:39
	→ ErKa joined	21:39
	→ AWinterman joined	21:39
	← Nicholas_Rishel left	21:40
	← cenuij left	21:40
	→ joelrobichaud joined	21:41
	gitinfo set mode: +v	21:41
	← pengunix left	21:42
	→ pheaver joined	21:43
	→ dreiss joined	21:43
axrfnu	slut_tits: your nicks are getting annoying. you already tried that somewhere else	21:44
	← AWinterman left	21:45
toordog	is anybody using git-deploy project to deploy from git?	21:45
	https://github.com/git-deploy/git-deploy	21:45
offby1	probably.	21:45
toordog	trying to figure out how to use it.	21:45
offby1	something tells me they use it at Booking.Com.	21:45
	Just a crazy notion	21:46
	I remember looking at it and giving up on it because it was so complex.	21:46
toordog	ok i feel the same about it	21:47
	what did you end up with?	21:47
offby1	toordog: "Ansible".	21:47
	first thing I found that I could actually understand :-\|	21:47
_ikke_	toordog: Weren't you also in #salt?	21:47
offby1	(well, I understood "fabric" too but it's kinda underpowered)	21:47
	heh, I checked out salt as well.	21:47
	too complex.	21:47
	and puppet.	21:47
	and chef.	21:47
_ikke_	lol	21:48
toordog	_ikke_ nope	21:48
offby1	probably others.	21:48
_ikke_	toordog: Oh, someone with a similar name then	21:48
	→ fobius_ joined	21:48
	← hoschi left	21:48
_ikke_	offby1: Usually people say salt is simpler than similar systems	21:48
	→ trang joined	21:48
offby1	_ikke_: it probably is.	21:48
toordog	salt is newer	21:48
offby1	_ikke_: but it still broke my "my brain hurts" threshold.	21:48
_ikke_	yup	21:48
toordog	a grand grand children fork of cfengine	21:48
	← WaffleCat left	21:50
	→ valgrind joined	21:50
toordog	i will probably end up with a git co; tar files; rm currentfolder; cp files.tgz; untar files.tgz; rm files.tgz;	21:51
	kind of annoying	21:51
_ikke_	toordog: git archive	21:51
	← pheaver left	21:51
	→ kermit joined	21:52
	→ VictorCL joined	21:52
offby1	toordog: have you read !deploy ?	21:52
gitinfo	toordog: Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html	21:52
	→ bwreilly joined	21:53
	→ hellopat joined	21:54
	→ Fandekasp joined	21:54
slut_tits	axrfnu: what's your problem?	21:54
	← juliohm left	21:55
	← VictorCL left	21:55
	← RaceCondition left	21:57
toordog	yep i read it	21:58
	still it's 6 simple solutions that aren't completed	21:58
offby1	heh	21:58
toordog	but I just though something packaged already existed.	21:58
	→ Terabyte joined	21:58
Terabyte	hey	21:58
offby1	deployment must be awfully hard since it's so rare to see it done well	21:58
cmn	those won't come from git, but from whatever your environment has	21:58
	← hellopat left	21:59
cmn	deployment doesn't depend on the version control tool, but on everything else	21:59
_ikke_	offby1: That's because there's no one-size-fits-all	21:59
toordog	that's waht i'm figuring out.	21:59
offby1	_ikke_: sensible	21:59
toordog	on the angle i was seeing it, a clone of a git is kind of a deployment ... if you can just remove the .git after.	21:59
	← dreiss left	22:00
toordog	a simple script could do it after the cloning	22:00
offby1	sure	22:00
_ikke_	toordog: Or use git-archive	22:00
offby1	if it works for you, great	22:00
toordog	my goal at first was just to commit and this repo to be the website	22:00
Terabyte	i added *.bak to a .gitignore but a file located in schema/model.mwb.bak still shows up, have i dont something wrongh	22:00
toordog	git-archive seems to be the more best practice method	22:00
	→ demiurgo joined	22:01
cmn	Terabyte: remove it if you don't want it	22:01
offby1	toordog: I've heard that if you project is just a PHP web site, then you really don't need to do anything other than "git pull"	22:01
	*your project	22:01
Terabyte	cmn it's auto generated	22:01
	i can remove it but it will come back later.	22:01
_ikke_	toordog: git archive doesn't require you to clone the entire repo, you just get the code from a tree, which is what you need	22:01
cmn	Terabyte: no, because then it'll be ignored	22:01
Terabyte	yes it should be ignored.... like a binary file.	22:02
cmn	that's nothing to do with ignoring	22:02
Terabyte	i'm confused.	22:02
cmn	remove it from git if you don't want git to track it	22:02
_ikke_	Terabyte: git doesn't ignore tracked files	22:02
toordog	_ikke_ i might only have one tree anyway, but having to archive rrequire more step than just a pull (which is from my local workspace is way easier than having to login on the server, create teh archive, move it clean up the old directory to replace with new files ...*	22:02
cmn	and add the ignore rule to prevent it from being added later by an overzealous command	22:02
Terabyte	_ikke_ oh, i see, you mean it's been commited before and so now it's tracked nomatter what i add.	22:02
_ikke_	Terabyte: yes	22:03
Terabyte	ok so it needs to be removed before the .ignore takes effect.	22:03
_ikke_	toordog: git archive works remotely	22:03
Terabyte	thanks that makes sense now	22:03
toordog	_ikke_ it still require to be extracted and manipulated no?	22:03
_ikke_	You can just pipe it to tar	22:03
	← matanya left	22:03
	← Guest28802 left	22:03
	→ King_Hual joined	22:04
_ikke_	toordog: man git archive has some examples	22:04
gitinfo	toordog: the git-archive manpage is available at http://jk.gs/git-archive.html	22:04
toordog	_ikke_ misunderstanding. what i mean, it is not a problem to create teh compressed archive, git-archive --format tar will do so. The thing is it's good to hve a tarfile.tgz but it requires after to deploy to take that .rar and to go to the website directory, to wipe out the current data and to extract the new data from tarfile.tgz ... compare to I just pull from my laptop and it's on the website.	22:06
	→ jkline joined	22:06
	← jkline left	22:06
_ikke_	toordog: Have you read the pitfalls for a git-pull based deployment?	22:07
toordog	but as i seen yesterday, i cannot do a pull on a workspace git because of how versioning is handled file are not update, just the metadata	22:07
	← joelrobichaud left	22:07
toordog	so it doesn't really update the visible file on the remote repository in this kind of context.	22:07
_ikke_	toordog: I use capistrano, which creates a new release directory for each release, and then switches a symlink	22:08
	That way, rollback is a matter of switching symlinks back	22:08
	→ joelrobichaud joined	22:08
toordog	that sound like a good idea	22:08
	can you create your release directory anywhere you want?	22:09
_ikke_	sure	22:09
toordog	that could do it	22:09
_ikke_	As long as your webserver can read from it ;-)	22:09
toordog	that's why the anywhere became important ;)	22:09
	my webserver user are chrooted	22:09
	→ hs366 joined	22:10
_ikke_	I have a shared dir where things are put that need to persist between releases, and create symlinks to those items in the release dir	22:10
toordog	only drawback, it's a ruby&rail project :(	22:11
	require gems ...	22:11
	← parcs left	22:11
toordog	i hate that thing	22:11
_ikke_	I have set it up once	22:12
	and can use it any time	22:12
	→ slassh joined	22:17
	← dort left	22:17
	← angrysiamese left	22:17
	→ RaceCondition joined	22:18
	→ angrysiamese joined	22:19
	← sagittarian left	22:22
	← hs366 left	22:23
	→ sagittarian joined	22:23
	← nerdfiles left	22:23
	← jnavila left	22:24
	← apipkin left	22:25
	← thelorax123 left	22:25
	→ gordian joined	22:25
	← RaceCondition left	22:26
	← el3ctron_ left	22:26
	→ hobodave joined	22:26
	← psyl0n left	22:26
	← aChatir left	22:26
	→ thelorax123 joined	22:27
	→ el3ctron joined	22:28
	saorge_ → saorge	22:29
_Vi	Are there any good GUIs for `git rebase -i` where I can split a commit easily, with drag&drop of chunks and lines between commits?	22:29
offby1	_Vi: This doesn't do _exactly_ that, and (given your nick) you might be hostile to the idea, but: the "magit" package for emacs makes rebasing fairly easy	22:30
	← mloskot left	22:31
_Vi	offby1, How it helps splitting a commit?	22:31
	/* "_Vi" is as in "Vitaly", not as in "vi" the text editor, although I use it often. */	22:31
	← valgrind left	22:32
offby1	_Vi: it doesn't help all that much splitting commits, to be honest.	22:32
	→ dreiss joined	22:32
offby1	although it does make it super-easy to interactively stage individual hunks; that might be good enough	22:32
_Vi	offby1, The main thing I want is dragging and dropping chunks and lines from commit to commit.	22:32
	Like "git gui", but even easier and more versatile.	22:33
_ikke_	I don't think something like that exists yet	22:34
offby1	_Vi: yeah, "magit" doesn't do drag-and-drop; and it only deals with the working tree and the index -- not actual commits	22:35
	If you're already comfortable with emacs, it's worth a try.	22:35
	if not, then it's probably not worth the learning curve	22:35
_Vi	"I don't think something like that exists yet" -> If it will appear, does it have a change to be useful?	22:35
offby1	what an odd question.	22:35
	obviously _you'd_ find it useful.	22:36
_Vi	I mean will it be useful for many people?	22:36
	(I have already tried getting on well with Emacs several times, but not yet successfully)	22:36
	→ amjam joined	22:37
offby1	_Vi: how on Earth would any of us know how useful a non-existent piece of software would be?	22:37
	That's like asking how many angels can dance on the head of a pin	22:38
_Vi	offby1, Sometimes there can be a clear answer like "It's unlikely that somebody will use such thing - the whole idea is weird".	22:39
	→ Mars` joined	22:39
offby1	OK, the idea is perfectly reasonable; I'd certainly give such a thing a try, anyway.	22:40
	(Whether I actually used it depends on a million little details)	22:40
	← demiurgo left	22:40
offby1	also, I'm pleased to report that science is on the job re. the angel problem: http://www.improbable.com/airchives/paperair/volume7/v7i3/angels-7-3.htm	22:41
	← sagittarian left	22:42
	← lc0dd0cl left	22:42
	→ lc0dd0cl joined	22:42
	→ sagittarian joined	22:42
	← Mars` left	22:44
_Vi	(Thinking about trying to implement `git rebase -i` wrapper in Qt with all features I want)	22:44
	→ Pullphinger joined	22:45
	→ Gavrisimo joined	22:46
	← pantsman left	22:46
	→ lifelike joined	22:46
	← slut_tits left	22:47
	→ kcj joined	22:48
	← bgerber left	22:49
	← amjam left	22:52
	← lc0dd0cl left	22:52
	→ lc0dd0cl joined	22:53
	← marthinal left	22:53
	→ Pengoo joined	22:55
	← Kayra left	22:55
	← ngladitz left	22:56
	→ arand joined	22:57
	→ themsay_ joined	23:00
	← Watabou left	23:00
	← eijk left	23:01
	→ bgerber joined	23:02
	qsuscs → qsusOFFcs	23:03
	← tadasZ left	23:03
	→ hahuang65 joined	23:03
	← bgerber left	23:04
	→ bgerber joined	23:04
	← setmeaway left	23:05
	← hahuang61 left	23:05
	→ skorgon joined	23:06
	→ Watabou joined	23:06
	← hahuang65 left	23:08
	← SocalNick left	23:09
	→ rjhunter joined	23:10
	→ Brmm joined	23:11
	→ Kayra joined	23:11
	← mishok13 left	23:13
	← lc0dd0cl left	23:14
	→ lc0dd0cl joined	23:14
	← slassh left	23:15
	← skorgon left	23:15
	← Exio4 left	23:15
	← rainbowdash` left	23:16
	← liamkeily left	23:16
	← zhost left	23:18
	← fobius_ left	23:18
	→ frgtn joined	23:19
	← TheFuzzball left	23:19
	← lc0dd0cl left	23:19
	← King_Hual left	23:20
	→ lc0dd0cl joined	23:21
	← dkpi left	23:21
	→ Mapley joined	23:22
	Mapley → Guest66951	23:22
	→ dort joined	23:23
	→ redrocket joined	23:25
	← mizu_no_oto left	23:26
	← Guest66951 left	23:26
	→ Guest66951 joined	23:26
	← Guest66951 left	23:26
	→ Guest66951 joined	23:26
	Guest66951 → Mapley	23:26
	← frgtn left	23:27
	← Brmm left	23:28
	→ takamichi joined	23:29
	→ smlgs joined	23:30
	← aard__ left	23:32
	← dort left	23:32
	→ dort joined	23:34
	→ skorgon joined	23:38
	→ sundjango joined	23:38
	→ codeman joined	23:38
	← robbyoconnor left	23:39
	← dort left	23:39
	→ john2x joined	23:39
	← BiggFREE left	23:40
	→ dtrott joined	23:40
	→ pfFreddd joined	23:40
	→ psyl0n joined	23:41
dtrott	In a (github) remote repo why is there an origin/HEAD and an origin/master I understand what the master is but what is the HEAD in this context ?	23:41
	→ aharris6 joined	23:42
	→ hellopat joined	23:42
	→ cagedwisdom joined	23:42
	→ junkstuff joined	23:43
dtrott	apologies the great google answer it, its the default when you clone ....	23:43
	← lmwood left	23:44
	→ sgambino_ joined	23:46
junkstuff	Would anyone happen to know how I prevent some files that were committed with CRLF line endings from always showing as modified, even after I checkout the file? I also tried removing the file and then hard resetting, but to no avail	23:46
	← irqq left	23:47
	← hellopat left	23:47
	← aharris6 left	23:47
	→ slut_tits joined	23:49
	→ aharris6 joined	23:49
	← sgambino left	23:49
	sgambino_ → sgambino	23:49
	← Skrypter left	23:51
	→ Skrypter joined	23:52
	→ snow_ru joined	23:52
	← junkstuff left	23:52
offby1	!crlf	23:55
gitinfo	to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	23:55
offby1	lucky guess :)	23:55
	← joelrobichaud left	23:56
	→ kukks joined	23:56
	← kukks left	23:56
	→ kukks joined	23:56
	← lc0dd0cl left	23:58
	→ lc0dd0cl joined	23:58
	← Kayra left	23:58
	← teran left	23:59

Logs Search ←Prev date Next date→

Channels Documentation