IRCloggy #git 2011-11-20

Provider of IRC logs since 2005.

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

	2011-11-20
	← dotnull left	00:00
	← ntcase left	00:00
	← workmad3 left	00:01
	→ [M]ax joined	00:02
	→ ntcase joined	00:02
	← conntrack left	00:04
	→ conntrack joined	00:05
	← eletuchy left	00:05
	← conntrack left	00:05
	→ conntrack joined	00:06
	← andrewsw left	00:06
chexxor	I'm relatively new to SCM systems. I've been spending the last several weeks reading about their uses, concepts, etc.	00:06
	git is, by far, the most interesting one	00:07
	I'm just starting to read the SVN book	00:07
	wow, what a boring SCM tool	00:07
	it must feel like you're not even a member of the team. The entirety of the source code is in the repo, and you have to ask permission for some files to edit	00:08
	that's effed up	00:08
	git feels much more independent. Power to the developer. Not fighting against the SCM tool	00:09
	← OOPMan left	00:10
	← cakehero left	00:11
	→ OOPMan joined	00:12
kpreid	chexxor: having experience with both, I don't think svn and git are really that different in the basic update-edit-commit cycle for a single branch.	00:12
	the place where you first see big wins for git (other than distributedness) is working with multiple branches	00:13
cbreak	the internals are very different	00:13
	← ntcase left	00:14
chexxor	kpreid: Would you agree if I say that SVN was designed from a top-down approach to solve the big picture of multi-dev team development?	00:15
kpreid	no, svn was designed to be 'cvs, but with the problems fixed', nothing less and nothing more	00:16
	→ goddard joined	00:16
kpreid	(where the problems included such things as the lack of atomic (whole-tree) commits in cvs)	00:16
goddard	how can i specify a key when doing a get pull?	00:16
	→ ntcase joined	00:16
	→ alberto56 joined	00:17
chexxor	SVN took 10 months before it became self-hosting	00:19
	git? 5 days	00:19
	that's interesting	00:19
napdragon	LOLOLOL	00:21
	← w0bni left	00:21
	← nyuszika7h left	00:22
cmn	svn was also built as a library from the beginning, not as a bunch of hacked-together perl scripts	00:22
	← Daniel0108 left	00:23
cmn	goddard: edit your ssh config	00:23
	← icwiener left	00:24
thiago	and a layered library at that	00:24
	there's a library for controlling the repository, a library for accessing a remote repository, etc.	00:24
	← alberto56 left	00:25
cmn	there are at least three different libraries that implement the transports	00:26
goddard	cmn: what do you mean?	00:27
	→ warlock_mza joined	00:27
cmn	goddard: edit ~/.ssh/config to tell ssh to use a particular key with a particular host	00:27
	→ koo0 joined	00:28
cmn	and the svn tool is just a way for humans to access the svn libraries	00:28
goddard	cmn: i see thanks	00:28
	→ koo1 joined	00:28
	← localhost left	00:29
	→ dotnull joined	00:30
	← notbrent left	00:30
	← OOPMan left	00:31
goddard	cmn: does git have a -i parameter like ssh?	00:31
	→ localhost joined	00:31
cmn	no, because it's not git's job to authenticate, there may be an environment variable that controls how ssh gets called	00:33
	← otakutomo left	00:33
cmn	but configuring ssh is simpler	00:33
	→ otakutomo joined	00:33
goddard	ok thanks	00:33
	→ OOPMan joined	00:34
	← isxek left	00:36
	→ churp joined	00:37
	→ isxek joined	00:38
	→ Bass10 joined	00:38
	→ zivester joined	00:40
	← Bass10 left	00:41
	→ Bass10 joined	00:41
	→ spearce joined	00:42
	→ alberto56 joined	00:43
	→ nyuszika7h joined	00:44
	← isxek left	00:45
	→ w09x joined	00:45
	← spearce left	00:45
	→ isxek joined	00:46
	← otakutomo left	00:48
	← diogogmt left	00:49
	→ austinbv joined	00:49
	← isxek left	00:50
	→ hotswaphdd joined	00:50
	→ Daniel0108 joined	00:51
	← robotmay left	00:51
	← airborn left	00:51
	← spaceonline left	00:51
	→ notbrent joined	00:52
	← OOPMan left	00:53
	→ OOPMan joined	00:54
	← [M]ax left	00:55
	→ [M]ax joined	00:56
	→ ehsan joined	00:56
	← petteyg left	00:57
	← bitkiller left	00:57
	← dotnull left	00:58
	cYmen_ → cYmen	00:58
	→ dotnull joined	00:58
	← warlock_mza left	00:59
	→ dot_null joined	01:00
	→ edwardloveall joined	01:02
	→ cmyk_ joined	01:03
	→ dv310p3r joined	01:04
	→ otakutomo joined	01:05
	← martin81 left	01:07
	→ Chib joined	01:07
	→ rebaglia_ joined	01:09
	← austinbv left	01:09
	→ austinbv joined	01:10
	← ehsan left	01:10
	← subbyyy left	01:10
	← churp left	01:10
	← OOPMan left	01:11
	← Shusshu left	01:11
	→ TomyLobo joined	01:12
	← rebagliatte left	01:12
TomyLobo	is there any abbreviation for git --git-dir ../otherproject/.git --work-tree ../otherproject <command>	01:12
	→ subbyyy joined	01:13
	→ bitkiller joined	01:13
	→ austinbv_ joined	01:15
cmn	cd	01:16
	← austinbv left	01:18
	austinbv_ → austinbv	01:18
	← edwardloveall left	01:20
	← dotnull left	01:20
	→ ehsan joined	01:25
	← lisak left	01:25
	→ OOPMan joined	01:26
	← austinbv left	01:26
	→ Textmode joined	01:27
	→ ArseneRe1 joined	01:29
	→ SebastianFlyte joined	01:30
cbreak	TomyLobo: take a look at git new-worktree, git-clone and maybe the GIT_DIR and so on environment variables	01:30
SebastianFlyte	join #hadoop	01:30
	← OOPMan left	01:31
	→ Anubisss_ joined	01:32
	→ Tac_Home joined	01:32
	Tac_Home → atdiehm_home	01:32
	→ wolftankk joined	01:33
	← ehsan left	01:33
	→ OOPMan joined	01:34
	← Anubisss left	01:35
	→ austinbv joined	01:35
	← basepi left	01:36
	→ basepi joined	01:37
	→ ehsan joined	01:38
	← brian_g left	01:39
	← notbrent left	01:39
	← kvanderw left	01:39
	← DarkAR left	01:41
	← otakutomo left	01:41
sente	TomyLobo: I have a bash alias to handle that:	01:44
	alias dotfiles='git --git-dir=$HOME/.dotfiles.git/ --work-tree=$HOME'	01:44
	← bitkiller left	01:45
	← austinbv left	01:45
	→ bitkiller joined	01:46
	← goddard left	01:49
	← OOPMan left	01:51
	← alberto56 left	01:51
	→ OOPMan joined	01:52
	← ehsan left	01:52
	← alansaul left	01:54
	← bitkiller left	01:56
	→ GeertB joined	01:58
	← JackWinter left	01:58
	→ spearce joined	01:58
	→ lanthan joined	01:59
	→ JackWinter joined	01:59
	← ArseneRe1 left	02:01
	← tommyvyo left	02:01
	← thews left	02:02
	→ brian_g joined	02:02
	← [M]ax left	02:03
	→ thews joined	02:03
	← spearce left	02:03
	→ [M]ax joined	02:07
	→ petteyg joined	02:09
	→ thews_ joined	02:11
	→ sunaku joined	02:12
	→ tshauck joined	02:12
	← OOPMan left	02:12
	→ ScottE joined	02:13
	→ awx joined	02:14
	← awx left	02:14
	→ awx joined	02:14
	← thews left	02:15
	thews_ → thews	02:15
	→ OOPMan joined	02:15
	← gusnan left	02:16
	→ w09x_ joined	02:16
	← Vampire0 left	02:16
	← gbacon left	02:17
	← w09x left	02:18
	← cmyk_ left	02:19
	→ otakutomo joined	02:20
	→ munichlinux joined	02:23
	→ gbacon joined	02:26
	→ Yuuhi` joined	02:31
	→ Vampire0 joined	02:32
	← Yuuhi left	02:33
	← MUILTFN left	02:34
	→ diogogmt joined	02:34
	→ alberto56 joined	02:37
	← brian_g left	02:37
	→ blaenk joined	02:38
	← ggordan left	02:38
	← sebastor_ left	02:39
	→ Targen joined	02:40
	→ kennethreitz joined	02:41
	← tchan left	02:42
	← ziggles left	02:48
	→ tchan joined	02:52
	→ smer joined	02:53
	→ JeremyWei joined	02:54
	← Yuuhi` left	02:54
	← bloony- left	02:55
	→ akosikeno joined	02:57
	← smer left	02:57
	→ bigkm joined	02:58
	← akosikeno left	02:58
	→ akosikeno joined	02:59
	← akosikeno left	02:59
	← kurtzhong left	02:59
	→ kurtzhong joined	03:00
	→ akosikeno joined	03:01
	→ kurtzhong_ joined	03:03
	→ timmywil joined	03:04
	← kurtzhong left	03:07
	kurtzhong_ → kurtzhong	03:07
	← ISF left	03:08
	→ tommyvyo joined	03:08
	→ orangehead joined	03:08
	→ intripoon_ joined	03:17
	← dot_null left	03:19
	← intripoon left	03:21
	→ munichpython joined	03:21
	← ilteris_ left	03:21
	→ BiggFREE joined	03:24
	← munichlinux left	03:24
	← shruggar left	03:25
	→ PCJockey joined	03:26
	→ ziggles joined	03:28
	← madewokherd left	03:30
	← rebaglia_ left	03:30
	→ rebagliatte joined	03:31
	← tshauck left	03:32
	→ cybersphinx joined	03:32
	→ towski joined	03:34
	← the_cybersphinx left	03:34
	← glennpratt left	03:34
	→ John joined	03:36
	← John left	03:36
	→ neurodrone joined	03:38
	← variable left	03:40
	→ krz joined	03:41
	← otakutomo left	03:45
	→ MUILTFN joined	03:47
	← mgpcoe left	03:48
	→ austinbv joined	03:52
	← thiago left	03:53
	→ austinbv_ joined	03:54
	← ziggles left	03:54
	munichpython → munichlinux	03:55
	munichlinux → JSLint	03:55
	← austinbv left	03:57
	austinbv_ → austinbv	03:57
	← PCJockey left	03:58
	← rebagliatte left	04:01
	← OOPMan left	04:03
	→ neunon joined	04:04
	← neunon left	04:04
	→ neunon joined	04:04
	→ madewokherd joined	04:07
	← GeertB left	04:12
	→ andrewsw joined	04:15
	← BiggFREE left	04:16
	← caseymcg left	04:16
	← arvind_khadri left	04:17
	← juvenal left	04:17
zarac	exit	04:18
	← zarac left	04:18
	→ juvenal joined	04:21
	→ DHowett joined	04:21
	← DHowett left	04:23
	→ OOPMan joined	04:23
	← basepi left	04:25
	→ xpot-mobile joined	04:27
	← LekeFly left	04:27
	← juvenal left	04:28
	→ basepi joined	04:28
	→ juvenal joined	04:30
	← [M]ax left	04:35
	→ [M]ax joined	04:36
	→ caseymcg joined	04:38
	← kukks left	04:40
	→ notbrent joined	04:42
	← rrs left	04:44
	→ rrs joined	04:46
	← JeremyWei left	04:48
	→ CaptainKnots joined	04:48
	← CaptainKnots left	04:48
	→ CaptainKnots joined	04:48
	← drev1 left	04:49
	← juvenal left	04:53
	← Davey left	04:54
	→ juvenal joined	04:57
	← ScottE left	04:57
	← Targen left	05:03
	← gbacon left	05:10
	← juvenal left	05:11
	→ drev1 joined	05:11
	← basepi left	05:11
	← sunaku left	05:12
	← berserkr left	05:12
	→ basepi joined	05:14
	← Dreamer3 left	05:15
	← madewokherd left	05:15
	→ JeremyWei joined	05:16
	← neurodrone left	05:17
	← Araxia left	05:18
	Araxia_ → Araxia	05:18
	→ juvenal_ joined	05:18
	→ Araxia_ joined	05:18
	→ shiba_yu36 joined	05:20
	→ flyz_ joined	05:20
	← mikepack left	05:20
	→ neurodrone joined	05:22
	← timmywil left	05:22
	← flyz left	05:23
	← [M]ax left	05:23
	→ bindaasomatic joined	05:25
	→ [M]ax joined	05:25
	← oriba left	05:27
	→ aspotashev joined	05:28
	← juvenal_ left	05:29
	→ austinbv_ joined	05:30
	← Araxia left	05:31
	Araxia_ → Araxia	05:31
	→ austinbv__ joined	05:31
	← austinbv left	05:32
	austinbv__ → austinbv	05:32
	→ Araxia_ joined	05:33
	← rrs left	05:33
	→ RickXy joined	05:34
	→ ArseneRe1 joined	05:34
	← austinbv left	05:34
	← austinbv_ left	05:35
	→ juvenal joined	05:36
	→ angelsl joined	05:39
	← juvenal left	05:40
	→ bronson_ joined	05:40
	← Bass10 left	05:41
	→ simplechat joined	05:41
	← simplechat left	05:41
	→ simplechat joined	05:41
	← JeremyWei left	05:41
	→ JeremyWei joined	05:42
	← JeremyWei left	05:42
	← notbrent left	05:44
	→ juvenal joined	05:47
	→ austinbv joined	05:49
	→ austinbv_ joined	05:53
	→ Targen joined	05:54
	← juvenal left	05:54
	← austinbv left	05:55
	austinbv_ → austinbv	05:55
	→ juvenal joined	05:55
	→ ipalaus_ joined	05:56
	→ eijk_ joined	05:59
	← eijk left	05:59
	← localhost left	06:00
	← adamm left	06:02
	← OOPMan left	06:02
	→ localhost joined	06:02
	← juvenal left	06:04
	→ juvenal joined	06:06
	← petteyg left	06:06
	← Cogito left	06:06
	→ Cogito joined	06:07
	→ dfr\|mac joined	06:07
	← wycks left	06:07
	→ sunaku joined	06:09
	→ maleknet joined	06:11
	← RickXy left	06:14
	← sunaku left	06:14
	→ JeremyWei joined	06:14
	← neurodrone left	06:15
	→ sunaku joined	06:15
	→ rrs joined	06:17
	← juvenal left	06:17
	→ dr34dl0ck joined	06:18
	← [M]ax left	06:18
	→ dtrott joined	06:19
	→ [M]ax joined	06:21
	← dfr\|mac left	06:22
	← w09x_ left	06:22
	← dirkle left	06:22
	→ juvenal joined	06:25
	→ dirkle joined	06:25
	← ipalaus_ left	06:25
	→ Max joined	06:31
	Max → Guest29155	06:31
	← juvenal left	06:34
	← cornbread left	06:34
	← dreiss left	06:35
	← dr34dl0ck left	06:36
	→ harshpb joined	06:36
	← emptyflask left	06:37
	← rrs left	06:39
	→ w09x joined	06:40
	→ rrs joined	06:41
Marquel	morning	06:42
	when i rebase a repos with removing commits, rebase say they get lost. do i get the state before the commit or after it?	06:43
	← harshpb left	06:43
	→ harshpb joined	06:44
	← caseymcg left	06:45
	← rrs left	06:46
	← aspotashev left	06:47
	→ rrs joined	06:47
	→ juvenal joined	06:47
	← w09x left	06:48
	← frogonwheels left	06:49
	← Araxia_ left	06:51
	← maleknet left	06:52
	← juvenal left	06:55
	→ Araxia_ joined	06:56
	→ Fandekasp joined	06:56
	← sunaku left	06:59
	← Chillance left	06:59
	→ dubwoc joined	06:59
	← drev1 left	06:59
	→ juvenal joined	07:03
	→ maleknet joined	07:06
	→ dreiss joined	07:06
	← kloeri left	07:06
	→ kloeri_ joined	07:06
	← juvenal left	07:07
	→ OOPMan joined	07:09
	← rrs left	07:10
	→ rrs joined	07:12
	→ arvind_khadri joined	07:12
	← arvind_khadri left	07:12
	→ arvind_khadri joined	07:12
	→ juvenal joined	07:14
	← Textmode left	07:15
	kloeri_ → kloeri	07:18
	→ ThomasLocke joined	07:19
	← ceej left	07:23
	→ Raging_Hog joined	07:24
	← JSLint left	07:26
	← juvenal left	07:27
	← Targen left	07:28
	← JeremyWei left	07:30
	→ eletuchy joined	07:30
	→ dangerousdave joined	07:34
	← [M]ax left	07:35
	→ [M]ax joined	07:37
	→ juvenal joined	07:38
	→ pidus joined	07:38
	→ Textmode joined	07:40
	→ caseymcg joined	07:41
	← harshpb left	07:42
	← juvenal left	07:45
	← arvind_khadri left	07:45
	← eletuchy left	07:45
	→ otakutomo joined	07:48
	← towski left	07:49
	← Samual left	07:50
	→ juvenal joined	07:55
	→ arvind_khadri joined	07:58
	→ harshpb joined	07:59
	← juvenal left	08:00
	→ juvenal joined	08:01
	← harshpb left	08:04
	→ aspotashev joined	08:05
	← juvenal left	08:06
	← aspotashev left	08:06
	← Cogito left	08:09
	→ juvenal joined	08:10
	→ rendar joined	08:10
	→ Cogito joined	08:11
	→ BasicXP joined	08:12
	← Fandekasp left	08:12
	→ Fandekasp joined	08:15
	← Cogito left	08:15
	← juvenal left	08:15
	→ vpopov joined	08:18
	→ juvenal joined	08:21
	← caseymcg left	08:21
	→ leen^\| joined	08:22
	← Dave^\|\| left	08:22
	dwmw2_gone → dwmw2	08:24
	→ mikepack joined	08:25
	← juvenal left	08:26
	← mikepack left	08:27
	→ juvenal joined	08:29
	→ cipher joined	08:30
	cipher → Guest24261	08:31
	→ heliom_ joined	08:34
	→ aspotashev joined	08:35
	→ mikepack joined	08:37
	← heliom left	08:37
	← mikepack left	08:38
	→ grekko joined	08:39
	← grekko left	08:39
	← juvenal left	08:40
	← [M]ax left	08:40
	→ grekko joined	08:40
	→ juvenal joined	08:40
	→ davey joined	08:41
	→ [M]ax joined	08:41
	← dnjaramba left	08:41
	→ dnjaramba_ joined	08:41
	→ mikepack joined	08:42
	→ robotmay joined	08:44
	→ ranulf joined	08:44
	→ d0k joined	08:46
	→ Jackneill joined	08:46
	← Jackneill left	08:46
	→ Jackneill joined	08:46
	← dnjaramba_ left	08:46
	→ dnjaramba joined	08:46
	← rrs left	08:49
	← juvenal left	08:49
	→ rrs joined	08:51
ranulf	hi all	08:51
	i'd like to see the full diffs of the last n commits of a given file	08:51
	from git-diff(1) and git-log(1) i cannot deduce how to make this work	08:52
	→ juvenal joined	08:52
	→ aurum23 joined	08:52
ranulf	does anyone have a pointer for this at hand?	08:52
	→ Safdar joined	08:52
	← aurum23 left	08:52
	← Safdar left	08:53
	→ Safdar joined	08:54
ranulf	urgs, got the solution. nvm :)	08:54
	← rrs left	08:57
	← juvenal left	08:57
	→ rrs joined	08:58
	← aspotashev left	08:58
	→ juvenal joined	09:01
	→ munichlinux joined	09:01
	→ knifed joined	09:02
	→ abcdefghijkl joined	09:02
	← Safdar left	09:03
	→ Safdar joined	09:04
	→ jhhhvv joined	09:04
	← juvenal left	09:05
	→ leotr joined	09:05
	ChanServ set mode: +v	09:06
Safdar	hi	09:07
	← jhhhvv left	09:07
leotr	hi! i made some changes to my code, but now i realized that it's too early to commit it. So i want to commit these changes to some branch (which is not created yet). What is the correct order of actions to be taken to complete it?	09:07
	← abcdefghijkl left	09:07
	← dirkle left	09:07
leotr	s/early to commit it/early to commit it to master branch	09:07
Safdar	i would like to ask if there is anywhere that i can find a Git 1.7.3 installation RPM for OpenSUSE 11.4. i've looked online and the only place it's available is on rpmfind.net, but none of the mirrors are working.	09:08
	→ aspotashev joined	09:08
	← dreiss left	09:11
Safdar	i would like to ask if there is anywhere that i can find a Git 1.7.3 installation RPM for OpenSUSE 11.4. i've looked online and the only place it's available is on rpmfind.net, but none of the mirrors are working.	09:11
ranulf	leotr: maybe you can stash the changes, create the branch and then apply the stash to the new branch	09:11
leotr	ranulf: ok thanks, will read docs about stash	09:12
	→ juvenal_ joined	09:13
	→ sickfisher joined	09:13
	← aspotashev left	09:14
	→ aspotashev joined	09:15
	← grekko left	09:15
	← blaenk left	09:16
	← aspotashev left	09:16
	← soulcake left	09:17
Safdar	hi! does anyone know how to get git 1.7.7 working on open SUSE 11.4? my system has glibc_2.11 installed already. however, the installer for git always fails with the error "nothing provides libc.so.6 (GLIBC_2.14)(64bit) needed by git-core-1.7.7.3-80.3.x86_64". then, when i try to install the glibc_2.14 RPM, i get another error that "glibc-devel-2.11.3-12.19.1.x86_64 requires glibc = 2.11.3, but	09:17
	this requirement cannot be provided". so what am i to do at this step?	09:17
	→ aspotashev joined	09:17
	→ grekko joined	09:17
	← OOPMan left	09:17
	← [M]ax left	09:19
	→ [M]ax joined	09:22
	→ w09x joined	09:22
	→ glcrazy joined	09:23
	← ranulf left	09:26
	→ ehsan joined	09:26
	← juvenal_ left	09:28
	→ drizzd joined	09:28
	← [M]ax left	09:29
	← xsbeats left	09:29
	→ harshpb joined	09:30
	← harshpb left	09:31
	→ harshpb joined	09:31
	→ [M]ax joined	09:31
	← w09x left	09:31
	← vpopov left	09:34
	→ bjhaid joined	09:34
	← munichlinux left	09:34
	→ munichlinux joined	09:43
	→ juvenal joined	09:43
	→ khmarbaise joined	09:43
	← MUILTFN left	09:44
	→ Shogoot joined	09:45
	← grekko left	09:46
	← harshpb left	09:47
	→ dSebastien joined	09:49
	← robotmay left	09:50
	→ vpopov joined	09:50
	→ vdv joined	09:51
	← juvenal left	09:52
	← munichlinux left	09:54
	← aspotashev left	09:54
	→ aspotashev joined	09:55
	← aspotashev left	09:55
	← happylife left	09:55
	→ juvenal joined	09:56
	→ happylife joined	09:58
	→ munichlinux joined	09:58
	← bartman left	10:00
	→ mishok13 joined	10:01
	→ aspotashev joined	10:01
	← vdv left	10:01
	→ harshpb joined	10:04
	← [M]ax left	10:05
	→ bartman joined	10:06
	→ churp joined	10:06
	→ Flawless joined	10:06
	→ Codif joined	10:07
	→ Cromulent joined	10:08
	→ [M]ax joined	10:08
	→ chromaticwt joined	10:11
	← tewecske left	10:11
	← knifed left	10:12
	← juvenal left	10:13
	← subbyyy left	10:15
	→ JeremyWei joined	10:15
	← Safdar left	10:15
	→ dr0id joined	10:16
	→ juvenal joined	10:19
	→ gusnan joined	10:23
	← juvenal left	10:24
	→ pimpin joined	10:24
	→ juvenal joined	10:25
	← Codif left	10:29
	→ Codif joined	10:29
	← aspotashev left	10:30
	→ aspotashev\| joined	10:30
	← Codif left	10:30
	→ lisak joined	10:30
	→ Codif joined	10:30
	← aspotashev\| left	10:30
	→ slonopotamus joined	10:30
	→ aspotashev joined	10:30
	→ pantsman- joined	10:31
	← juvenal left	10:32
	→ bibiDeskorolka joined	10:38
	← sirdancealot left	10:38
	→ juvenal joined	10:39
	→ jehoshua02 joined	10:40
	← angelsl left	10:41
jehoshua02	I'm unfamiliar with Mac. I'm trying to setup TextEdit as the editor for Git. Any help? Thanks.	10:41
rane_	nooo, don't use TextEdit for that	10:41
jehoshua02	rane_: thanks for the caution.	10:42
	My buddy just wants something in a window.	10:42
	Doesn't do well with terminal based editors.	10:42
	And I'd like his transition into git to be as smooth as possible. He doesn't have a lot of time to learn vim.	10:43
rane_	use nano then :p	10:44
dtrott	nano is installed by default on mac	10:44
jehoshua02	rane_: guess so.	10:44
	git config --global core.editor nano?	10:44
	→ tewecske joined	10:45
	→ vdv joined	10:45
	← juvenal left	10:47
	← darkskiez left	10:47
	← chromaticwt left	10:48
	→ chromaticwt joined	10:48
	→ airborn joined	10:48
rane_	yea	10:49
	← dr0id left	10:50
cbreak	jehoshua02: I recommend TextWrangler	10:50
	jehoshua02: it has the command line tool edit, which acts like a command line tool, but opens text in a normal text wrangler GUI window	10:51
	← mishok13 left	10:51
	→ Metathink joined	10:51
Metathink	hi	10:51
jehoshua02	cbreak: thank goodness. That would be awesome.	10:51
cbreak	it's a great programmers text editor too, with syntax highlighting and lots of other nice features	10:52
	http://www.barebones.com/products/textwrangler/	10:52
	you can also buy BBEdit from the same company I think	10:52
	← Daniel0108 left	10:52
	← nyuszika7h left	10:53
	→ sirdancealot joined	10:53
	← giallu left	10:53
jehoshua02	cbreak: Like this: git config core.editor "edit -w"?	10:53
cbreak	yeah	10:54
jehoshua02	k	10:54
	→ juvenal joined	10:54
	→ Pupeno joined	10:55
	→ babbio joined	10:55
	← mikepack left	10:55
cbreak	jehoshua02: I use edit --wait --resume	10:55
	← harshpb left	10:57
	→ mishok13 joined	10:57
	→ alansaul joined	10:59
	← juvenal left	10:59
	→ XThief joined	10:59
	→ kumbayo joined	10:59
	← babbio left	11:00
	→ babbio joined	11:01
	← leotr left	11:01
	→ frogonwheels joined	11:02
	→ Daniel0108 joined	11:02
	→ juvenal joined	11:03
	← babbio left	11:03
	→ babbio joined	11:03
	→ nyuszika7h joined	11:04
	← kurtzhong left	11:07
	← babbio left	11:08
	→ Yuuhi joined	11:08
	→ babbio joined	11:09
	← juvenal left	11:10
	← babbio left	11:10
	→ brian_g joined	11:12
	← orangehead left	11:12
	← dtrott left	11:13
	← dSebastien left	11:13
	← flyz_ left	11:14
	→ angelsl joined	11:14
	← slonopotamus left	11:15
	→ slonopotamus joined	11:15
	← Anubisss_ left	11:17
	→ ReekenX joined	11:17
jehoshua02	How to list the files existing at a particular commit?	11:17
wereHamster	ls-tree -r	11:18
jehoshua02	Am I in the right channel? That seemed like a unix answer, not a git answer.	11:18
cmn	read the command again	11:19
jehoshua02	git ls-tree -r	11:19
wereHamster	I just answered..	11:19
jehoshua02	Thanks.	11:19
	jehoshua02 needs sleep.	11:19
	→ cornbread joined	11:20
	→ Anubisss joined	11:20
	← Cromulent left	11:20
	← Derander left	11:20
	← [M]ax left	11:21
	→ Derander joined	11:21
	← slonopotamus left	11:21
	← Guest29155 left	11:22
	← bibiDeskorolka left	11:23
	← jehoshua02 left	11:23
	→ [M]ax joined	11:23
	← chrizz left	11:24
	→ workmad3 joined	11:25
	← ArseneRe1 left	11:25
	→ slonopotamus joined	11:27
	→ juvenal joined	11:29
	← slonopotamus left	11:32
	→ slonopotamus joined	11:34
	← juvenal left	11:34
	→ bibiDeskorolka joined	11:36
	→ DCC_SEND joined	11:36
	→ fermo joined	11:38
	→ juvenal joined	11:38
	→ __iron joined	11:39
	← drizzd left	11:41
	← juvenal left	11:43
	← _iron left	11:43
	← bauruine left	11:45
	← DCC_SEND left	11:45
	← munichlinux left	11:45
	→ whitman joined	11:47
	← Codif left	11:47
	→ juvenal joined	11:47
	→ Shusshu joined	11:48
	→ DCC_SEND joined	11:50
	→ w09x joined	11:52
	→ trochala joined	11:52
	← DCC_SEND left	11:54
	← alansaul left	11:54
	← frogonwheels left	11:55
	→ linusoleander joined	11:56
	← MacGyverNL left	11:57
	→ w0bni joined	11:57
	→ Max joined	11:58
	Max → Guest73248	11:59
	→ dexter_e joined	12:01
	← juvenal left	12:01
	← cornbread left	12:01
	← bibiDeskorolka left	12:01
	→ cmyk_ joined	12:02
	→ bibiDeskorolka joined	12:02
	→ juvenal joined	12:02
	→ MacGyverNL joined	12:02
	← MacGyverNL left	12:02
	→ MacGyverNL joined	12:02
	→ iband joined	12:03
	← bibiDeskorolka left	12:03
	→ bibiDeskorolka joined	12:03
	← bibiDeskorolka left	12:04
	→ bibiDeskorolka joined	12:04
	← [M]ax left	12:10
	→ drizzd joined	12:11
	← juvenal left	12:12
	→ [M]ax joined	12:12
	→ juvenal joined	12:14
	← drizzd left	12:15
	← workmad3 left	12:16
	← w09x left	12:16
rudi_s	Hi. Is it possible to use git's word diff capability (--color-words) to diff two untracked files?	12:16
	← bronson_ left	12:17
	→ mikewintermute joined	12:17
	← kpreid left	12:19
	← JeremyWei left	12:19
	→ kpreid joined	12:19
	← slonopotamus left	12:20
	→ j416 joined	12:21
	← babilen left	12:23
	→ grekko joined	12:23
	← juvenal left	12:23
wereHamster	git diff --color-words <file1> <file2>	12:24
	← fisted left	12:24
	← DofLeFou left	12:25
	← cyphase left	12:27
	← XThief left	12:28
	→ juvenal joined	12:28
	→ fisted joined	12:30
	→ herdingcat joined	12:30
	→ Kazoone joined	12:31
	← Kazoone left	12:31
	→ Codif joined	12:31
	→ Ryback_ joined	12:32
	← juvenal left	12:33
	→ YouToo joined	12:33
	← YouToo left	12:34
	→ XThief joined	12:34
	→ NerfOrNothin joined	12:34
	→ slonopotamus joined	12:35
	→ juvenal joined	12:35
	← NerfOrNothin left	12:35
	→ Dreamer3 joined	12:36
	→ empity joined	12:38
	← slonopotamus left	12:40
	→ cyphase joined	12:40
	← [M]ax left	12:40
	→ [M]ax joined	12:40
	→ workmad3 joined	12:41
	← chriswk left	12:41
	→ RoodyFootball joined	12:41
	→ dr0id joined	12:41
	→ Liquid-Silence joined	12:41
	← RoodyFootball left	12:41
	← juvenal left	12:43
	← pimpin left	12:44
	→ roktik joined	12:45
	← nyuszika7h left	12:46
	← Daniel0108 left	12:46
	← [M]ax left	12:46
	→ [M]ax joined	12:47
	→ amigojapan joined	12:48
	→ juvenal joined	12:50
	← bgerber left	12:51
	← koo1 left	12:51
	← koo0 left	12:52
	→ bgerber joined	12:53
	← workmad3 left	12:53
	→ LongBeach joined	12:56
	← roktik left	12:58
	← juvenal left	12:58
	→ iori joined	12:58
	→ slonopotamus joined	12:59
	← makubi_ left	12:59
	← herdingcat left	13:00
	← linusoleander left	13:00
	→ makubi joined	13:01
	→ juvenal joined	13:03
	→ herdingcat joined	13:03
	→ neurodrone joined	13:05
	← juvenal left	13:07
	← amigojapan left	13:08
	→ kurtzhong joined	13:08
rudi_s	wereHamster: Perfect. Thank you.	13:08
	← flaguy48 left	13:08
	→ thiago joined	13:08
	→ juvenal joined	13:11
	← [M]ax left	13:13
	→ rindolf joined	13:14
	← Guest73248 left	13:14
rindolf	Hi all. Assuming I have a .git directory - how do I get the working copy?	13:14
	I tried "git checkout ." and it didn't work.	13:15
wereHamster	rindolf: how did you create that .git directory?	13:15
	→ amigojapan joined	13:15
	→ cornbread joined	13:15
rindolf	wereHamster: someone gave me a tar to download using http://	13:15
	wereHamster: because github was SLOW.	13:15
wereHamster	is that a public repository?	13:16
rindolf	wereHamster: yes, it is.	13:16
wereHamster	rindolf: you can probably just clone it. But next time consider using https://bundler.caurea.org/	13:17
	← ramusara left	13:19
	→ jargon- joined	13:20
	← bibiDeskorolka left	13:21
	→ [M]ax joined	13:21
	← iband left	13:22
	→ workmad3 joined	13:24
	→ Max joined	13:24
	Max → Guest90282	13:25
rindolf	wereHamster: thanks for the tip.	13:25
	← cornbread left	13:26
	→ flaguy48 joined	13:27
TomyLobo	what is a bundle?	13:27
	← glcrazy left	13:27
wereHamster	TomyLobo: man git-bundle	13:27
jast	TomyLobo: automatic message the 'git-bundle' manpage can be found at http://jk.gs/git-bundle	13:27
	← nimrod10 left	13:27
TomyLobo	thanks	13:27
	basically a more compact implementation of the "rar'ed repo" idea	13:29
	sorry, tar+bzip2'ed repo	13:29
	← juvenal left	13:30
bremner	not exactly, since it takes a range of commits	13:31
	← Sonderblade left	13:31
	→ juvenal joined	13:32
	→ tic joined	13:32
	← lanthan left	13:33
	← Will\| left	13:33
	← juvenal left	13:33
	← Codif left	13:35
	← _Lukosanthropos left	13:36
	← s0undt3ch left	13:36
	← shoerain left	13:36
	← koollman left	13:36
	← errr left	13:36
	← harv left	13:36
	← merkosh left	13:36
	← wereHamster left	13:36
	← offby1 left	13:36
	← hyperboreean left	13:36
	← knittl left	13:36
	← pengwen left	13:36
	← thinice left	13:36
	← EgS left	13:36
	← Ender79 left	13:36
	← acidjazz left	13:36
	← johnhill left	13:36
	← Kicer86 left	13:36
	→ ilogger2 joined	13:36
	→ s0undt3ch joined	13:36
	→ Ender79 joined	13:36
	→ Lukosanthropos joined	13:36
	→ tm1000 joined	13:36
	→ coredumb joined	13:37
	→ juvenal joined	13:37
	→ hjdivad joined	13:37
	→ dermoth\|work joined	13:37
	→ stepnem joined	13:37
	→ rue joined	13:38
	→ cornbread joined	13:38
	→ Kicer86 joined	13:38
	→ tweakism joined	13:41
	→ blast_hardcheese joined	13:42
	← juvenal left	13:44
	→ TomyLobo2 joined	13:46
	TomyLobo2 → TomyLobo	13:46
	→ martinjlowm joined	13:47
	→ Nugget joined	13:47
	→ CaptainKnots_ joined	13:48
	→ Zeelot joined	13:49
	→ _nyuszika7h_ joined	13:50
	← _nyuszika7h_ left	13:51
	← cornbread left	13:51
	→ cornbread joined	13:51
	→ juvenal joined	13:54
	→ aidenhong joined	13:56
	← CaptainKnots_ left	13:57
	→ Daniel0108 joined	13:58
	→ _nyuszika7h_ joined	13:58
	← juvenal left	13:59
	← cornbread left	14:03
	→ juvenal joined	14:03
	→ cornbread joined	14:03
	→ whitman joined	14:06
	→ fayimora joined	14:07
	→ bgerber joined	14:07
	→ friskd_ joined	14:08
	← juvenal left	14:08
	friskd_ → friskd	14:09
	→ ilteris_ joined	14:10
	→ eephillip joined	14:11
	← bgerber left	14:11
	→ juvenal joined	14:12
	→ bgerber joined	14:13
	→ drizzd joined	14:13
	← cornbread left	14:16
	→ cornbread joined	14:17
sitaram	in fact, it can do almost everything that a regular fetch can do, and you can use it to keep not-connected machines uptodate (at the cost of manually transferring that file each time)	14:17
	→ pimpin joined	14:18
	→ Pingless joined	14:18
Pingless	hi all	14:19
	I have a problem	14:19
	I was in a branch of my project	14:19
	a friend sent me a patch, which I wanted to apply	14:19
	so I committed my branch, applied the patch	14:20
	now all the changes are gone and my commit isn't in the log	14:20
	although the patch was clearly applied	14:20
	but I;ve lost all my changes to the branch	14:20
	does anyone know what might have happened, and if/how I can undo it?>	14:20
j416	Pingless: it would help if you pastebin:ed what you did	14:20
Pingless	pastebin what exactly?	14:21
	I was using tortoisegit...	14:21
j416	the commands you did	14:21
	oh ok..	14:21
	can't help you there, sorry	14:21
	_nyuszika7h_ → nyuszika7h	14:21
	← juvenal left	14:21
Pingless	no way you can help me?	14:24
	Can you think of a reason why a commit would just disappear?	14:24
	→ linusoleander joined	14:25
	→ wereHamster joined	14:26
	→ [M]ax joined	14:26
bremner	reset and rebase can both give the appearence of commits disappearing.	14:26
	→ Max joined	14:27
	Max → Guest2543	14:28
	← cornbread left	14:28
	→ juvenal joined	14:29
bremner	I seem to recall that tortoise git does some strange things to give a "simplified" user experience, so it could be client related.	14:29
Pingless	I opened Git-GUI	14:29
	a different commit appeared, but the one with all my changes is gone...	14:30
bremner	Pingless: what is your goal at this point? to recover lost work or to understand what happened?	14:31
Pingless	mainly to recover lost work	14:33
	← juvenal left	14:33
Pingless	but understanding what happened would enable me to not do the same thing again	14:33
	← pimpin left	14:33
	← bgerber left	14:34
	→ trochala joined	14:34
	trochala → ctrochalakis	14:34
	→ juvenal joined	14:35
sitaram	Pingless: have you tried 'git reflog show'	14:36
	→ bgerber joined	14:36
Pingless	sitaram: I haven't let me try it	14:36
	→ cornbread joined	14:38
Pingless	sitaram: My commit is in there	14:38
	← bgerber left	14:38
Pingless	how can I revert to it?	14:39
	→ mishok13 joined	14:39
	→ bgerber joined	14:39
sitaram	Pingless: you don't "revert" to it, but you could try a cherry-pick of the commit using the SHA on that line	14:40
	Pingless: revert has a completely different meaning in git	14:40
Pingless	okay	14:40
	→ CaptainKnots joined	14:40
	← CaptainKnots left	14:40
	→ CaptainKnots joined	14:40
	← Guest2543 left	14:41
Pingless	is it possible to checkout to that state?	14:41
	← juvenal left	14:42
	→ ipalaus_ joined	14:43
	→ dexter_e joined	14:43
	→ TrineLocke joined	14:44
	← bgerber left	14:44
Pingless	okay, I managed to checkout to it	14:44
	I'll manage restoration from here	14:44
	thanks a lot, sitaram :)	14:44
	→ xsbeats joined	14:45
	→ flyz joined	14:46
	← dexter_e left	14:47
	→ madewokherd joined	14:49
	→ darkskiez joined	14:50
sitaram	Pingless: if you checkout to that state you can make a new branch with some new name at that state, then merge it into your master	14:50
	Pingless: as for understanding what happened, you need to read about 'detached HEAD'	14:51
	→ kvanderw joined	14:51
	← martinjlowm left	14:52
	← cornbread left	14:53
	→ cornbread joined	14:53
	← mishok13 left	14:54
	→ Codif joined	14:54
	→ bgerber joined	14:56
	→ ew0 joined	14:57
	→ juvenal joined	14:58
	→ ceej joined	14:58
	← juvenal left	15:02
	ChanServ set mode: +v	15:03
	← [M]ax left	15:03
Pingless	will do, thanks	15:04
	← Pingless left	15:04
	→ f0i joined	15:04
	← cornbread left	15:05
	→ cornbread joined	15:06
	→ [M]ax joined	15:06
	→ novettam joined	15:07
	← nyuszika7h left	15:09
	→ notbrent joined	15:09
	→ Prasad joined	15:09
	← aidenhong left	15:09
	← novettam left	15:09
	← Daniel0108 left	15:10
	← eephillip left	15:10
	→ danielpunt joined	15:10
	→ aspotashev joined	15:12
	→ nyuszika7h joined	15:15
	→ juvenal joined	15:16
	→ masando joined	15:18
	→ AutomaticKnife joined	15:18
	← CaptainKnots left	15:19
	→ Daniel0108 joined	15:19
	→ gusnan joined	15:19
	→ otakutomo joined	15:20
	← otakutomo left	15:21
	→ otakutomo joined	15:21
	← otakutomo left	15:22
	→ otakutomo joined	15:22
	→ alansaul joined	15:23
	→ johnkpau_ joined	15:25
	→ Max joined	15:31
	← cornbread left	15:31
	Max → Guest25689	15:31
	→ Error404NotFound joined	15:32
	← Error404NotFound left	15:32
	→ Error404NotFound joined	15:32
	→ ArseneRe1 joined	15:32
	→ cyphase joined	15:35
	→ gchristensen joined	15:35
	← juvenal left	15:36
	→ juvenal joined	15:38
	→ pimpin joined	15:39
	→ travisjeffery joined	15:40
	→ ManDay joined	15:40
	→ arvind_k joined	15:41
	→ leotr joined	15:46
leotr	hi! i comitted some changes in my local repository's master branch. But i'm not ready to commit them to origin. How do i move last N commits to a separate branch?	15:48
j416	leotr: see to it that everything is committed, then	15:49
	leotr: git branch separate_branch && git reset --hard HEAD^N	15:49
	oops	15:49
	→ XThief joined	15:50
j416	leotr: git branch separate_branch && git reset --hard HEAD~N	15:50
	there :)	15:50
leotr	j416: this will make a copy of master branch and then undo last N commits, right?	15:51
	← juvenal left	15:51
	← XThief left	15:51
j416	leotr: it will create a new branch pointing at where master points now, and then reset master back N commits.	15:51
leotr	j416: where can i read about difference between tilde and "^" sign?	15:52
j416	leotr: in the man page, but I forget which one	15:52
	^N means N:th parent	15:52
	← kvanderw left	15:52
j416	as in, if there are multiple parents, the N:th parent	15:52
	~N means N:th parent, as in, N=3 -> parent's parent's parent	15:53
cbreak	probably in man git-rev-parse	15:53
jast	automatic message the 'git-rev-parse' manpage can be found at http://jk.gs/git-rev-parse	15:53
	← danielpunt left	15:54
leotr	thank you	15:54
	→ kukks joined	15:54
	→ JoeyJoeJo joined	15:55
	← linusoleander left	15:55
	→ glennpratt joined	15:56
	→ mgpcoe joined	16:00
	→ workmad3 joined	16:00
	← leotr left	16:01
	→ juvenal joined	16:02
	→ emptyflask joined	16:03
	← juvenal left	16:07
	← workmad3 left	16:09
	→ juvenal joined	16:09
	→ shruggar joined	16:11
	→ berserkr joined	16:12
	→ aidenhong joined	16:13
	→ leotr joined	16:15
	→ odin_ joined	16:17
	→ Liquid-Silence joined	16:18
Liquid-Silence	is there any good git web interfaces for management out there simaler to github? but you can run it locally	16:18
	← juvenal left	16:19
odin_	I'd like to rebase -i, have it stop at a commit, have it stage the original commit (but allow me to edit working/stage trees), then continue with commit (this is to remove some lines from a commit which is at HEAD~3)	16:19
	if I "git rebase -i HEAD~3" and then make it "edit <commit-id>", I don't appear to be left with the working-tree/staged-tree state I expect	16:20
	→ subbyyy joined	16:20
Liquid-Silence	we are a small dev team and I need to sort out our automated build procedures etc....	16:21
	so I was thinking of using team city and git	16:21
cbreak	odin_: git rebase -i HEAD~4	16:21
	then select edit for the commit you want to edit	16:22
	then make the changes	16:22
	and then amend the commit	16:22
	(the one you want to edit will be the last commit, so it will be amended)	16:22
	after that, rebase --continue	16:22
Liquid-Silence	cbreak care to have a pm on some git questions	16:22
cbreak	Liquid-Silence: if you want management, check out gitolite	16:22
	it doesn't have anything web related, but it's management capabilities are excellent	16:23
Liquid-Silence	yeah	16:23
	we are going to use that	16:23
	I am just thinking of the branching strats	16:23
bremner	buildbot seems to work ok with git, if you want something simple	16:23
	→ vpopov joined	16:23
cbreak	There are many strategies for branching/merging	16:23
Liquid-Silence	well	16:24
cbreak	I work in small teams or solo, so we have one master, with lots of feature branches, one for each feature	16:24
	and those get rebased and then merged into master	16:24
	so we get a linear history	16:24
	→ dfr\|mac joined	16:24
odin_	cbreak, thanks for your response, have tried that kind of thing, I am not able to get "git diff --staged" to show me any data that I expect, after I use "edit"	16:24
Liquid-Silence	I was thinking	16:24
cbreak	it might be better to use merge --no-ff to group the features though	16:24
Liquid-Silence	master -> staging -> qa -> development -> Developer1 , Developer2 etc...	16:24
cbreak	odin_: it should show you nothing	16:24
odin_	"git diff" and "git diff --staged" return no changes	16:24
cbreak	odin_: since nothing will be staged	16:24
	that is working as intended	16:25
Liquid-Silence	then developers merge into dev branch which gets merged in qa etc....	16:25
odin_	how do I get it to stage, I want the state just before "git commit"	16:25
Liquid-Silence	when client is happy with qa we move into staging -> then rebase to live	16:25
cbreak	Liquid-Silence: sounds overly complicated	16:25
	but sure, why not	16:25
odin_	maybe I make a patch "git diff HEAD~3..HEAD~2" and apply that, at the time ?	16:25
Liquid-Silence	live being master	16:25
bremner	rebasing sounds like a terrible deployment strategy	16:25
Liquid-Silence	well staging will be what live will become	16:26
cbreak	I recommend to only rebase private/feature branches	16:26
Liquid-Silence	so rebase should be fine	16:26
cbreak	rebasing public history is _bad_	16:26
Liquid-Silence	or should we merge into master	16:26
cbreak	either merge, or reset	16:26
	and if you reset, make sure no one else ever bases work on that branch	16:26
bremner	you should mentally seperate version control from deployment, IMHO	16:26
cbreak	yeah, all those branches obviously have nothing to do with deployment	16:27
	you could just have lots of branches instead of live	16:27
	one for each version	16:27
	makes it easier to hot fix	16:27
Liquid-Silence	Well I would like to automate builds	16:29
	so staging will actually deploy to staging	16:29
cbreak	nightly build servers are no problem	16:29
Liquid-Silence	so what would you suggest mate/.	16:30
	for branches etc..	16:30
cbreak	see above	16:30
	→ soulcake joined	16:31
Liquid-Silence	well master will be live	16:31
	but I want to get the guys into a habbit of doing things right	16:32
	→ catsup joined	16:32
	→ juvenal joined	16:32
Liquid-Silence	so hotfixes should not happen on master	16:32
odin_	can I use: git commit --amend -e (but have it rollback commit, stage everything, and stop, while under rebase)	16:32
Liquid-Silence	there has to be a hostfix branch I think	16:32
EugeneKay	I would abandon the term "master" altogether(I in fact have)	16:32
Liquid-Silence	master being trunk / live	16:33
cbreak	odin_: why don't you just do what I told you?	16:33
	it's simple, easy, and you're done in a few seconds	16:33
odin_	which thing, "edit" does not stage any files	16:33
EugeneKay	I keep a "devel" branch, and then feature / user branches. Features are merged into dev, checked(you can push into a QA branch if you like, which will fire off the buildbot), and then merged into a stable-X.Y branch	16:33
cbreak	so?	16:33
	commit doesn't stage any files either	16:34
odin_	the change is not a file removal or addition, but line removal	16:34
cbreak	why do you care? if you want to stage files	16:34
	do it yourself	16:34
	so?	16:34
	remove the line	16:34
	stage the removal	16:34
	commit --amend	16:34
	done	16:34
	easy	16:34
odin_	no I want to remove the line from the patch but keep it in the working tree	16:34
	I am not deleting it, just removing it from the commit to be added	16:34
cbreak	you can't have a dirty tree during rebase	16:35
	just remove the line	16:35
	commit --amend	16:35
	and then add the line again later	16:35
	after you're done with rebasing	16:35
	→ Targen joined	16:35
	→ naee joined	16:36
odin_	ok I use format-patch, save everything, do a reset --mixed, modify the line status, then commit, then apply-mailbox after, this is the way I know	16:36
	← juvenal left	16:37
cbreak	just cut the line out of the file	16:37
	format-patch? are you dense? :/	16:37
	use git rebase -i, It'll do everything for you	16:37
	→ dreiss joined	16:37
odin_	can't have a dirty tree under a rebase, even if it wasn't dirty to start with, thanks for your assistance, but your way I remove work from project to put it back later (well might as well use format-patch as the process of saving that work)	16:39
cbreak	not really	16:39
	ah well, if you want to make yourself more work, go ahead	16:40
	but don't complain later that git makes your life more complicated if you don't want to just do the easy thing :D	16:40
RandalSchwartz	must be a guy. afraid of commit ing.	16:41
cbreak	:)	16:41
RandalSchwartz	I can't stand a dirty tree. I commit after every edit.	16:42
	that's the whole point of git... commits are cheap.	16:42
Ender79	and you can always reorganize (rebase) them to look sane later :)	16:42
RandalSchwartz	I tidy up later before pushing with git rebase -i	16:42
	yeah	16:42
Ender79	ah you said it :)	16:42
RandalSchwartz	and that helps me look brilliant!	16:43
	← aspotashev left	16:43
RandalSchwartz	"in one amazing moment of brilliance, he fixed the entire site slowdown!"	16:43
	← s0undt3ch left	16:45
	→ oc80z joined	16:45
	→ Samual joined	16:46
	→ s0undt3ch joined	16:46
	← dreiss left	16:47
EugeneKay	Liquid-Silence - please, no PMs.	16:47
	→ juvenal joined	16:49
	← Prasad left	16:50
	→ dotnull joined	16:50
	→ eephillip joined	16:52
	→ linusoleander joined	16:53
	→ mmw joined	16:54
	→ workmad3 joined	16:57
	→ bauruine joined	16:59
	← glennpratt left	17:00
	→ glennpratt joined	17:01
	→ Pilif12p joined	17:06
	← juvenal left	17:06
	→ Anubisss joined	17:09
	← Pilif12p left	17:09
	→ Pilif12p joined	17:09
	→ dirkle joined	17:14
	→ dzonder joined	17:18
	← dzonder left	17:18
	→ harshpb joined	17:19
	← ctrochalakis left	17:19
	← ManDay left	17:26
	← shruggar left	17:27
	→ spyro joined	17:27
	→ mishok13 joined	17:28
jast	wow, socat is insane	17:29
	jast uninstalls netcat	17:29
	→ kenta joined	17:30
	← oc80z left	17:30
	→ julius_ joined	17:31
julius_	hi	17:31
	→ babilen joined	17:31
	→ Destos joined	17:31
	→ oc80z joined	17:32
julius_	does git commit fail with error status 1 only if there is nothing to commit or does error status 1 also show other problems?	17:32
	→ orafu joined	17:32
	← [M]ax left	17:33
	→ khmarbaise joined	17:34
	→ [M]ax joined	17:34
wereHamster	I wouldn't rely on the exit code to have any particular meaning	17:35
RandalSchwartz	jast - socat is the bomb	17:35
	I have it in a dozen of my .ssh/config recipes already	17:36
	turning the corner in fun ways	17:36
jast	sounds evil	17:36
	offby1 rubs chin thoughtfully	17:36
	← JoeyJoeJo left	17:36
RandalSchwartz	well, aggressive corporate firewalls are evil :)	17:36
	thank goodness I have sshd running on port 443.	17:37
jast	indeed	17:37
	yeah, that helps	17:37
RandalSchwartz	that's an essential part of a few of the recipes	17:37
jast	I run openvpn on that part	17:37
	*port	17:37
RandalSchwartz	openvpn over tcp sucks though	17:37
jast	well, I run sshd on port 443, too	17:37
RandalSchwartz	tcp over tcp in general sucks	17:37
jast	yeah	17:37
	but it's better than nothing	17:38
RandalSchwartz	especially true when it's the first layer on a boat	17:38
	→ gnoel joined	17:38
RandalSchwartz	pings that get back to you after 25 seconds(!)	17:38
	"That's Not Right!!!"	17:38
jast	ah well, back to enjoying all the notation overhead of POE	17:38
	that IRC bot ain't gonna write itself	17:38
RandalSchwartz	python over ethernet? :)	17:38
jast	poe.perl.org	17:38
RandalSchwartz	oh. poe. yeah.	17:38
jast	I kind of like what it does, but not the way it looks	17:39
	→ khmarbaise_ joined	17:39
RandalSchwartz	yeah. I use the Moosey POE now	17:39
	offby1 dimly recalls being impressed with POE about 10 years ago	17:39
RandalSchwartz	easier.	17:39
	states are more descriptive	17:39
	← [M]ax left	17:39
	→ DarkAR joined	17:39
jast	does it magically provide an alternative interface for existing POE components, too?	17:40
	← khmarbaise left	17:40
	khmarbaise_ → khmarbaise	17:40
jast	btw, "Moosey POE" sounds awesome	17:40
	→ [M]ax joined	17:40
RandalSchwartz	as I recall, every method is automatically a state, etc etc	17:40
	← mmw left	17:41
jast	I guess that means I check it out	17:41
	→ dzonder joined	17:43
	← kenta left	17:44
	← linusoleander left	17:45
	→ cinaed joined	17:45
	← glennpratt left	17:45
	→ magnetik joined	17:47
	← workmad3 left	17:47
	→ icwiener joined	17:52
	← cinaed left	17:52
	→ cinaed joined	17:53
	← cinaed left	17:54
	→ cinaed joined	17:54
cinaed	.	17:56
	→ nax joined	17:56
	← cyphase left	18:00
	← magnetik left	18:00
	→ magnetik joined	18:01
	→ fayimora_ joined	18:05
	→ ISF joined	18:06
	→ bindaasomatic joined	18:07
	← fayimora left	18:09
	fayimora_ → fayimora	18:09
	← harshpb left	18:10
	← Destos left	18:13
	→ cyphase joined	18:16
	← oc80z left	18:17
	→ linusoleander joined	18:18
	← dfr\|mac left	18:18
	→ oc80z joined	18:19
	→ spearce joined	18:19
	→ jtdowney joined	18:21
	← ipalaus_ left	18:22
	← spearce left	18:22
	← aidenhong left	18:28
	← linusoleander left	18:30
	← eephillip left	18:30
	→ linusoleander joined	18:31
	→ Max joined	18:31
	→ khmarbaise_ joined	18:31
	Max → Guest480	18:31
	← subbyyy left	18:32
	← khmarbaise left	18:33
	khmarbaise_ → khmarbaise	18:33
	→ subbyyy joined	18:33
	← [M]ax left	18:34
	→ com4 joined	18:34
	← Guest25689 left	18:34
	→ [M]ax joined	18:35
	→ DofLeFou joined	18:36
	→ ThiefMaster[6] joined	18:37
	ThiefMaster[6] → ThiefMaster`work	18:37
	→ pantsman joined	18:38
	← pantsman left	18:38
	→ pantsman joined	18:38
	→ dv310p3r joined	18:38
	→ kmc joined	18:41
	← gchristensen left	18:42
	← leotr left	18:43
	→ slonopotamus joined	18:43
	→ Chillance joined	18:46
	→ jwmann joined	18:46
	← berserkr left	18:47
	→ ehsan joined	18:47
	→ antoniojasr joined	18:47
	→ gchristensen joined	18:48
	→ roflin joined	18:48
	← pimpin left	18:48
	→ pimpin joined	18:49
	← magnetik left	18:49
	→ mikepack joined	18:49
	← gnoel left	18:53
	← notbrent left	18:53
	→ iivvoo joined	18:54
	→ ggman joined	18:55
	→ BiggFREE joined	18:55
	← travisjeffery left	18:58
	→ travisjeffery joined	18:58
	← travisjeffery left	18:59
	← ehsan left	18:59
	→ travisjeffery joined	18:59
	→ XThief joined	19:02
	→ _Vi joined	19:04
	← oc80z left	19:05
	→ oc80z joined	19:06
	← slonopotamus left	19:07
	→ slonopotamus joined	19:07
	→ notbrent joined	19:08
	→ mjt joined	19:08
	→ OOPMan joined	19:08
	→ gnoel joined	19:10
	→ ehsan joined	19:12
	→ CaptainKnots joined	19:13
	← CaptainKnots left	19:13
	→ CaptainKnots joined	19:13
mjt	is there a way to configure a branch to be fetched from one remote and pushed to another?	19:13
jaalto	What was the add command options to "inport any code usptream may have changed"	19:13
FauxFaux	jaalto: That doesn't sound like something 'add' does. Explain further what you mean by "upstream"?	19:14
cmn	jaalto: update? -u	19:14
jaalto	FauxFaux,cmn: It's like this: (long time ago) "git add .; git commit -m upstream-1.0" (time passes, untar 1.1). That command was "git add <options>" to notify any chnages, add, removes, renames ...	19:16
FauxFaux	Oh, you're acting on tarballs. add -A # sounds like what you want.	19:16
	→ alberto56 joined	19:17
jaalto	FauxFaux: Yes, that was it. Thanks.	19:17
	← CaptainKnots left	19:19
	← BiggFREE left	19:20
	← ehsan left	19:22
	→ khmarbaise_ joined	19:23
	← slonopotamus left	19:24
	← khmarbaise left	19:25
	khmarbaise_ → khmarbaise	19:25
	← icwiener left	19:26
	→ adron joined	19:27
	→ khmarbaise_ joined	19:31
	← ggman left	19:31
mjt	is there a way to merge a branch like -s ours _but_ pull in any new files that old branch introduced?	19:32
	← khmarbaise left	19:33
	khmarbaise_ → khmarbaise	19:33
	→ Tabmow joined	19:33
	→ Chat131656565167 joined	19:33
j416	is there a way to do this with less typing: git checkout topic && git rebase master && git checkout master && git reset --hard topic	19:35
cmn	why don't you just merge?	19:35
j416	I'm thinking, I want to put my changes (even several commits) on top of master, in order to prepare to push it to a server (say using git svn)	19:35
	cmn: because of git svn	19:35
	→ simontol joined	19:35
	→ icwiener joined	19:36
	← Chat131656565167 left	19:36
	→ dr_lepper joined	19:37
j416	I read git merges will be handled as if they are just a commit with one parent, effectively ending up as if you had done a --squash merge	19:37
cmn	git-svn suports real merges nowadays	19:37
j416	oh really	19:37
	← gchristensen left	19:37
j416	I must have been reading old documentation then	19:37
cmn	it's relatively new	19:38
j416	you wouldn't happen to know which git version?	19:38
cmn	no idea	19:38
j416	super-new or been around for a little while at least?	19:38
cmn	git-svn is sort of its own thing	19:38
	just take the repo and use log on the script	19:38
	a couple of months, maybe?	19:38
j416	ok	19:39
	thanks	19:39
	→ CaptainKnots joined	19:40
	← CaptainKnots left	19:40
	→ CaptainKnots joined	19:40
simontol	How do I use tag eg."v0.1" as HEAD???	19:41
j416	man git-svn	19:42
jast	automatic message the 'git-svn' manpage can be found at http://jk.gs/git-svn	19:42
cbreak	simontol: make a branch for it	19:42
	or detach HEAD with git checkout	19:42
	I recommend making a branch	19:42
	like git checkout -b 0.1-working v0.1	19:42
simontol	I'm a newbie, can you give me step-by-step instructions?	19:43
RandalSchwartz	simontol - have you worked through the tutorial?	19:43
j416	cmn: hm, that man page, maybe it's old (?), but it does say "While git svn can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that users keep history as linear as possible inside git to ease compatibility with SVN"	19:43
	"Running git merge or git pull is NOT recommended on a branch you plan to dcommit from"	19:43
simontol	RandalSchwartz: I've read the tutorial , but I can't find how to do it...	19:44
	→ austinbv joined	19:44
cmn	you've been able to represent merges with git-svn for quite a long time	19:44
	but it involved changing the mergeinfo manually	19:45
RandalSchwartz	simontol - maybe you should also read the progit book too? :)	19:45
cmn	and relatively recently, git-svn learnt how to do it itself	19:45
j416	cmn: I wonder why it's not in the man page.. hmm	19:45
cmn	because nobody ever updates documentation	19:45
	→ austinbv_ joined	19:45
cmn	and the git-svn documentation is quite lacking	19:45
j416	:/	19:45
	that'll create problems for sure...	19:46
	← antoniojasr left	19:47
simontol	RandalSchwartz: I'll promise I'll read the entire book...but can you help me now?	19:47
RandalSchwartz	cbreak already answered you!	19:48
	← austinbv left	19:48
	austinbv_ → austinbv	19:48
cmn	hm, odd, I can't find a commit in maint where git-svn learn to do it itself, I wonder if they never merged it in	19:48
RandalSchwartz	if you don't know enough to even recognize an answer, you really need to be reading the book before coming here.	19:49
cmn	oh, it's in next	19:49
j416	cmn: so rather new, heh :)	19:50
	cmn: thanks.	19:51
cmn	it's also in master, it's bit confusing... it's included in 1.7.7	19:51
j416	that is weird	19:51
	hm	19:51
kevlarman	cmn: that recent?	19:51
cbreak	simontol: was I somehow unclear?	19:51
	→ towski joined	19:51
j416	I don't have a 1.7.7.n here to try	19:51
	I'll have a look later. thanks.	19:52
cmn	kevlarman: that's what tag --contains tells me	19:52
	→ brian_g joined	19:52
j416	cmn: what is the commit?	19:52
	→ wrecksdart joined	19:52
	← wrecksdart left	19:53
cmn	1e5814f3def08	19:53
	← OOPMan left	19:53
j416	thanks	19:53
	→ Ryback_ joined	19:54
	← Ryback_ left	19:54
	→ Ryback_ joined	19:54
	→ EricInBNE joined	19:54
ozzloy	simontol, what do you mean by "how do i use tag .. as HEAD?"? do you want to have v0.1 in your working directory, and have HEAD point at that?	19:56
	→ timmywil joined	19:56
j416	cmn: say I don't want to introduce merges anyway, is there a faster way to do it than I described?	19:56
	→ cipher joined	19:56
	← travisjeffery left	19:57
	← cipher left	19:57
	→ bigkm joined	19:57
cmn	read the manpages, some commands accept an extra branch name at the end	19:57
	→ timonia joined	19:57
cmn	which will make it checkout that branch	19:57
simontol	ozzloy : I've found it... thanks anyway	19:58
	bye	19:58
	← simontol left	19:58
ozzloy	k bye	19:58
	← oc80z left	19:58
	← ArseneRe1 left	19:59
	→ afief joined	19:59
	→ oc80z joined	20:00
	← towski left	20:00
	→ OOPMan joined	20:08
	→ CaptainKnots_ joined	20:08
	← CaptainKnots left	20:09
	→ jonnyATroot joined	20:11
	→ kvanderw joined	20:11
	← jonnyATroot left	20:12
	← babilen left	20:13
	→ program247365 joined	20:13
	→ jonnyATroot joined	20:14
	← kvanderw left	20:15
	→ imarcusthis joined	20:17
	→ Caraes_Naur joined	20:17
	← Caraes_Naur left	20:18
	← bindaasomatic left	20:18
	→ Caraes_Naur joined	20:18
	→ CannedCorn joined	20:19
	→ LekeFly joined	20:19
	← CaptainKnots_ left	20:20
	← program247365 left	20:21
	→ ineb joined	20:21
	ChanServ set mode: +v	20:22
	→ kvanderw joined	20:22
	→ glcrazy joined	20:26
	→ piotr joined	20:26
piotr	hi, how can I see the current revision?	20:26
	(equivalent of hg info)	20:27
RandalSchwartz	git branch	20:27
	git branch -v	20:27
	well - I dunno what hg info does, but if you're looking for the commit sha1, that's it	20:27
cmn	rev-parse HEAD will give you the latest commit	20:28
piotr	thanks	20:28
RandalSchwartz	that too	20:28
cbreak	git show	20:29
	git log	20:29
	→ program247365 joined	20:29
cbreak	git ls-remote	20:29
cmn	heh, it's hard to get git /not/ to tell you where you're at :)	20:30
	→ retoryter joined	20:31
	→ niloc132 joined	20:32
cbreak	get the git completion for bash	20:32
	→ zivester joined	20:32
cbreak	then it'll even be in the prompt	20:32
	← jonnyATroot left	20:33
	→ glennpratt joined	20:33
	→ jonnyATroot joined	20:34
	← jonnyATroot left	20:36
	→ jonnyATroot joined	20:36
	← jonnyATroot left	20:37
	← niloc132 left	20:39
	→ niloc132 joined	20:39
	← [M]ax left	20:39
	← drizzd left	20:40
	← niloc132 left	20:40
	← gnoel left	20:40
ineb	Which parts of the project history do you get if you pull the branch A?	20:40
	→ ntcase joined	20:41
cbreak	all in branch A will be merged into the current branch	20:41
	→ drizzd joined	20:41
RandalSchwartz	all the commits leading up to A	20:42
	← adron left	20:43
	→ jonnyATroot joined	20:44
	→ [M]ax joined	20:44
ineb	ah ok, as i thought. ty	20:44
	← jonnyATroot left	20:45
	→ jonnyATroot joined	20:46
j416	ineb: I'm curious, what would be another possibility?	20:46
	← CannedCorn left	20:47
	← jonnyATroot left	20:47
	→ jonnyATroot joined	20:48
cbreak	j416: no history... like in lesser SVNS	20:48
	... I meant SCMs :)	20:48
	→ Flawless joined	20:48
j416	ah, like squash merge	20:48
cbreak	yeah	20:48
j416	ty	20:48
	← oc80z left	20:49
	← arvind_k left	20:49
cbreak	I think they added a pull --squash too	20:49
	although that makes totally no sense at all :/	20:49
	pull --rebase had at least some usecases... :)	20:49
	← jonnyATroot left	20:49
	→ oc80z joined	20:50
	→ jonnyATroot joined	20:51
	← Codif left	20:52
	← jonnyATroot left	20:53
	→ jonnyATroot joined	20:54
EugeneKay	Sure it does.	20:54
	Pull from a repo where you're doing feature development into a canonical one.	20:55
	→ mithrida1es joined	20:55
	→ Codif joined	20:56
	← mithrida1es left	20:56
	← drizzd left	20:58
cbreak	EugeneKay: but then you lose all the precious history!	20:59
	that's despicable	20:59
	evil	20:59
EugeneKay	I didn't say it was a GOOD use case.	20:59
	→ caseymcg joined	21:00
	← program247365 left	21:02
	→ program247365 joined	21:03
	→ ReekenX joined	21:05
	→ canton7 joined	21:06
	← ReekenX left	21:06
	→ webpragmatist joined	21:07
	ChanServ set mode: +v	21:08
	→ shruggar joined	21:08
webpragmatist	Hey guys... i'm trying to figure out gitolite	21:08
	it's working on my local setup with keys but when I try to pull from the server it doesn't work	21:08
	same user	21:09
	same private key	21:09
	→ drev1 joined	21:09
webpragmatist	(it asks for a password)	21:09
EugeneKay	ssh -vvv	21:09
	And pastebin	21:09
	← ineb left	21:09
webpragmatist	EugeneKay: ??	21:10
EugeneKay	`ssh -vvv [email@hidden.address]	21:10
	← Tabmow left	21:10
webpragmatist	like try to connect to the repo server with -vvv ?	21:10
	gotcha	21:10
	→ Tabmow joined	21:10
	→ cwillu_at_work joined	21:10
webpragmatist	debug3: Not a RSA1 key file /home/cleblanc/.ssh/id_rsa.	21:10
	iterweseting	21:11
	← AutomaticKnife left	21:11
webpragmatist	EugeneKay: does the first line of the rsa have to contain the type?	21:12
EugeneKay	I said pastebin for a reason :-p	21:12
	It's probably just over-verbose meaningless debug stuff	21:12
webpragmatist	gotcha	21:12
	← bgerber left	21:12
	← glennpratt left	21:13
webpragmatist	http://pastie.textmate.org/private/ykio2mmi050j7fgikdtlw	21:13
	→ nsuss joined	21:13
	→ bainrychef joined	21:14
	← bainrychef left	21:14
	→ bainrychef joined	21:14
EugeneKay	`ls -alh .ssh` ?	21:15
webpragmatist	no such identitty?	21:15
	→ AutomaticKnife joined	21:15
	← bainrychef left	21:15
EugeneKay	Nah, that's just the old ssh-1 stuff its trying	21:15
webpragmatist	EugeneKay: ^^ on server or client	21:15
	→ bainrychef joined	21:15
EugeneKay	Client	21:15
	→ bgerber joined	21:16
	→ binarychef joined	21:16
webpragmatist	http://pastie.textmate.org/private/kdxjxo1a8sa1woanj4fq	21:16
	← binarychef left	21:16
	← bainrychef left	21:17
	→ binarychef joined	21:17
	← XThief left	21:17
	→ Agos joined	21:17
EugeneKay	Looks right.	21:18
	← bgerber left	21:18
EugeneKay	What's the ssh log whining about on the server when you try to connect with that key?	21:18
webpragmatist	let me look	21:18
	→ bgerber joined	21:18
	→ Octalot joined	21:19
	← mishok13 left	21:21
	← program247365 left	21:21
	← julius_ left	21:21
webpragmatist	EugeneKay: typicall sshd is logged where?	21:22
	i tried tailing auth.log	21:22
EugeneKay	/var/log/secure on RedHat alikes	21:22
	I dunno on Debalikes	21:22
webpragmatist	db	21:22
	deb*	21:23
EugeneKay	Google seems to suggest its auth.log	21:24
	Also, are you sure you copied the private key right? It looks like its just not parsing your id_rsa	21:24
	→ mishok13 joined	21:24
webpragmatist	EugeneKay: yea i would concur	21:24
EugeneKay	Given the ease of adding keys to gitolite users, you oughta just generate a fresh keypair for that box and add it to gitolite ;-)	21:24
webpragmatist	it's not trying private key auth	21:24
	hince why auth.log doesn't do anything (until i try an invalid password)	21:25
	EugeneKay: can a user have two private keys?	21:25
	or rather	21:25
EugeneKay	Sure.	21:25
webpragmatist	two key pairs	21:25
EugeneKay	Use the file-naming syntax [email@hidden.address]	21:25
	← ilteris_ left	21:26
webpragmatist	oh good idea	21:26
bremner	It's not just a good idea, its the documentation.	21:26
EugeneKay	Note that @hostname.doma.in will be considered an "email address", not a user@hostname ;-)	21:26
	← bauruine left	21:26
	→ MUILTFN joined	21:27
webpragmatist	gotcha	21:27
	← shruggar left	21:27
EugeneKay	(if you want to be really abusive, you can do [email@hidden.address]	21:27
	→ JoeyJoeJo joined	21:28
	→ ilteris_ joined	21:28
	→ nimrod10 joined	21:29
	→ bauruine joined	21:32
webpragmatist	so each user@hostname has to be configured though?	21:32
	← austinbv left	21:32
webpragmatist	(it's treated as another user in the perms)?	21:32
	→ austinbv joined	21:32
	→ roktik joined	21:34
cmn	user is the username, the @something is so you can have several	21:34
	→ maartenv joined	21:34
webpragmatist	well it complained that cleblanc has no perms	21:34
	→ nowhereman joined	21:34
webpragmatist	after i added the @hostname	21:34
EugeneKay	What's the new filename, exactly?	21:35
webpragmatist	[email@hidden.address]	21:35
	→ skammer joined	21:36
webpragmatist	kinda broke my admin perms by doing this too	21:36
	→ XThief joined	21:36
EugeneKay	I don't think - is an allowed character in the hostname bit	21:36
	→ sangguine joined	21:36
	→ joshsmith joined	21:36
	← kvanderw left	21:37
webpragmatist	that sucks	21:37
	← pimpin left	21:38
	← soulcake left	21:39
	→ kvanderw joined	21:39
	← mishok13 left	21:39
webpragmatist	wtf	21:43
	ya it didnt' even write the @-.pub	21:44
	to the repo?	21:44
EugeneKay	....did you git add it?	21:44
webpragmatist	no	21:44
	crap	21:44
	lol	21:44
	:(	21:44
	this is a bad day	21:44
EugeneKay	-_-	21:44
	At least you know what you did wrong	21:45
	I presume you know how to rollback gitolite	21:45
	← OOPMan left	21:47
webpragmatist	well... what i was going to try was just make changes using sudo -u git -i	21:48
	but that isn't quite working	21:48
	http://pastie.textmate.org/private/x2a3madeyclmlryqqlt8kw	21:48
	→ workmad3 joined	21:48
webpragmatist	is this no bueno?	21:50
	→ thews joined	21:50
	→ srk9 joined	21:51
webpragmatist	EugeneKay: ?	21:52
canton7	webpragmatist, see appendix 5 of https://github.com/sitaramc/gitolite/blob/pu/doc/ssh-troubleshooting.mkd	21:52
	→ [ESphynx] joined	21:53
	← bgerber left	21:54
	→ joeytwiddle joined	21:55
webpragmatist	cool.... so close	21:56
EugeneKay	`ssh gitolite@hostname info`	21:56
	→ bgerber joined	21:56
	← workmad3 left	21:57
	← johnkpau_ left	21:57
jargon-	what's the best practice for README files. in doc/ or in the repo root?	21:58
	github seems to look for it in repo root	21:58
cmn	github looks for it everywhere, but the readme is generally per module	21:59
	so usually you'll have it at the root	21:59
webpragmatist	well	21:59
	it's been fun	21:59
	now i'll actually get some real work done	21:59
	← webpragmatist left	21:59
jargon-	cmn: hmm. odd. in my repo root i get the yellow box that says: "We recommend adding a README to this repository. Visit github/markup for details on what formats we support.", even though my README is in doc/	22:00
cmn	that's because you don't have the README in the dir you're looking at	22:00
	← oc80z left	22:00
	→ oc80z joined	22:00
	→ Jonny_ joined	22:01
	Jonny_ → Guest85631	22:01
	← skammer left	22:02
	nowhereman → nowhere_man	22:03
	← whitman left	22:03
	→ root_ninja joined	22:04
	← root_ninja left	22:04
	← jonnyATroot left	22:04
	→ Samoi joined	22:04
	← Samoi left	22:04
	→ Samoi joined	22:05
	← Samoi left	22:05
	→ Samoi joined	22:05
	← Samoi left	22:05
	→ Samoi joined	22:05
EugeneKay	AFAIK, github is picky about README being in /	22:06
	(but doesn't show that warning for subfolders which lack READMes)	22:07
	I think it'll behave sanely if you symlink to the doc/README, but don't quote me on it.	22:07
	← retoryter left	22:08
	→ riper joined	22:09
	← [M]ax left	22:09
	→ robotmay joined	22:10
	← roflin left	22:10
	→ [M]ax joined	22:11
	← nax left	22:12
	→ w09x joined	22:12
	← icwiener left	22:14
	← DarkAR left	22:17
	← kvanderw left	22:18
	→ isxek joined	22:21
	→ frogonwheels joined	22:24
	← srk9 left	22:25
	← [M]ax left	22:27
	← dr_lepper left	22:27
	→ dr_lepper joined	22:30
	← dr_lepper left	22:30
	→ dr_lepper joined	22:30
	→ chrisf joined	22:30
	→ [M]ax joined	22:31
	← joeytwiddle left	22:33
	→ empity joined	22:33
	→ srk9 joined	22:35
	← afief left	22:37
	→ afief joined	22:37
	→ rhl joined	22:37
	→ dot_null joined	22:39
	→ vijayl joined	22:39
	← vijayl left	22:40
	← dot_null left	22:41
	← roktik left	22:42
	← binarychef left	22:42
	← afief left	22:42
	→ hacim joined	22:44
	← pantsman left	22:44
hacim	when I do a git remote update, and it says: 2cc7dcb..55a2f46 master -> origin/master	22:45
	how can I see what commits were pulled in?	22:45
	→ kvanderw joined	22:45
	→ icwiener joined	22:46
n1000	hacim: try git log 2cc7dcb..55a2f46	22:47
cbreak	just do a git log @{1}..HEAD	22:47
	← TrineLocke left	22:49
hacim	n1000: git log 2cc7dcb..55a2f46 doesn't show me the 2cc7dcb commit	22:49
	→ Swimming_Bird joined	22:50
	→ CannedCorn joined	22:50
	→ antoniojasr joined	22:51
	→ koo1 joined	22:51
	→ ZadYree joined	22:52
ZadYree	Hello	22:52
	← srk9 left	22:52
ZadYree	I've got a little problem: I just set up a git repo, but when installinh gitweb, /var/www/git does not exist. Any clue?	22:53
	→ srk9 joined	22:53
	→ koo2 joined	22:53
ZadYree	I use Debian 6	22:53
	→ icwiener_ joined	22:54
	← icwiener left	22:54
FauxFaux	ZadYree: I think debian want you to manually symlink gitweb into place; read /usr/share/doc/gitweb/* ?	22:54
	← riper left	22:55
ZadYree	ah so I would only have to symlink it?	22:56
	← Codif left	22:56
	← chrisf left	22:56
	← bigkm left	22:59
	← XThief left	23:00
	→ berserkr joined	23:01
	← icwiener_ left	23:02
	← CannedCorn left	23:03
	← srk9 left	23:04
	← empity left	23:05
	→ srk9_ joined	23:10
	← srk9_ left	23:10
	→ srk9_ joined	23:10
	→ bodom joined	23:10
	→ jimubao joined	23:14
	← [M]ax left	23:15
	→ chrisf joined	23:15
	→ ArseneRe1 joined	23:18
	← dr_lepper left	23:19
	→ dr_lepper joined	23:19
	← Guest85631 left	23:19
	→ [M]ax joined	23:20
	→ rebagliatte joined	23:21
	→ JonnyRo joined	23:21
	← dr_lepper left	23:24
	← [M]ax left	23:25
	→ Morphous joined	23:26
	→ [M]ax joined	23:27
	← canton7 left	23:28
	→ ehsan joined	23:28
	← ehsan left	23:28
	→ ehsan joined	23:28
	→ johnkpau_ joined	23:29
	→ ziggles joined	23:30
	← srk9_ left	23:30
	→ cgar joined	23:30
	→ jimubao_ joined	23:32
	← jimubao left	23:33
	← ceej left	23:35
	→ ProLoser\|Mac joined	23:38
	ChanServ set mode: +v	23:38
ProLoser\|Mac	weird	23:39
	hmm	23:39
	→ srk9_ joined	23:39
	ProLoser\|Mac → ProLoser	23:39
	← JoeyJoeJo left	23:40
	ProLoser → ProLoser\|Mac	23:40
ProLoser\|Mac	better	23:41
	okay so i have a submodule that is purely tracking a remote repo	23:41
	i switched the submodule to a different branch and attempted to update but i get merge conflicts	23:41
	1: i have no idea why i have merge conflicts, 2: If I commit the resolution, my remote will break	23:42
	for the parent project i mean	23:42
	what-do?	23:42
	← mgpcoe left	23:43
	← ehsan left	23:45
	→ ontologi1e joined	23:45
	← ArseneRe1 left	23:47
	→ ceej joined	23:48
	→ armenb joined	23:48
	← ontologi1e left	23:49
	→ radost joined	23:50
	← Agos left	23:52
	→ ontologia joined	23:53
ontologia	hi all	23:53
	← alansaul left	23:53
ontologia	I have a strange problem	23:53
	i have a local git and a simple repository in a server, i'm the only one which use it	23:54
	and suddenly i had "error: inflate: data stream error (incorrect data check)"	23:55
	error: corrupt loose object '0e84cd7f71111d1326d8e457fd16816e3a277e48'	23:55
	it happened first when I did 'git commit -am ...."	23:56
	← Ryback_ left	23:57
	→ oriba joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation