IRCloggy #git 2016-03-26

Provider of IRC logs since 2005.

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

	2016-03-26
onur	How can I completely remove it from my local repo	00:00
	← karoal left	00:00
	→ netj joined	00:00
	← realz left	00:01
	← imachuchu left	00:02
	→ dling joined	00:02
	← Agent_137 left	00:02
onur	ahh its git branch -rd	00:03
	← daito left	00:03
	← jagob left	00:03
	→ vervet joined	00:04
	→ jagob joined	00:05
	← optikalmouse left	00:06
	← intellix left	00:06
	→ Lyqyd joined	00:07
	← larondum1 left	00:07
	← runlevl4_ left	00:08
	← al-damiri left	00:09
	← pamplemousse left	00:09
	→ pamplemousse joined	00:09
	→ runlevl4 joined	00:10
	→ boombatower joined	00:11
	→ CEnnis91 joined	00:14
i7c	onur, der is also git remote prune	00:14
	there*	00:15
	→ p-l joined	00:16
	← LeMike left	00:17
	← clemf left	00:17
	→ stevenxl joined	00:17
	← drewbro left	00:18
	→ meloc joined	00:19
	← HoloIRCUser2 left	00:19
	← M-meznak left	00:20
	→ M-meznak joined	00:20
	← nilg left	00:20
	M-meznak → meznak	00:21
	→ monoda joined	00:21
	→ nobso joined	00:21
	← st0opkid left	00:22
	→ sto0pkid joined	00:22
	← sangy left	00:23
	← cagmz left	00:24
	← afuentes left	00:24
	→ fission6 joined	00:26
	→ xlegoman joined	00:26
	← floatingpoint left	00:27
	→ rolha_ joined	00:27
	→ drewbro joined	00:29
	← rolha left	00:30
	→ mwhooker joined	00:30
	← sto0pkid left	00:31
	→ st0opkid joined	00:31
	→ nilg joined	00:33
	→ hahuang61 joined	00:34
	← hahuang65 left	00:34
	→ evertheylen82 joined	00:35
	← elastix left	00:36
	→ wrouesnel joined	00:37
	→ al-damiri joined	00:37
	→ CheckDavid joined	00:37
	← rMdes left	00:39
	← EvilPenguin left	00:39
	→ SimonNa joined	00:39
	← xyzzy42 left	00:39
	→ flaguy48 joined	00:39
	← frogonwheels left	00:40
	← glebihan_ left	00:41
	→ sangy joined	00:41
	→ Aerosonic joined	00:41
	← bamb left	00:42
	→ Lipp_ joined	00:42
	← pamplemousse left	00:42
	← Bruce_ left	00:42
	→ Sleepy63 joined	00:42
	→ Lunatrius` joined	00:43
	→ mehola joined	00:43
	→ m0viefreak joined	00:43
	← drewbro left	00:44
	→ frogonwheels joined	00:44
	← Lipp left	00:45
	← Lunatrius left	00:45
	Lunatrius` → Lunatrius	00:45
	← sangy left	00:46
	← nilg left	00:47
	← mehola left	00:48
	← annoymouse left	00:48
	→ clemf joined	00:50
	← p-l left	00:50
	← Sasazuka left	00:51
	→ parsnip joined	00:53
	← aax left	00:54
	→ liamonade joined	00:54
parsnip	so without actually reading the docs or simply trying, if i have a git-controlled directory inside of another, i can push them separately, and any pulls will pull them down separately? and the git pull recursively is how i can clone both at same time?	00:55
	→ jenia joined	00:56
	← clemf left	00:56
parsnip	in simpler terms, i'd like to have my resume-producing directory as a subdirectory as my static blog directory, which will pull from inside the resume repo... not sure of sanest way to go.	00:57
frogonwheels	parsnip: !subrepo	00:57
gitinfo	parsnip: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	00:57
	← rolha_ left	00:58
	← mattfoo left	00:58
parsnip	frogonwheels: aha, thanks, i'll try to remember the !subrepo, and just go with the .gitignore for simplicity for now. thanks!	00:59
	← fstd left	00:59
gitinfo	frogonwheels: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	00:59
	→ fstd joined	00:59
	→ jimi_ joined	00:59
parsnip	oh no, can't escape the exclamation i guess :(	00:59
	← netj left	01:00
frogonwheels	fstd: :) It might be that what you are doing is the best way of handling it.. it all depends on the relationship between the repos.	01:00
	→ netj joined	01:00
	← bronson left	01:00
	→ daito joined	01:00
	← Muzer left	01:03
	← Alistair left	01:03
	← ToBeCloud left	01:04
	→ arescorpio joined	01:04
	← fission6 left	01:04
	→ Alistair joined	01:05
	← daito left	01:05
	→ mattfoo joined	01:05
	→ afuentes joined	01:07
	→ ochorocho__ joined	01:07
	← chris2 left	01:08
	← ochorocho__ left	01:12
	→ drewbro joined	01:12
	→ nobso_ joined	01:12
	← afuentes left	01:13
	→ nettoweb joined	01:13
	← radens left	01:15
	← nobso_ left	01:15
	→ chris2 joined	01:16
	← drewbro left	01:16
	← nobso left	01:17
	→ Bruce_ joined	01:18
	← joki left	01:18
	← hightower3 left	01:20
	← diogenese left	01:20
	→ pwnz0r joined	01:21
	← vervet left	01:22
	→ mellernoia-work joined	01:22
	→ stormlrd joined	01:22
	← stevenxl left	01:23
	← mellernoia left	01:24
	→ joki joined	01:25
	← _FrenchLessons left	01:25
	← jenia left	01:28
	→ sto0pkid joined	01:28
	← st0opkid left	01:28
	→ diogenese joined	01:28
	← Lyqyd left	01:31
	← cagedwisdom left	01:31
	→ rkazak joined	01:31
	← flaguy48 left	01:34
	← PryMar56 left	01:34
	← rpdprd left	01:35
	→ rpdprd joined	01:35
	← monoda left	01:35
	← pwnz0r left	01:38
	→ bronson joined	01:40
	← mwhooker left	01:41
	→ flaguy48 joined	01:41
	← rkazak left	01:41
	→ dmj joined	01:41
	← absk007 left	01:41
	→ cagedwisdom joined	01:43
	→ Woody_ joined	01:43
	← Sleepy63 left	01:45
	← stormlrd left	01:45
	← jimi_ left	01:46
	← nettoweb left	01:46
	← garyserj left	01:46
	→ garyserj joined	01:46
	← rubie left	01:49
	→ aidalgol joined	01:50
	→ stevenxl joined	01:55
	← bronson left	01:55
	→ hanthings_ joined	01:55
	→ stormlrd joined	01:56
	← hanthings left	01:58
	→ ahr3n joined	01:59
	→ wiky joined	01:59
	→ Sasazuka joined	01:59
	← stevenxl left	01:59
	← frogonwheels left	02:00
	← pks left	02:00
	→ st0opkid joined	02:00
	→ fission6 joined	02:00
	→ daito joined	02:01
	→ jeffreylevesque joined	02:01
	→ tsums joined	02:03
	→ Vampire0_ joined	02:03
	← Vampire0_ left	02:03
	→ Vampire0_ joined	02:03
	← sto0pkid left	02:03
	← Sasazuka left	02:04
	→ ensyde__ joined	02:04
	← shruggar left	02:04
	→ antispaceman joined	02:05
	→ pks_ joined	02:05
	→ stevenxl joined	02:05
	← daito left	02:05
	← ahr3n left	02:05
	← stormlrd left	02:06
	← cmosguy left	02:06
	← Bruce_ left	02:06
	→ frogonwheels joined	02:06
	← crdpink2 left	02:07
	← Vampire0 left	02:07
	← antispaceman left	02:09
	← moei left	02:10
	→ mwhooker joined	02:11
	→ moei joined	02:15
	→ Sleepy63 joined	02:15
	← mwhooker left	02:16
	→ preyalone joined	02:16
	→ rubie joined	02:17
	← rubyonrailed left	02:17
	→ rubyonrailed joined	02:17
	← wiky left	02:19
	← elementalest left	02:20
	→ wiky joined	02:20
	→ a_thakur joined	02:20
	← wiky left	02:20
	→ wiky joined	02:21
	← m1dnight_ left	02:23
	← cdg left	02:24
	← wiky left	02:24
	→ kfoonamalik joined	02:24
	→ nandi_ge___ joined	02:26
	← Limes_ left	02:27
	← zso left	02:28
	← mkelly left	02:28
	← fission6 left	02:28
	→ cdg_ joined	02:28
	← hanthings_ left	02:29
	← apotry left	02:29
	→ mablae_ joined	02:30
	→ Bruce_ joined	02:33
	→ Goplat joined	02:33
	← mablae left	02:34
	→ nilsi_ joined	02:35
	→ sargas joined	02:35
	→ zso joined	02:36
	→ m1dnight_ joined	02:36
	→ Lyqyd joined	02:37
	→ tang^ joined	02:37
	← tang^ left	02:38
	← mellernoia-work left	02:38
	→ tang^ joined	02:38
	← cagedwisdom left	02:38
	→ stormlrd joined	02:39
	← st0opkid left	02:41
	→ st0opkid joined	02:42
	→ Mateo_W joined	02:44
	→ ejnahc joined	02:44
	← pwnawannab[NE] left	02:47
	← kfoonamalik left	02:47
	← daguilaraguilar left	02:48
	← LaptopBrain left	02:52
	→ daguilaraguilar joined	02:52
	← kam270 left	02:53
	→ Corosus joined	02:53
	← johnmilton left	02:54
	← tang^ left	02:55
	← Corosus__ left	02:55
	→ bronson joined	02:56
	← Lyqyd left	02:56
	→ tang^ joined	02:56
	→ mwhooker joined	02:58
	← a_thakur left	02:59
AciD`	hey	02:59
	← stormlrd left	02:59
	← bq left	02:59
AciD`	I have my HEAD one commit after my master. How should I proceed to make master point to my HEAD?	02:59
	→ elementalest joined	02:59
	← HelloAtMega left	03:00
_ikke_	git checkout master && git merge HEAD@{1}	03:00
	← bronson left	03:01
AciD`	thanks	03:01
	→ safe joined	03:02
	← Lipp_ left	03:05
	← hexagoxel left	03:05
	→ mehola joined	03:05
	→ Lipp joined	03:05
	← chachasmooth left	03:06
	→ PyroPeter_ joined	03:07
	→ hexagoxel joined	03:07
	← arooni left	03:08
	→ ochorocho__ joined	03:08
	→ chachasmooth joined	03:08
	← PyroPeter left	03:09
	PyroPeter_ → PyroPeter	03:09
	→ pwnz0r joined	03:10
	← Lipp left	03:10
	← ochorocho__ left	03:13
	← polyzen left	03:15
	← garyserj left	03:15
	→ garyserj joined	03:16
	← fenugrec_ left	03:16
	→ brinck10 joined	03:16
	→ rkazak joined	03:16
	← rubie left	03:18
	← JanC left	03:18
	← qhp left	03:19
	→ qhp joined	03:20
	← brinck10 left	03:21
	← bluezone left	03:21
	→ polyzen joined	03:21
	← Harriet left	03:21
	← relipse2 left	03:22
	← Ahmed90 left	03:24
	→ JanC joined	03:25
	→ rubie joined	03:26
	← st0opkid left	03:29
	→ st0opkid joined	03:29
	← Vivek left	03:30
	→ Vivek joined	03:30
	Vivek → Guest15833	03:31
	← trickzero left	03:31
	← cite left	03:32
	→ cite joined	03:32
	← pwnz0r left	03:34
	→ User458764 joined	03:37
	→ Lipp joined	03:39
	→ cabargas joined	03:40
	← Mateo_W left	03:45
	→ Mateo_W joined	03:45
	← CEnnis91 left	03:45
	← nydel07 left	03:46
	← harish_ left	03:47
	→ harish joined	03:47
	→ stormlrd joined	03:49
	← harish left	03:49
	← netj left	03:49
	→ netj joined	03:49
	← Lipp left	03:50
	← tsums left	03:54
	← ensyde__ left	03:54
	← cdg_ left	03:57
	→ cdg joined	03:57
	← ejnahc left	03:57
	← stormlrd left	03:58
	→ a_thakur joined	03:58
	← raininja left	03:59
	→ monoda joined	04:00
	← garyserj left	04:00
	← Sonicbit left	04:00
	→ garyserj joined	04:01
	→ daito joined	04:02
	← linuxmodder- left	04:02
	→ linuxmodder- joined	04:02
	← linuxmodder- left	04:02
	→ linuxmodder- joined	04:02
	← daito left	04:06
	← User458764 left	04:07
	← st0opkid left	04:07
	→ st0opkid joined	04:08
	← liamonade left	04:09
	← a_thakur left	04:11
	← simon816 left	04:13
	← daguilaraguilar left	04:13
	← st0opkid left	04:13
	→ st0opkid joined	04:13
	→ treaki_ joined	04:19
	← treaki left	04:23
	← Aboba left	04:23
	→ diegoaguilar joined	04:23
	← Woody_ left	04:26
	→ brinck10 joined	04:32
	← reverse_1ight left	04:32
	→ mizu_no_oto joined	04:33
	← preyalone left	04:33
	← yqt left	04:34
	← mizu_no_oto left	04:35
	← brinck10 left	04:36
	← monoda left	04:37
	→ Olipro_ joined	04:37
	Olipro_ → Guest50706	04:38
	← nilsi_ left	04:39
	← fracting left	04:43
	→ fracting joined	04:44
	→ charlieWONG joined	04:45
	→ mkelly joined	04:47
	→ mizu_no_oto joined	04:49
	← sargas left	04:50
	→ tsums joined	04:50
	→ bq joined	04:50
	→ monoda joined	04:51
	→ dineshp joined	04:52
	← Gamecubic left	04:54
	← tsums left	04:54
	← bq left	04:57
	→ bq joined	04:58
	← tristanp left	05:00
	← boombatower left	05:01
	← Mateo_W left	05:01
	→ Limes_ joined	05:01
	← cdg left	05:01
	→ mayankphone joined	05:02
	→ nilsi_ joined	05:02
	← arescorpio left	05:02
	→ dreiss joined	05:04
	← sdothum left	05:06
	→ sdothum joined	05:07
	→ t-mart__ joined	05:08
	→ ochorocho__ joined	05:09
	→ cagedwisdom joined	05:11
	← t-mart_ left	05:11
	→ GnuYawk joined	05:13
GnuYawk	anyone ever use bzr?	05:13
	if so...thoughts?	05:13
	← ochorocho__ left	05:14
	→ staticshock_ joined	05:14
	← dineshp left	05:14
	← stevenxl left	05:17
	← kfpratt left	05:18
	← mizu_no_oto left	05:20
	← monoda left	05:20
	← dreiss left	05:21
	← cagedwisdom left	05:21
	← ffio left	05:22
	→ astrofog joined	05:22
	→ ffio joined	05:23
	→ sargas joined	05:23
	← sdothum left	05:25
	→ sdothum joined	05:26
	← fscala left	05:26
	→ fscala joined	05:27
	← \toothrot left	05:29
	→ titanium17 joined	05:29
	← Bruce_ left	05:30
	→ toothrot joined	05:31
	→ kfpratt joined	05:31
	← hahuang61 left	05:32
	→ mashu joined	05:33
	→ cagedwisdom joined	05:33
	→ titanium17_ joined	05:33
	← titanium17 left	05:33
	← mashu left	05:35
	← kfpratt left	05:36
	→ Bruce_ joined	05:37
	→ mashu joined	05:38
	→ monoda joined	05:38
	→ relipse2 joined	05:39
	→ Lauven joined	05:40
	→ PaulCape_ joined	05:43
	→ hahuang61 joined	05:43
	← mashu left	05:44
	← Cabanossi left	05:44
	→ a_thakur joined	05:44
	→ mashu joined	05:44
	← PaulCapestany left	05:45
	← relipse2 left	05:45
	← lindenle left	05:46
	← mashu left	05:46
	→ Cabanossi joined	05:46
	→ mashu joined	05:46
	← robbyoconnor left	05:49
	→ bluezone joined	05:50
	← sargas left	05:50
	→ tsums joined	05:51
	→ nitin joined	05:52
	← eletuchy left	05:53
	→ eletuchy joined	05:53
	→ bronson joined	05:54
	← tsums left	05:56
	→ dreiss joined	05:56
	← timotheus-booth left	05:56
	← eletuchy left	05:57
	← mashu left	05:58
	← bluecrow left	05:58
	← st0opkid left	05:58
	→ mashu joined	05:58
	→ st0opkid joined	05:59
	← dermoth left	06:00
	→ dermoth joined	06:00
	← titanium17_ left	06:01
	→ daito joined	06:02
	← diegoviola left	06:02
	→ brinck10 joined	06:03
	← st0opkid left	06:03
	→ sto0pkid joined	06:03
	→ titanium17 joined	06:03
	→ tristanp joined	06:03
	→ vdv joined	06:05
	← toothrot left	06:05
	← daito left	06:07
	← brinck10 left	06:07
	← tristanp left	06:08
	← dreiss left	06:10
	← netj left	06:12
	→ netj joined	06:12
AciD`	am I doing something wrong there : I'm on a branch, I add some new files and some modified ones into the index of that branch. Now, if I checkout master, I still see those files into the index. Aren't those change supposed to stay in the branch?	06:12
	← PaulCape_ left	06:13
	→ PaulCapestany joined	06:14
	→ Lipp joined	06:14
	→ toothrot joined	06:14
	→ phaleth joined	06:15
	→ irqq joined	06:15
	← rubyonrailed left	06:16
	← phaleth left	06:17
	← Aerosonic left	06:17
	→ phaleth joined	06:17
	← a3Dman left	06:18
	← Lipp left	06:19
	→ apotry joined	06:19
	→ fbwnd joined	06:20
	→ glebihan joined	06:21
	← bronson left	06:21
	→ a3Dman joined	06:23
	← diegoaguilar left	06:23
	→ sanketdg joined	06:24
	← bq left	06:25
	→ mayankgupta04 joined	06:25
	→ steven_a_s joined	06:26
	← steven_a_s left	06:26
	← mayankphone left	06:27
	← cabargas left	06:32
	← sto0pkid left	06:33
	← staticshock_ left	06:33
	→ zhuyue0 joined	06:33
	→ steven_a_s joined	06:33
	← steven_a_s left	06:34
	← mkelly left	06:35
	← Bruce_ left	06:36
	→ zhuyue joined	06:39
	← mashu left	06:39
	← zhuyue0 left	06:39
	→ User458764 joined	06:39
	← zhuyue left	06:39
	← CheckDavid left	06:41
sig	I'm guessing they aren't part of a commit yet since they were just added	06:41
	so they still kind of hang around outside the repo	06:42
	→ LeMike joined	06:42
sig	until they're committed	06:42
	you might want to checkout your branch, commit those files, then checkout master again	06:42
	or alternatively stash them	06:43
	→ thiago joined	06:44
	→ ochorocho__ joined	06:45
	→ aian joined	06:45
	→ zhuyue joined	06:45
	← nilsi_ left	06:46
	→ LucaTM joined	06:47
	← al-damiri left	06:49
	← ochorocho__ left	06:49
	← zhuyue left	06:51
	→ Muzer joined	06:52
	← jaafar left	06:52
	→ tsums joined	06:53
	← Cabanossi left	06:54
	→ zhuyue joined	06:54
	→ eletuchy joined	06:55
	← charlieWONG left	06:57
	← tsums left	06:57
	← eletuchy left	07:00
	→ bq joined	07:01
	→ Cabanoss- joined	07:03
	pks_ → pks	07:04
	Cabanoss- → Cabanossi	07:05
	← thiago left	07:05
	→ thiago joined	07:06
	→ charlieWONG joined	07:08
	← zhuyue left	07:09
	← a_thakur left	07:11
	→ clemf joined	07:15
	← clemf left	07:16
	→ zhuyue joined	07:16
	← nitin left	07:17
	→ toogley1 joined	07:18
	→ clemf joined	07:19
	→ hightower3 joined	07:19
	← toogley left	07:20
	← astrofog left	07:20
Seveas	AciD`: there's no 'index of a branch'. There's just one index.	07:21
	→ btcquant joined	07:21
	← aidalgol left	07:21
	→ bronson joined	07:22
btcquant	Hi - need some help cleaning up a git repo. I accidentally commited 3 HUGE csv files, which then got pulled into several machines. Now, the repo is 4.3G (for a small amount of actual code.) I've deleted the files with git rm --cahced *.csv, but the items in git/objects are still huge. Also tried git -gc, but that didn't help. Any ideas? (Otherwise, I'll have to kill the repos, and start fresh, with just the code files, but that	07:23
	seems wasteful.)	07:23
LordRyan	Squash commits and force push?	07:25
	→ raijin joined	07:26
	← bronson left	07:27
btcquant	How do I do that? (Fiarly new to git.)	07:27
	← hahuang61 left	07:28
	← mayankgupta04 left	07:28
	← aian left	07:29
	→ a_thakur joined	07:31
	→ rrr_ joined	07:33
	→ rrr__ joined	07:34
	← rrr__ left	07:34
	→ rrr___ joined	07:36
	← bq left	07:36
	rrr___ → bq	07:36
	← rrr_ left	07:38
	← fbwnd left	07:39
	→ josuebrunel joined	07:40
	→ MrWoohoo joined	07:40
	← josuebrunel left	07:40
	→ mohabaks joined	07:42
	← zhuyue left	07:43
	← jagob left	07:43
	← fracting left	07:45
	← safe left	07:46
	→ jay-m joined	07:46
	→ lindenle joined	07:47
	→ nitin joined	07:47
	← dmj left	07:50
	← clemf left	07:50
	← lindenle left	07:52
	→ muthu joined	07:52
	← nitin left	07:53
	← mohabaks left	07:53
LordRyan	btcquant: you'd best look it up seeing as I feel asleep quite a few times	07:53
	→ tsums joined	07:54
LordRyan	git rebase -I HEAD~10 and change all pick to fixup except the one right before you added the files	07:55
	Then git push -f	07:55
	→ p-l joined	07:56
	→ eletuchy joined	07:56
	← MattMaker left	07:57
	→ MattMaker joined	07:58
	← titanium17 left	07:58
	← tsums left	07:58
	← eletuchy left	08:00
	→ somaReverse joined	08:01
	→ rubyonrailed joined	08:02
somaReverse	Hello! Why does a git checkout (incuring small changes to my code base) leads to a full rebuild of my building system, i,e Make ?	08:02
	← rubie left	08:02
LordRyan	somaReverse: When you checkout, file modification times are changed.	08:03
	Which most build systems see as a need to update everything	08:03
	→ daito joined	08:03
somaReverse	Is there a smarter build system that relies on content?	08:04
	← a_thakur left	08:05
LordRyan	That would require a duplicate file	08:06
	← MattMaker left	08:06
LordRyan	Which isn't that much smarter IMO	08:06
	→ mayankgupta04 joined	08:06
	→ mohabaks joined	08:07
somaReverse	Ok. Can I make git not change time properties if the file is unchanged?	08:08
LordRyan	I don't know. You'll have to wait for someone else to respond	08:08
	← daito left	08:08
	→ pantsman_ joined	08:08
	← punto left	08:10
	→ jost joined	08:10
	→ King_Hual joined	08:11
	→ a_thakur joined	08:12
	← thiago left	08:16
	← rkazak left	08:17
	← mehola left	08:17
	→ nadim joined	08:20
comps	hmm, I'm pretty sure git doesn't touch unchanged files on checkout, I was looking into that few years ago, trying to solve the same problem, but this was not it	08:21
	in fact - I just did a checkout of HEAD~ and the files remained unmodified	08:21
	IIRC the index keeps track of that and having to update everything would be some performance hit	08:22
	→ ahr3n joined	08:23
	← chris_wot left	08:23
LordRyan	Strange. Guess it wouldn't be Git related then unless a low level dependency changed	08:24
	← Goplat left	08:25
	← nadim left	08:27
	→ _nadim joined	08:27
	← cluelessperson left	08:28
	→ staticshock_ joined	08:28
	← LeMike left	08:28
	→ brinck10 joined	08:33
	← staticshock_ left	08:33
	← brinck10 left	08:35
	← PasiFist left	08:35
	← btcquant left	08:36
	→ PasiFist joined	08:36
	← leeN left	08:37
	← sanketdg left	08:38
	← sig left	08:38
	← kadoban left	08:38
	→ brinck10 joined	08:40
	← jay-m left	08:41
	← toogley1 left	08:42
	→ arjun_ joined	08:42
	← PyroPeter left	08:42
	← brinck10 left	08:42
	← mohabaks left	08:44
	→ jimi_ joined	08:46
	→ sig joined	08:48
	← PasiFist left	08:48
	→ PasiFist joined	08:48
	← PasiFist left	08:48
	← sig left	08:49
	→ emPi joined	08:49
	→ fbwnd joined	08:50
	→ jost_ joined	08:50
	← jimi_ left	08:52
	← mayankgupta04 left	08:53
	← jost left	08:54
	← M-ou-se left	08:54
	→ M-ou-se joined	08:54
	→ tsums joined	08:55
	→ sig joined	08:56
	← a_thakur left	08:56
	→ eletuchy joined	08:56
	→ toogley1 joined	08:57
	→ brinck10 joined	08:59
	← brinck10 left	08:59
	← tsums left	08:59
	→ PasiFist joined	09:00
	→ brinck10 joined	09:00
	← sig left	09:00
ruskie	' `.'q<;qjqj45 qq;	09:01
	← eletuchy left	09:01
ruskie	ups	09:01
	→ sig joined	09:01
	→ rubie joined	09:03
	→ MattMaker joined	09:03
	← nmee left	09:03
	→ nmee joined	09:03
	→ tristanp joined	09:05
	← sig left	09:05
	→ sig joined	09:07
	← rubie left	09:07
	← mostlybadfly left	09:07
	← tristanp left	09:09
	→ afuentes joined	09:11
	← PasiFist left	09:11
	← sig left	09:11
	→ sig joined	09:12
	← MattMaker left	09:12
	← brinck10 left	09:12
	→ kerrick joined	09:13
	← mrkake left	09:14
	← ahr3n left	09:14
	← netj left	09:15
	→ mrkake joined	09:16
	→ netj joined	09:17
	→ Lipp joined	09:18
	→ PasiFist joined	09:18
	→ gsingh joined	09:19
	← monoda left	09:21
	← bluezone left	09:21
	← sig left	09:22
	→ sig joined	09:22
	→ bronson joined	09:22
	← p-l left	09:23
	→ elastix joined	09:23
	← Lipp left	09:23
	→ sanketdg joined	09:26
	→ aax joined	09:27
	← bronson left	09:28
	→ robbyoconnor joined	09:31
	← gsingh left	09:32
	→ tildes joined	09:35
	← sig left	09:37
	← PasiFist left	09:37
	← CrypticGator left	09:37
	zequence_ → zequence	09:37
	← fscala left	09:37
	← irqq left	09:39
	→ trickzero joined	09:39
	→ fscala joined	09:40
	→ subhojit777 joined	09:41
	← infernix left	09:42
	→ mohabaks joined	09:43
	← bq left	09:43
	→ fbwnnd joined	09:43
	→ slayerjain joined	09:43
	→ katherine joined	09:44
	← fbwnd left	09:44
	→ sig joined	09:47
	→ PasiFist joined	09:47
	→ nilsi_ joined	09:48
	→ bq joined	09:48
	→ gsingh joined	09:51
	← sig left	09:52
	→ jlg13 joined	09:53
	→ sig joined	09:54
	← PasiFist left	09:55
	← jlg13 left	09:56
	→ tsums joined	09:56
	→ infernix joined	09:57
	→ eletuchy joined	09:57
	← tsums left	10:01
	← rory left	10:01
	← fbwnnd left	10:01
	→ rory joined	10:01
	← eletuchy left	10:01
	← sig left	10:03
	→ PasiFist joined	10:03
	→ sig joined	10:03
	← rory left	10:03
	→ daito joined	10:04
	← User458764 left	10:05
	→ rory joined	10:05
	→ t-mart_ joined	10:05
	→ vsanc joined	10:06
	→ fbwnnd joined	10:06
	→ brinck10 joined	10:06
	→ intellix joined	10:06
	→ ugjka joined	10:07
	→ MattMaker joined	10:08
	← daito left	10:09
	← t-mart__ left	10:09
	→ User458764 joined	10:09
	← sig left	10:10
	← PasiFist left	10:10
	→ choki joined	10:11
	→ sig joined	10:11
	→ a_thakur joined	10:12
	→ stevenxl joined	10:13
	← vsanc left	10:15
	← MattMaker left	10:16
	← mozzarella left	10:16
	→ acetakwas joined	10:16
	← stevenxl left	10:17
	← ffio left	10:18
	→ vsanc joined	10:18
	→ mozzarella joined	10:18
	← sig left	10:20
	← mohabaks left	10:21
	→ ProbabilityMoon joined	10:22
	← fbwnnd left	10:23
	→ btcquant joined	10:24
	← gsingh left	10:24
	→ ochorocho__ joined	10:25
	→ gsingh joined	10:25
	→ subhojit777_ joined	10:26
	← subhojit777 left	10:26
	subhojit777_ → subhojit777	10:26
	← btcquant left	10:28
	← SimonNa left	10:29
	→ staticshock_ joined	10:29
	← ochorocho__ left	10:30
	→ CheckDavid joined	10:31
	→ sig joined	10:31
	← sig left	10:31
	← staticshock_ left	10:34
	← fus left	10:36
	→ fus joined	10:37
	→ leeN joined	10:37
	→ PasiFist joined	10:37
	→ sig joined	10:37
	← fus left	10:37
	← vsanc left	10:38
	→ t0by joined	10:38
	← PasiFist left	10:38
	← sig left	10:38
	→ sig joined	10:38
	→ PasiFist joined	10:38
	→ vsanc joined	10:39
	← mwhooker left	10:39
	← vsanc left	10:39
	→ Dyonisos joined	10:41
	← heinrich5991 left	10:43
	← sig left	10:43
	← kerrick left	10:43
	→ sig joined	10:43
	→ p-l joined	10:44
	← ProbabilityMoon left	10:44
	→ mdw joined	10:46
	→ jimi_ joined	10:48
	→ shruggar joined	10:48
	← jimi_ left	10:48
	→ jimi_ joined	10:48
	← PasiFist left	10:48
	← sig left	10:48
	→ PasiFist joined	10:48
	← diogenese left	10:48
	→ sig joined	10:48
	← User458764 left	10:49
	→ heinrich5991 joined	10:49
	→ al-damiri joined	10:50
	← elastix left	10:50
	← jimi_ left	10:52
	← sig left	10:53
	→ sig joined	10:54
	← choki left	10:55
	→ tsums joined	10:57
	→ eletuchy joined	10:58
	→ HelloAtMega joined	10:59
	→ doener joined	11:01
	← new_student left	11:01
	← tsums left	11:02
	→ new_student joined	11:02
	← eletuchy left	11:02
	→ diogenese joined	11:03
	← shruggar left	11:04
	← gsingh left	11:04
	→ vsanc joined	11:04
	← vsanc left	11:04
	← nidr0x left	11:05
	← PasiFist left	11:05
	← mdw left	11:05
	← tayfun left	11:06
	→ tristanp joined	11:06
	→ rMdes joined	11:07
	→ mdw joined	11:09
	← tristanp left	11:11
	→ tayfun joined	11:12
	→ MattMaker joined	11:13
	← sig left	11:14
	← treaki_ left	11:16
	→ mostlybadfly joined	11:16
	← _nadim left	11:17
	← vdv left	11:19
	→ sig joined	11:20
	→ Lipp joined	11:21
	← MattMaker left	11:21
	→ slappymcfry joined	11:22
	← infernix left	11:23
	→ bronson joined	11:24
	→ PasiFist joined	11:25
	← Lipp left	11:25
	← mdw left	11:26
	← xelxebar_ left	11:26
	→ fbwnnd joined	11:27
	← bronson left	11:29
	→ JyZyXEL joined	11:33
JyZyXEL	% git commit	11:33
	error: unable to resolve reference HEAD: Not a directory	11:33
	fatal: cannot lock HEAD ref	11:33
	← p-l left	11:34
JyZyXEL	bug?	11:34
	→ p-l joined	11:36
	→ rolha joined	11:36
cbreak	JyZyXEL: corrupted repo? :)	11:37
	git symbolic-ref HEAD	11:37
JyZyXEL	i did: git checkout master; git checkout --orhpan jyz/oldstuff	11:37
	then i did: git rm -rf .	11:38
	then i added a README.md and tried to commit it	11:38
	but now it seems my master has gone broken as well?!	11:38
	what the heck am i going to do to recover this?	11:39
	→ infernix joined	11:40
	→ wxg joined	11:41
JyZyXEL	i checked out master again and now i can not checkout jyz/oldstuff anymore	11:41
	← p-l left	11:41
JyZyXEL	ill git reset --hard to the last log entry	11:43
	oh my god what the fuck.	11:43
	im deleting and cloning a fresh copyu	11:44
	← acetakwas left	11:45
JyZyXEL	does git even support creating empty branch?	11:47
	maybe thats a stupid idea in the first place	11:47
j416	JyZyXEL: orphan branch yes.	11:47
	→ shinnya joined	11:47
JyZyXEL	maybe i should just create a directory instead :P	11:47
	→ ginslo joined	11:47
	→ yann\|work joined	11:48
	→ pwnawannab[NE] joined	11:48
	→ lindenle joined	11:49
	← intellix left	11:49
cbreak	JyZyXEL: git supports creating empty branches just fine	11:50
	JyZyXEL: but they are only created when you make your first commit	11:50
	until then they are unborn	11:51
JyZyXEL	yeah, thats why i made a README.md	11:53
	→ dburba joined	11:54
JyZyXEL	what should i use?	11:55
	ill try this https://gist.github.com/seanbuscay/5877413	11:55
	← dburba left	11:56
	← lindenle left	11:56
JyZyXEL	nope	11:57
	that does not work	11:57
	error: unable to resolve reference HEAD: Not a directory	11:57
	fatal: cannot lock HEAD ref	11:57
	thats how it fails when trying to commit	11:57
	my version of git doesn't properly support orphans?	11:58
	→ tsums joined	11:58
	→ st0opkid joined	11:58
	← brinck10 left	11:59
	→ eletuchy joined	11:59
	← bq left	11:59
	← Zhell left	11:59
	← tildes left	12:00
comps	JyZyXEL: checkout --orphan is a bit unintuitive to use, true :)	12:00
	I usually use it as checkout --orphan ; rm .git/index ; rm -rf *	12:00
	← rolha left	12:01
	→ bongjovi joined	12:01
	→ boudicca joined	12:01
comps	or git mktree to get an empty tree and then git-commit-tree it manually, creating the branch after making that empty commit	12:01
	→ rolha joined	12:01
comps	it's easier than dealing with --orphan	12:01
	→ Zhell joined	12:02
	← tsums left	12:02
	→ xjx joined	12:03
	← boudiccas left	12:03
	← ugjka left	12:03
	← rolha left	12:03
	→ brinck10 joined	12:03
	← xjx left	12:03
	← eletuchy left	12:03
	→ CussBot_ joined	12:04
	CussBot → Guest39606	12:04
	← Guest39606 left	12:04
	CussBot_ → CussBot	12:04
	aax → xaa	12:04
	→ ugjka joined	12:04
JyZyXEL	why do you have to manually remove .git/index???	12:04
	how is anyone going to know that u_u	12:04
	→ daito joined	12:05
	← wxg left	12:05
	→ acetakwas joined	12:05
	→ wxg joined	12:06
	→ Mgtj joined	12:06
	← a_thakur left	12:07
	→ cagmz joined	12:07
	← Mgtj left	12:07
JyZyXEL	comps: deleting it didn't help	12:08
comps	JyZyXEL: there are probably better ways, like git add -u an empty working tree	12:08
	→ fbwnnnd joined	12:08
comps	12:57 < JyZyXEL> fatal: cannot lock HEAD ref	12:08
	that really sounds like a damaged repo or some other program (GUI?) having it open	12:09
	← daito left	12:09
JyZyXEL	wait, i cannot have two konsoles in one git repo?	12:09
comps	two what?	12:09
JyZyXEL	Konsole	12:09
comps	not familiar	12:09
JyZyXEL	kde's terminal emulator	12:09
	→ a_thakur joined	12:10
JyZyXEL	and zsh	12:10
	→ rolha joined	12:10
JyZyXEL	if anything is in the git directory, it prevents git from working?	12:10
comps	well, I guess that itself should work, depends on how much extra git-specific scripting work it does	12:10
	like some periodic $PS1 magic or so	12:10
	← diget left	12:11
	← CussBot left	12:11
	→ diget joined	12:11
JyZyXEL	this is ridiculous how much time im spending just to commit a single readme	12:11
	← Glooomy left	12:11
	← fbwnnd left	12:11
	← wxg left	12:12
comps	check all your open Konsoles, to see if you don't have an open editor doing a commit or a running git operation on that repo	12:13
JyZyXEL	i did	12:13
	and it still fails	12:13
comps	run fuser .git/HEAD ?	12:13
JyZyXEL	nothing	12:14
	https://sixohthree.com/1955/git-subtree-merges-orphaned-branches-and-github	12:15
	that guy has a totally different idea	12:15
	← fbwnnnd left	12:15
	→ CussBot joined	12:15
comps	there are more ways to do the directory tree split	12:16
JyZyXEL	i want a way that works	12:16
comps	another is ie. sparse checkout	12:16
	the easiest way, I guess, is using submodules	12:16
	← zso left	12:16
JyZyXEL	how does that work?	12:17
comps	!submodules	12:17
gitinfo	[!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules	12:17
	← cagedwisdom left	12:17
	→ MattMaker joined	12:18
JyZyXEL	meaning id need another github repository?	12:18
comps	another repository (anywhere), yes	12:18
JyZyXEL	.... sigh	12:18
	→ Jackneill joined	12:18
	→ rubie joined	12:20
comps	sorry, not going to sugar coat it, git cannot be used like svn/cvs with subdirectories ad infinitum	12:22
	it has multiple types of workarounds for that use case, but no ideal solution	12:22
JyZyXEL	yes, this is a horrible experience	12:22
comps	your best bet (if you want to use git) is to rethink the entire strategy of using repositories	12:23
	to not map 1:1 cvs use cases	12:23
JyZyXEL	but im not	12:23
	← ugjka left	12:23
JyZyXEL	i just wanted a place for my loosely related reference files	12:23
	← Riviera left	12:24
	← rubie left	12:24
bremner	and why don't you want to fetch them all? disk space or just tidyness?	12:24
JyZyXEL	what do you mean fetch them?	12:24
bremner	have one repo with them all. clone it. have them all on your local disk	12:24
	→ wxg joined	12:25
	← xelxebar left	12:25
JyZyXEL	i thought the cleanest way would have been to make a orphan branch for the files	12:25
	other choice is to put them in a directory in master	12:26
	→ ochorocho__ joined	12:26
JyZyXEL	or make a completely separate repository	12:26
	which is a idea i don't like because private repos cost money on github	12:26
	and having to manage two repos then	12:27
	→ ugjka joined	12:27
JyZyXEL	so thats 3 ways	12:27
	← MattMaker left	12:27
JyZyXEL	"You're getting the equivalent of the "cannot create directory" error.	12:28
	When you have a branch with slashes in it, it gets stored as a directory hierarchy under "	12:28
	→ fbwnnnd joined	12:28
JyZyXEL	orphan branches cannot contain slashes?	12:28
	→ sypeng joined	12:29
	→ rain1 joined	12:29
rain1	hi	12:29
gitinfo	rain1: 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:29
rain1	can git clone checkout a specific commit or do I have to use two commands?	12:30
	→ staticshock_ joined	12:30
	→ intrigueD joined	12:30
	← ochorocho__ left	12:30
JyZyXEL	yup. that was it.	12:31
	comps, bremner, it was simply because i used a / in the branch name	12:31
	because someone said it was "best practice"	12:31
	← banister left	12:32
bremner	what you can't have is foo and foo/bar both branches	12:33
	← katherine left	12:33
JyZyXEL	yeah, thats exactly the pitfall i found out	12:33
	so now im using foo and foo-oldstuff	12:33
	← CussBot left	12:34
	← staticshock_ left	12:34
	→ CussBot joined	12:36
	→ ToBeCloud joined	12:36
	gitinfo set mode: +v	12:36
	→ xelxebar joined	12:39
	→ elsevero joined	12:40
comps	I'm pretty sure there was some warning about using slashes in ref names in git-rev-parse or gitrevisions manpages, but I can't find it	12:41
	← HelloAtMega left	12:42
	→ HelloAtMega joined	12:43
	→ mayankgupta04 joined	12:45
	→ canoon joined	12:46
	→ dopesong joined	12:46
	← dopesong left	12:46
	→ User458764 joined	12:47
canoon	is there a better way of doing : git submodule foreach 'git diff $sha1 HEAD' \| cat	12:48
	i would think like : git diff --submodule=diff : but that doesn't seem to exist	12:48
	→ dopesong joined	12:50
	← albel727 left	12:54
	→ Balliad joined	12:55
	→ albel727 joined	12:56
	← fstd left	12:59
	→ tsums joined	12:59
	→ sto0pkid joined	12:59
	→ fstd joined	12:59
	→ Lipp joined	13:00
	← st0opkid left	13:01
	→ st0opkid joined	13:01
	← Balliad left	13:03
	← Lipp left	13:03
	← tsums left	13:03
	→ Lipp joined	13:04
	← sto0pkid left	13:04
	→ Aerosonic joined	13:05
	→ simon816 joined	13:06
	← dopesong left	13:07
	→ exarch joined	13:07
	→ tristanp joined	13:07
	← st0opkid left	13:08
	← Lipp left	13:08
	← rolha left	13:10
	← tristanp left	13:12
	← tyreld left	13:13
	← Dyonisos left	13:13
	← slappymcfry left	13:15
	← fbwnnnd left	13:15
	← Guest14762 left	13:15
osse	canoon: what are you trying to do?	13:17
canoon	basically git diff but including files in submodules	13:17
	a normal git diff just gives you	13:18
	-Subproject commit c64cd083ffd8146ba3d4339e6d39258d2b04437b	13:18
	+Subproject commit 54e0e85ac2828e5cc28572ffec8c2c466f145c62	13:18
	→ Artpicre joined	13:18
	Artpicre → Guest98085	13:18
	→ stevenxl joined	13:18
	← sypeng left	13:19
	← raijin left	13:20
osse	sounds like 'git diff $sha1 HEAD' is exactly what you want	13:21
	← AntiNoisyBot left	13:22
	→ AntiNoisyBot joined	13:22
	→ MattMaker joined	13:23
canoon	idk i guess it does just seems like there'd be a way to do it in one diff	13:23
	← ivan_on_trac left	13:24
	← sshine left	13:24
	→ sshine joined	13:24
	← raven-au left	13:25
	→ _noblegas joined	13:25
	→ bronson joined	13:27
	→ vervet joined	13:28
JyZyXEL	i did: git add -a but i noticed it added something i didn't want	13:28
	is there a way to revert the add?	13:28
	without destroying the files themselves	13:28
	→ dnfic joined	13:29
JyZyXEL	i guess new git add takes care of it	13:30
	← WayToDoor left	13:30
	← bcadren left	13:30
	← dnfic left	13:31
	← bronson left	13:31
	← MattMaker left	13:31
	→ WayToDoor joined	13:31
canoon	JyZyXEL, git reset? whats the -a do?	13:31
JyZyXEL	i think i used git add .	13:32
	← trickzero left	13:32
	→ denimsoft joined	13:32
canoon	git reset . should work	13:32
	→ mizu_no_oto joined	13:34
JyZyXEL	nope, not risking it	13:34
	→ raven-au joined	13:34
JyZyXEL	i have such a huge amount of changes that if i fucked this up, i would die	13:34
	→ ivan_on_trac joined	13:34
	← wrouesnel left	13:34
canoon	if you really don't trust me manually copy the files out?	13:34
	but unless you do --hard git reset doesn't touch your working directory	13:35
	it only modifies the index	13:35
	→ Wedg joined	13:35
	→ fbwnnnd joined	13:36
	← Wedg left	13:36
	→ LBV_User joined	13:36
	← HelloAtMega left	13:36
	← a_thakur left	13:37
	→ Lipp joined	13:37
	→ rubie joined	13:38
JyZyXEL	i made the huge mistake of modifying readme.md in github web page	13:39
	now i can not push to the repository anymore	13:39
osse	git reset is the answer. git status tells you this	13:39
canoon	JyZyXEL, you just need to pull first	13:39
JyZyXEL	yeah i pulled and now i gotta do a merge i guess	13:39
	← rubyonrailed left	13:40
JyZyXEL	ugh, so ugly that now the merge commit is the HEAD	13:41
canoon	so i'm guessing you have done random local changes while in a merge?	13:42
	← mizu_no_oto left	13:44
JyZyXEL	i just forgot to pull from github before starting to work on the branch	13:44
	→ fission6 joined	13:45
	← raven-au left	13:45
	→ dan2k3k4 joined	13:45
	→ grayjoc joined	13:46
	→ Balliad joined	13:46
	→ Borkr joined	13:46
	→ a_thakur joined	13:46
	→ tildes joined	13:47
	← arjun_ left	13:47
	← User458764 left	13:48
	← wxg left	13:49
	← jeffreylevesque left	13:49
	→ daito joined	13:51
	← ugjka left	13:51
	← fscala left	13:52
	→ ajf- joined	13:52
	→ raven-au joined	13:52
	→ fscala joined	13:53
	← Balliad left	13:54
	← daito left	13:55
	← WayToDoor left	13:57
	← Lipp left	13:58
	→ Freed-Millionair joined	13:59
	→ tsums joined	14:00
	→ daito joined	14:01
	← tsums left	14:04
	← stevenxl left	14:04
	← new_student left	14:07
	← Freed-Millionair left	14:07
	← daito left	14:08
	→ WayToDoor joined	14:08
	→ faux___ joined	14:11
	→ kwarr joined	14:11
	→ bq joined	14:12
	← grayjoc left	14:13
	→ Glooomy joined	14:14
comps	JyZyXEL: pull --rebase	14:16
	(to avoid the merge commit)	14:16
JyZyXEL	too late now :P	14:17
	all commited to github and now everyone gets to look at the mess	14:17
comps	cool	14:17
	→ ugjka joined	14:18
	→ SteffanW joined	14:20
	→ Balliad joined	14:23
	→ User458764 joined	14:24
	→ ochorocho__ joined	14:25
	← denimsoft left	14:26
	→ MattMaker joined	14:28
	→ tayfun_ joined	14:28
	← Mr_Queue left	14:29
	← tayfun left	14:30
	→ staticshock_ joined	14:31
	← Balliad left	14:31
faux___	anybody here use github flow? is it normal to tag every PR with a bumped version before merging to master?	14:31
	→ Balliad joined	14:31
	← Balliad left	14:31
	← kwarr left	14:31
	→ raijin joined	14:33
	← a_thakur left	14:34
	← staticshock_ left	14:36
	← Borkr left	14:36
	← MattMaker left	14:36
	← intrigueD left	14:38
	← faux___ left	14:39
	← ajf- left	14:39
	→ LekeFly joined	14:40
	→ rubyonrailed joined	14:40
	← vervet left	14:42
	→ njbair joined	14:43
	→ faux___ joined	14:43
	← charlieWONG left	14:43
	→ charlieWONG joined	14:43
	→ a_thakur joined	14:43
	← ToBeCloud left	14:44
	← netj left	14:44
	→ netj joined	14:44
	← rubyonrailed left	14:45
	← jimmyeatworld left	14:46
	→ mase-tech joined	14:47
	← acetakwas left	14:47
	← dan2k3k4 left	14:51
	→ mellernoia joined	14:53
	→ diegoaguilar joined	14:53
	→ happy-dude joined	14:53
	← ugjka left	14:54
	→ Lipp joined	14:55
	→ dan2k3k4 joined	14:56
	→ u404 joined	14:58
	→ p-l joined	14:59
	→ tsums joined	15:00
	→ dreiss joined	15:00
	→ MadHatter42 joined	15:01
	← canoon left	15:01
	← WayToDoor left	15:02
	← tsums left	15:05
	← fission6 left	15:08
	← ivan_on_trac left	15:08
	→ ivan_on_trac joined	15:09
	→ tristanp joined	15:09
	→ Goplat joined	15:12
	← tristanp left	15:15
	→ clemf joined	15:15
	← dreiss left	15:16
	→ howdoi joined	15:18
	← Lipp left	15:18
	→ staticshock_ joined	15:18
	← a_thakur left	15:19
	← neunon left	15:19
	← raijin left	15:20
	→ neunon joined	15:21
	← CheckDavid left	15:21
	→ jagob joined	15:22
	← fbwnnnd left	15:27
	→ a_thakur joined	15:27
	← sdothum left	15:28
	← a_thakur left	15:28
	→ bronson joined	15:29
	← brinck10 left	15:29
	→ sdothum joined	15:29
	← bq left	15:30
	← simon816 left	15:31
	→ fenugrec_ joined	15:31
	→ eletuchy joined	15:32
	→ brinck10 joined	15:32
	→ MattMaker joined	15:33
	→ bq joined	15:33
	→ jaafar joined	15:34
	← bronson left	15:34
	← flaguy48 left	15:36
	← _noblegas left	15:36
	← brinck10 left	15:37
	→ PCatinean joined	15:37
	→ a_thakur joined	15:37
	← User458764 left	15:39
	→ ugjka joined	15:40
	← faux___ left	15:40
	→ liamonade joined	15:40
	→ cabargas joined	15:40
	→ Rythorn joined	15:41
	→ Balliad joined	15:41
	← MattMaker left	15:41
	← p-l left	15:42
	← mayankgupta04 left	15:43
	→ Anderson69s joined	15:43
	← CussBot left	15:45
	→ xiaohongqi joined	15:45
	← xiaohongqi left	15:47
	→ CussBot joined	15:47
	← ThunderChicken left	15:52
	← jost_ left	15:52
	← ugjka left	15:53
	← a_thakur left	15:54
	→ drewbro joined	15:55
	← muthu left	15:56
	Zoddo → Zoddo2	15:56
	Zoddo2 → Zoddo	15:56
	→ Noldorin joined	15:57
	→ a_thakur joined	15:57
	← drewbro left	16:00
	→ thiago joined	16:01
	← GnuYawk left	16:01
	→ tsums joined	16:02
	← liamonade left	16:02
	→ daito joined	16:04
	→ Bruce_ joined	16:04
	← mase-tech left	16:04
	← tsums left	16:07
	← Bruce_ left	16:08
	← daito left	16:08
	← d0nn1e left	16:12
	→ astrofog joined	16:13
	→ d0nn1e joined	16:14
	→ CEnnis91 joined	16:14
	→ cdg joined	16:15
	← bq left	16:16
	→ Lipp joined	16:16
	→ liamonade joined	16:16
	→ User458764 joined	16:16
	← dan2k3k4 left	16:18
	← eletuchy left	16:19
	→ eletuchy joined	16:19
	← afuentes left	16:20
	← Lipp left	16:21
	→ brinck10 joined	16:22
	← eletuchy left	16:24
	← netj left	16:25
	→ netj joined	16:25
	→ tsums joined	16:26
	→ digidog joined	16:26
	→ HelloShitty joined	16:27
	→ rkazak joined	16:27
	← HelloShitty left	16:27
	← staticshock_ left	16:27
	← FuzzySockets left	16:28
	← sdothum left	16:28
	→ HelloAtMega joined	16:28
	→ Mason9 joined	16:30
	→ Ahmed90 joined	16:30
	→ eletuchy joined	16:30
	→ sdothum joined	16:31
	gitinfo set mode: +v	16:32
Mason9	Hi, I can't see my files in the finder, they are on a git branch? How can I open them to edit them? I don't have a working shortcut to open sublime from terminal. I am on that branch, but think git is hiding these files from the Finder on my mac? can anyone help? ideas?	16:32
	→ hightower2 joined	16:32
	← a_thakur left	16:33
	→ Bruce_ joined	16:33
	→ Borkr joined	16:33
	← rain1 left	16:34
Mason9	any idea where I can get help? with figuring this out?	16:34
	← tildes left	16:35
	← hightower3 left	16:35
moritz	Mason9: if you check out the branch where the files are in, they'll be regular files in the file system, and finder can pick them up	16:36
Mason9	thank you	16:37
	→ Garibaldi0 joined	16:37
	→ MattMaker joined	16:38
Mason9	I found them	16:38
	← nilsi_ left	16:39
	→ rubyonrailed joined	16:41
	→ Dandelock joined	16:44
	← rubyonrailed left	16:46
	← MattMaker left	16:46
	← tsums left	16:47
	→ _nadim joined	16:48
	← diegoaguilar left	16:49
	→ ToBeCloud joined	16:49
	gitinfo set mode: +v	16:49
	→ nicoulaj joined	16:50
	→ muthu joined	16:51
	← nicoulaj left	16:51
	→ faux___ joined	16:52
	→ nadim joined	16:52
	→ nicoulaj joined	16:53
	← _nadim left	16:53
	→ simon816 joined	16:53
	→ WayToDoor joined	16:54
	← nicoulaj left	16:56
	← LBV_User left	16:57
	→ LBV_User joined	16:57
	→ CheckDavid joined	16:57
	→ nicoulaj joined	16:57
	← raven-au left	16:58
	← Garibaldi0 left	16:59
	→ raven-au joined	17:00
	← nicoulaj left	17:00
	→ qwerty joined	17:01
	→ nicoulaj joined	17:02
	qwerty → Guest92905	17:02
	← nadim left	17:02
	← Bruce_ left	17:02
	→ fedexo joined	17:02
	← eletuchy left	17:03
	→ bluezone joined	17:03
	→ eletuchy joined	17:03
	← charlieWONG left	17:03
	→ fahadash joined	17:04
	← nicoulaj left	17:05
	→ rom15044 joined	17:06
	→ btree joined	17:06
	→ nicoulaj joined	17:06
	← btree left	17:07
	← xlegoman left	17:07
	→ nadim joined	17:08
	← rubie left	17:08
	← nicoulaj left	17:10
	→ Bruce_ joined	17:11
	← PCatinean left	17:11
	→ nicoulaj joined	17:11
	→ Woody_ joined	17:11
	→ rubyonrailed joined	17:12
	vals_ → tango_	17:12
	→ rubie joined	17:12
	→ tristanp joined	17:12
	← astrofog left	17:13
	← nicoulaj left	17:14
	→ _nadim joined	17:15
	← nadim left	17:15
	→ nicoulaj joined	17:15
	← cabargas left	17:15
	← HelloAtMega left	17:16
	← MadHatter42 left	17:16
	→ khmarbaise joined	17:16
	← raven-au left	17:16
	← tristanp left	17:17
	→ raven-au joined	17:17
avar	Does anyone have a better idea to detect if a repo is completely corrupt than: git log --all -10 >/dev/null; echo $?	17:17
	← nicoulaj left	17:18
avar	This is for a cronjob that maintains git repos, I'm getting "fatal: loose object a85e7b2d32267d948f1c037db12ee5c114eb8ead (stored in .git/objects/a8/5e7b2d32267d948f1c037db12ee5c114eb8ead) is corrupt"	17:18
	And I don't want to do a full fsck..	17:18
	→ nicoulaj joined	17:19
	→ tsums joined	17:22
	← m0viefreak left	17:22
	← _nadim left	17:22
	← nicoulaj left	17:22
	→ nadim joined	17:22
	→ MadHatter42 joined	17:22
	→ viper474 joined	17:23
	← viper474 left	17:23
	→ nicoulaj joined	17:23
	→ Mateo_W joined	17:25
	← faux___ left	17:26
	← hasB4K_ left	17:26
	← Guest92905 left	17:26
	← jmpp left	17:26
	← Mason9 left	17:26
	← nicoulaj left	17:27
	→ nicoulaj joined	17:28
	→ monoda joined	17:29
	← eletuchy left	17:32
	← nicoulaj left	17:32
	→ PryMar56 joined	17:32
	→ nicoulaj joined	17:33
	← rubyonrailed left	17:34
	→ eletuchy joined	17:35
	← shinnya left	17:35
	← tsums left	17:36
	← User458764 left	17:36
	← nicoulaj left	17:36
	→ banister joined	17:36
	→ jmpp joined	17:37
	← liamonade left	17:37
	→ nicoulaj joined	17:37
	← cagmz left	17:39
	← eletuchy left	17:40
	→ rubyonrailed joined	17:40
	→ optikalmouse joined	17:40
	← nicoulaj left	17:41
	← MadHatter42 left	17:41
	← tang^ left	17:41
	→ xlegoman joined	17:41
	→ tsums joined	17:41
	← t0by left	17:41
	← banister left	17:42
	← shudon left	17:42
	→ nicoulaj joined	17:42
	→ MattMaker joined	17:43
	→ d5sx43 joined	17:44
	← d5sx43 left	17:44
	→ InfoTest joined	17:44
	← rubie left	17:45
	← nicoulaj left	17:45
	→ nicoulaj joined	17:46
	← rubyonrailed left	17:50
	← nicoulaj left	17:50
	← MattMaker left	17:51
	→ nicoulaj joined	17:51
	→ cagedwisdom joined	17:53
	→ PCatinean joined	17:53
	← Mateo_W left	17:54
	← nicoulaj left	17:54
	← optikalmouse left	17:55
	→ u_h joined	17:55
	→ nicoulaj joined	17:55
	→ rubyonrailed joined	17:57
	→ faux___ joined	17:58
	← nicoulaj left	17:59
	← simon816 left	18:00
	→ nicoulaj joined	18:00
	→ reim joined	18:01
	← rubyonrailed left	18:02
	← cdg left	18:02
	← nicoulaj left	18:02
	→ daito joined	18:05
	→ cdg joined	18:05
	← faux___ left	18:05
	→ dopesong joined	18:07
	gitinfo set mode: +v	18:09
	← daito left	18:09
	→ Lipp joined	18:09
	→ tomog999 joined	18:10
	linuxmodder- → linuxmodder	18:10
	← Lipp left	18:10
	→ arooni joined	18:10
	← LBV_User left	18:10
	← tomog999_ left	18:12
	← doener left	18:18
	→ staticshock_ joined	18:18
	→ xcesariox joined	18:18
	← garyserj left	18:20
	← jon-mac left	18:20
	→ garyserj joined	18:20
	← InfoTest left	18:23
	→ InfoTest joined	18:23
	← clemf left	18:24
	← staticshock_ left	18:24
	→ Agent281 joined	18:24
	→ banister joined	18:24
	→ lindenle joined	18:25
	← CEnnis91 left	18:25
	← xcesariox left	18:26
	← Guest86894 left	18:27
	→ FuzzySockets joined	18:27
	→ tang^ joined	18:28
	← CussBot left	18:30
	→ CussBot_ joined	18:30
	CussBot_ → CussBot	18:30
	→ Wetmelon joined	18:31
	→ bronson joined	18:32
Wetmelon	I changed my .gitignore but it doesn't seem to have changed what's being tracked... Is there something I have to do for it to start to work?	18:32
osse	!ignore_tr > Wetmelon	18:33
gitinfo	[!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	18:33
	→ trewe joined	18:33
	→ mischat joined	18:34
Wetmelon	now I just need to figure out how to open a console >.>	18:34
	← InfoTest left	18:34
	← invapid left	18:34
	→ InfoTest joined	18:34
	→ invapid2 joined	18:35
tang^	what program are you using?	18:35
	→ cdg_ joined	18:35
	→ diegoaguilar joined	18:36
	← diegoaguilar left	18:36
	→ CEnnis91 joined	18:36
	→ titanium17 joined	18:36
	→ diegoaguilar joined	18:36
	← bronson left	18:37
	← cdg_ left	18:37
Wetmelon	tang^: Gitkraken	18:37
tang^	OS?	18:38
	← cdg left	18:38
	→ cdg joined	18:38
Wetmelon	Windows	18:38
	10	18:38
tang^	Did you install Git for Windows separately?	18:39
Wetmelon	I think it came with the Github app (?)	18:40
tang^	look for Git Bash	18:40
	→ User458764 joined	18:40
	→ presto joined	18:40
	→ eletuchy joined	18:41
	← SteffanW left	18:45
	← InfoTest left	18:45
	← eletuchy left	18:46
	→ MattMaker joined	18:48
Wetmelon	There we go. Finally got it to behave :)	18:48
	→ KevinMGranger joined	18:50
	← CussBot left	18:52
	→ CussBot joined	18:54
	← mellernoia left	18:54
	← brinck10 left	18:55
	← MattMaker left	18:56
	→ rubyonrailed joined	18:56
	← multi_io left	18:58
	→ sargas joined	18:58
	→ multi_io joined	18:59
	→ rubie joined	19:01
	← cdg left	19:02
	← Anderson69s left	19:02
	← skylite left	19:04
	← cxreg2 left	19:04
	→ cxreg joined	19:05
	← dilfridge left	19:06
	→ SeanE joined	19:07
	← monoda left	19:07
	→ skylite joined	19:08
	→ dilfridge joined	19:08
	← JanC left	19:08
	→ JanC joined	19:11
	← fahadash left	19:11
chris2	there was a project that wanted to add better signing of tags to git by signing all files of the tag, anyone remember the name?	19:12
	tobbi → Tobbi	19:12
	→ [Brain] joined	19:13
	→ flaguy48 joined	19:15
	→ grillo joined	19:16
	gitinfo set mode: +v	19:18
SeanE	test	19:18
	fatal: you are on a branch yet to be born	19:18
	I am brand new at this and any help I can get would be much appreciated	19:18
	Coding isn't a strong suite of mine, I am learning selenium automationa and have been asked to setup git, git bash, download a branch to my home computer, work on the automation code and push up additions / changes	19:19
	I setup the SHH key and an empty repository	19:20
	→ _chrispop_ joined	19:20
SeanE	I am having trouble getting the files from my companbies git server onto my computer :/	19:20
	I have a .git and .shh file that was created from be setting things up	19:20
	no files in them though	19:20
	A little lost	19:20
	any directions would be much appreciated	19:21
	i'm a noob sorry	19:21
	→ xcesariox joined	19:21
chris2	you need to commit something first...	19:21
	or wait, are you cloning?	19:22
	→ Anderson69s joined	19:22
j416	chris2: he says "download a branch", so I would assume so	19:23
SeanE	I setup gitbash on my computer with the SHH key. created an empty repository and did git status	19:23
j416	SeanE: "git init"?	19:23
SeanE	the master branch is currently set to somethign completely wrong	19:23
chris2	SeanE: if you want to download something, use git clone, not git init	19:24
j416	^	19:24
SeanE	Says every file on my computer has not been added	19:24
j416	SeanE: remove the .git directory	19:24
chris2	yes, you just made an empty repository ;)	19:24
SeanE	I just want to download a branch witht he files I uploaded from my companies comp	19:24
	reading	19:24
	i have not commited anythign from this computer yet	19:24
	okay	19:25
	i'll remove it	19:25
j416	you don't want .git in your home dir; the .git directory is per-repo. Your home dir is not a repo.	19:26
SeanE	says I must specify a repository to clone	19:26
j416	SeanE: url to the repo. your company should have provided that	19:26
SeanE	okay	19:26
	← rewt left	19:26
SeanE	i assume that's the ssh	19:26
j416	it can be an ssh url yes.	19:27
SeanE	okay got it	19:27
	i'll do a git clone <url>	19:27
j416	yes.	19:27
SeanE	destination path already exists and is not an empty directory	19:27
j416	that will create a directory named after the last path element in the url.	19:27
	yes, if you already have that directory, you cannot create it.	19:28
	so fix that first	19:28
SeanE	oh... so I did download it. Completely missed that. Thanks.. okay, so i have managed to get what I assume is the master branch	19:28
	how canI download another branch?	19:29
j416	SeanE: you already have it.	19:29
SeanE	thank you!	19:29
	One step closer	19:29
j416	SeanE: git branch -r	19:29
	← Anderson69s left	19:29
j416	SeanE: find what the branch is, it will say origin/somebranch	19:29
	SeanE: then do "git checkout somebranch" (without origin/) and it'll create a branch for you to track that remote branch	19:29
	→ rewt joined	19:30
	← Borkr left	19:30
SeanE	hmm	19:30
	did branch -r	19:31
j416	SeanE: I strongly recommend you spend a day or two reading up on git. It may seem like a lot of time, but if you are going to use git regularly, it will save you time.	19:31
SeanE	fatal: not a gir repository	19:31
j416	SeanE: cd <directory>	19:31
SeanE	awesome	19:31
j416	SeanE: you might want to do "git fetch" before you checkout	19:32
SeanE	okay, master is now correct file.	19:32
j416	to make sure you have the latest state of things	19:32
	→ anders__ joined	19:32
j416	if on master, do 'git pull' to bring that up to date as well	19:33
SeanE	I did read git files over past 2 days but I must be missing something. Was getting errors so foudn this room	19:33
	Okay	19:33
	Okay, already up to date	19:34
	← anders__ left	19:34
	→ amdi_ joined	19:34
SeanE	One of the branches I want the files from has a Merge Request next to it	19:36
	I assume that has to be done before I can get that branches files?	19:36
	It's the working branch where all the files that are not yet complete are located	19:36
	feature1 is a branch i created with files I need to work on	19:37
	there is a branch called master that contains all of my current working automation scripts	19:37
	I want the files from feature1 branch on my computer	19:37
	I would like to work on them, save them and then push them back up to the feature1 branch	19:37
	→ ascarter joined	19:38
SeanE	any idea how I would download the files from the feature1 branch as opposed to the master branch it appears I currently have?	19:38
	← CussBot left	19:38
	→ vervet joined	19:38
	← u_h left	19:39
SeanE	I tried to google it always seems to be missing a step I need	19:39
	← rubyonrailed left	19:39
	→ rubyonrailed joined	19:40
	← rubyonrailed left	19:40
	← sanketdg left	19:41
	→ fracting joined	19:42
	→ aidalgol joined	19:42
	→ eletuchy joined	19:42
	← KevinMGranger left	19:43
j416	SeanE: I already told you.	19:44
	SeanE: scroll up	19:44
SeanE	okay	19:44
	← ToBeCloud left	19:44
j416	SeanE: after I said git branch -r	19:44
	← sargas left	19:44
SeanE	oh cool! yeah when I last tried that it didn't work	19:44
	now it does	19:44
	thanks!	19:45
	re-reading	19:45
j416	yw¨	19:45
	-¨	19:45
	← filcab left	19:46
	← eletuchy left	19:48
	→ CussBot joined	19:48
	← Bruce_ left	19:48
SeanE	Lol, this is awesome. Thankyou @j416, i've just had a dopamine release because of you. Finally achieved something	19:49
	→ Darcidride joined	19:49
	→ staticshock_ joined	19:50
SeanE	Okay, task achieved. loggin off. Thanks j416, you're awesome mate. May good karma be with you	19:52
	→ MattMaker joined	19:53
	→ unreal_ joined	19:53
	← User458764 left	19:53
	← staticshock_ left	19:55
	→ ranguli joined	19:55
	→ cluelessperson joined	19:55
	→ ajf- joined	19:56
	← unreal left	19:56
	← ranguli left	19:56
	→ brinck10 joined	19:56
	← Woody_ left	19:56
	→ ranguli joined	19:56
j416	SeanE: happy to help o/	19:58
	SeanE: might I recommend !book	19:58
gitinfo	SeanE: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	19:58
	j416 afk	19:58
SeanE	Thanks guys! I'll check them out	20:01
	← brinck10 left	20:01
	← MattMaker left	20:01
	→ ToBeCloud joined	20:02
	gitinfo set mode: +v	20:02
	→ diegoviola joined	20:02
	← fenugrec_ left	20:04
	← SeanE left	20:05
	→ daito joined	20:05
	→ user083 joined	20:06
	→ shades joined	20:10
shades	hey	20:10
	→ Bruce_ joined	20:10
shades	i'm having really basic problems	20:10
	← Wetmelon left	20:10
shades	i'm working on a station with a partner and the branch we hvae is called pairing	20:10
	← daito left	20:10
shades	i had cloned the repo to my personal laptop	20:10
	when i do 'git branch' i see *master and pairing	20:11
	git checkout pairing switches me to this pairing branch	20:11
	the files that are on github are the upto date ones but when i look in my local directory they're not	20:11
	i don't know what to do to make my local host what is on github	20:12
	→ strainwrld joined	20:12
	→ raijin joined	20:13
	← banister left	20:13
rewt	shades: git fetch	20:14
	will update your local repo to match what's on github	20:14
	← Synthead left	20:16
	→ RikusW joined	20:17
	→ jamesheston joined	20:18
	← jamesheston left	20:19
	← cluelessperson left	20:19
	← xcesariox left	20:20
	← RikusW left	20:20
shades	rewt: it didn't do so	20:22
	8 C	20:22
	it's still unupdated locally	20:22
	→ awey joined	20:22
	← axelitus left	20:23
	← awey left	20:23
rewt	that should've updated your local repo	20:23
	← Vgr left	20:23
rewt	then you need to update your working files from your local rep	20:23
	o	20:23
	← rubie left	20:23
shades	how do I do this?	20:24
	→ rubie joined	20:24
	← strainwrld left	20:25
rewt	try another checkout	20:26
shades	ther eare only two branches	20:26
	master and pairing	20:26
	and neither one is up to date on my local machine after running git fetch	20:27
rewt	updating your local repo does not automatically update your working files	20:27
	→ boombatower joined	20:27
	→ Vgr joined	20:27
shades	how do I do this? i've been trying to figure it out for so long	20:27
rewt	if another checkout didn't work, try git pull	20:27
	→ jeffmjack joined	20:28
shades	what exactly is the git pull <remote> pairing, the remote part of that?	20:28
	→ Synthead joined	20:29
	← phaleth left	20:29
rewt	try just `git pull`	20:29
shades	'there is no tracking information for the current branch.' 'please specify which branch you want to merge with'	20:30
	← PCatinean left	20:30
	→ jon-mac joined	20:30
rewt	how did you make your local repo?	20:31
	did you clone from github?	20:31
	→ jay-m joined	20:31
	← boombatower left	20:32
shades	yes	20:33
	i tried rming the directory and recloning but it doesn't clone the most recent	20:33
rewt	huh? cloning will always clone exactly what's there	20:33
shades	me and my pairing partner added me a remote on the one we created on the other computer and i've been able to git commit/push the changes	20:33
	← sdothum left	20:33
shades	well that's not the case	20:33
	the github page has more up to date stuff	20:33
	when i reclone it doesn't get the newest stuff	20:33
	→ boombatower joined	20:33
shades	it's frustrating me	20:34
rewt	what's the url?	20:34
shades	it's a private repo so you're not going to be able to see it	20:34
	github.com/myusername/myprivaterepo	20:34
rewt	try cloning something public and see if that's up to date	20:34
	→ bronson joined	20:34
shades	something i pushed or?	20:35
	→ sdothum joined	20:35
	← WayToDoor left	20:35
rewt	anything... "git clone" doesn't know/care who created the remote repo	20:35
shades	we havnt' been pushing to master	20:36
	that might have smoething to do with it?	20:36
	→ BSaboia joined	20:36
shades	master is just a clean fork of the project that we've been assigned to work on	20:36
	pairing is the branch all the changes we've pushed are	20:36
rewt	git fetch fetches the whole repo	20:37
	how are you determining that it's not getting the latest copy?	20:37
	→ WayToDoor joined	20:37
shades	i open my Grunt.js file and it doesn't have the changes i pushed	20:38
	i look at the github page, i see the changes are on that	20:38
	→ yqt joined	20:38
shades	also: "This branch is 2 commits ahead of makersquare:master."	20:38
	→ jancoow joined	20:39
rewt	ok, when you open a file, you open it from your working files, not from what you fetched	20:39
	← bronson left	20:39
rewt	when you git fetch, it updates your LOCAL REPO to match the remote repo... it does NOT update your WORKING FILES to match the repo	20:39
	"This branch is 2 commits ahead of makersquare:master." means that your WORKING FILES are in master branch, not pairing branch	20:40
shades	i donn't know what that means exactly, and i'd like to do the latter not hte former	20:40
jancoow	Hi. We are working on cloud 9 with multiple users on the same code. WE all have acces to a shell in cloud 9. I cloned the private repostitory (hosted on github) with my login. If i want to commit something, i have to give my username/password and i can push it. When someone else want to commit something, he also fill his username/password. But for some reason, all the ocmmit still are on my name??	20:40
rewt	ok, if you don't understand something, just ask; ignoring it just makes things more confusing/frustrating	20:41
shades	i want waht's local on this host to match what's on github	20:41
	ithought cloning/git pull/fetch would do this	20:41
rewt	git pull will update the branch you have checked out to what the remote has	20:42
shades	meaning it'll pull all the chanegs from the website to my local machien?	20:42
rewt	yes	20:43
shades	ok	20:44
	i'm finding this not to be true	20:44
rewt	do you have gitk?	20:44
	→ Anderson69s joined	20:44
shades	not sure what that is	20:44
	when i try to git pull i keep getting:	20:44
	← dopesong left	20:44
	→ otho joined	20:45
shades	'there is no tracking information for the current branch.' 'please specify which branch you want to merge with'	20:45
	← Glooomy left	20:45
	→ eletuchy joined	20:45
rewt	gitk is a gui app to see your commits and branches, so you can see what you have checked out, and what your local repo has	20:45
	← Rythorn left	20:45
shades	id' like to just do this from the CLI	20:45
	→ bb010g joined	20:45
	gitinfo set mode: +v	20:45
rewt	shades, set up tracking with: git branch --set-upstream pairing origin/pairing	20:46
	← ascarter left	20:46
rewt	then try git pull again	20:47
shades	ok	20:47
	that did it	20:47
	this is super hard and confusing	20:47
rewt	agreed	20:48
	you shouldn't need to set-upstream again for this branch	20:49
	← eletuchy left	20:49
	← muthu left	20:50
	← bongjovi left	20:51
	← Darcidride left	20:51
	← jay-m left	20:51
	← exarch left	20:52
	→ KevinMGranger joined	20:53
	← Bruce_ left	20:55
	← Anderson69s left	20:57
	→ brinck10 joined	20:57
	→ MattMaker joined	20:58
	→ PCatinean joined	20:58
	← PCatinean left	20:59
	→ mizu_no_oto joined	20:59
	← BSaboia left	21:00
	→ bcadren joined	21:01
jancoow	could someone help me answering my question? :)	21:02
	← brinck10 left	21:02
	← ajf- left	21:03
	→ jay-m joined	21:03
	← vervet left	21:03
	→ Sasazuka joined	21:05
	← rubie left	21:05
	← MattMaker left	21:06
	← pantsman_ left	21:06
marlun	When I use prepare-commit-msg and write to $1 it works fine but if I quit vim without saving the message I'm used to the commit being aborted but now it's done with the text I wrote to $1. Can I get text in the message without saving to $1?	21:06
	← jay-m left	21:08
	← aidalgol left	21:09
marlun	I guess I'll need to add the text as comment for it to be aborted if I change nothing.	21:09
	← al-damiri left	21:09
	← King_Hual left	21:09
	→ troulouliou_div2 joined	21:11
	← Goplat left	21:12
	→ ascarter joined	21:12
	← ranguli left	21:13
	→ tristanp joined	21:13
	← mizu_no_oto left	21:15
	→ mwhooker joined	21:15
	← raijin left	21:15
	→ mizu_no_oto joined	21:16
	← mizu_no_oto left	21:17
	→ faux___ joined	21:18
	← tristanp left	21:18
	← CussBot left	21:19
	→ stormlrd joined	21:22
	← faux___ left	21:22
	→ CussBot joined	21:23
	→ Sadeukko joined	21:23
	← Sleepy63 left	21:25
	→ ajf- joined	21:26
	← ajf- left	21:30
	→ blackwind_123 joined	21:31
	← Lauven left	21:31
	← CussBot left	21:32
	← felipedvorak left	21:34
	→ kerrick joined	21:34
	← mischat left	21:35
	→ CussBot joined	21:35
	→ dopesong joined	21:36
	← khmarbaise left	21:37
	← KevinMGranger left	21:38
	← dopesong left	21:40
	→ Bruce_ joined	21:44
	→ p-l joined	21:44
	← ascarter left	21:45
	→ Guest17 joined	21:45
	← toothrot left	21:45
	← troulouliou_div2 left	21:45
	→ felipedvorak joined	21:46
	→ eletuchy joined	21:46
	← Noldorin left	21:48
	← eletuchy left	21:50
	→ staticshock_ joined	21:51
	← Guest17 left	21:52
	← tsums left	21:53
	→ Guest17 joined	21:53
	→ zso joined	21:55
	← Bruce_ left	21:55
	← staticshock_ left	21:56
	→ Bruce_ joined	21:56
	→ tsums joined	21:56
	← Nugget_ left	21:58
	→ Nugget joined	21:58
	→ brinck10 joined	22:00
	→ ranguli joined	22:02
	→ MattMaker joined	22:03
	→ cdg joined	22:03
	→ SimonNa joined	22:03
	← s841 left	22:04
	→ s84 joined	22:04
	→ SimonNaa joined	22:04
	← brinck10 left	22:05
	← reim left	22:06
	→ daito joined	22:06
	→ ascarter joined	22:07
	← yann\|work left	22:07
	← cdg left	22:07
	← SimonNa left	22:08
	← mwhooker left	22:08
	← Guest17 left	22:09
	→ Guest17 joined	22:09
	→ rubie joined	22:09
	← Jackneill left	22:09
	← arooni left	22:10
	→ CharlieWONG joined	22:10
	→ CharlieWongSuper joined	22:10
	← CharlieWONG left	22:10
	← CharlieWongSuper left	22:10
	← daito left	22:10
	← titanium17 left	22:11
	← MattMaker left	22:11
	→ CharlieWONG joined	22:11
	← ascarter left	22:11
	← fscala left	22:12
	← tsums left	22:12
	← subhojit777 left	22:13
	← zso left	22:14
	→ mwhooker joined	22:14
	← ranguli left	22:14
	→ fscala joined	22:14
	→ bq joined	22:15
	← CharlieWONG left	22:17
	→ CharlieWONG joined	22:17
	→ ranguli joined	22:18
	← ranguli left	22:19
	← CharlieWONG left	22:22
	→ CharlieWONG joined	22:22
	→ ahr3n joined	22:22
	← LucaTM left	22:23
	← CharlieWONG left	22:24
	→ CharlieWONG joined	22:24
	→ fission6 joined	22:29
	→ banister joined	22:32
	← tayfun_ left	22:33
	← CharlieWONG left	22:33
	→ Lyqyd joined	22:33
	→ KevinMGranger joined	22:34
	← Balliad left	22:35
	→ bronson joined	22:36
	→ CharlieWONG joined	22:38
	→ Sleepy63 joined	22:38
	→ CharlieWongSuper joined	22:39
	← CharlieWongSuper left	22:40
	→ dopesong joined	22:41
	← bronson left	22:41
	→ CharlieWongSuper joined	22:41
	→ aidalgol joined	22:42
	← Guest17 left	22:42
	← CharlieWongSuper left	22:42
	→ Guest17 joined	22:42
	← CharlieWONG left	22:43
	← unforgiven512 left	22:43
	→ nwkj86 joined	22:44
	→ simon816 joined	22:44
	→ unforgiven512 joined	22:44
	← unforgiven512 left	22:45
	← CussBot left	22:45
	→ unforgiven512 joined	22:45
	→ CussBot joined	22:45
	→ kadoban joined	22:46
	→ eletuchy joined	22:46
	← dopesong left	22:46
	← duderonomy left	22:48
	← eletuchy left	22:51
	← rubie left	22:51
	→ nwkj86_ joined	22:52
	← Sasazuka left	22:52
	← nwkj86_ left	22:52
	→ CharlieWONG joined	22:53
	→ a_thakur joined	22:53
	← elsevero left	22:53
	→ m0viefreak joined	22:54
	← stormlrd left	22:55
	← nwkj86 left	22:55
	→ stormlrd joined	22:55
	→ AndroidVaan joined	22:56
	← AndroidVaan left	22:56
	→ AndroidVaan joined	22:57
	← AndroidVaan left	22:57
	→ AndroidVaan joined	22:58
	→ titanium17 joined	22:58
	← AndroidVaan left	22:58
	→ AndroidVaan joined	22:58
	← AndroidVaan left	22:58
	→ AndroidVaan joined	22:59
	← apotry left	22:59
	← Guest17 left	23:00
	→ Zhell_ joined	23:01
	→ Noldorin joined	23:01
	→ rubie joined	23:04
	← Zhell left	23:04
	→ s841 joined	23:04
	← diegoaguilar left	23:05
	→ diegoaguilar joined	23:05
	← CharlieWONG left	23:06
	← s84 left	23:06
	→ CharlieWONG joined	23:06
	← Zhell_ left	23:07
	→ MattMaker joined	23:08
	→ Zhell joined	23:08
	← Zhell left	23:08
	→ Zhell joined	23:08
	→ relipse2 joined	23:09
	→ GnuYawk joined	23:12
	→ jpleau joined	23:14
jpleau	hi. I am using bisect to find the cause of an issue. Version A was fine, version B has an issue. I found the offending commit X, the bug does happen on that commit X. However the issue is also present on X~ .. does that mean that the issue was caused twice and only fixed once somewhere?	23:15
	← MattMaker left	23:16
	← nadim left	23:17
	→ dan2k3k4 joined	23:17
	→ kfpratt joined	23:18
	→ elastix joined	23:18
	→ afuentes joined	23:21
	← mwhooker left	23:22
	← ahr3n left	23:22
	→ al-damiri joined	23:23
	← stormlrd left	23:23
	→ CharlieWongSuper joined	23:25
	← CharlieWONG left	23:27
	← emPi left	23:27
	← CharlieWongSuper left	23:28
	← kfpratt left	23:32
	← lindenle left	23:33
	→ kfpratt joined	23:33
	→ sssilver joined	23:33
	→ lindenle joined	23:33
Fissure	jancoow: (if you're still paying attention) commit author is set at commit time from configuration settings (or data from /etc/passwd if it's not there). Credentials you use to push are unrelated	23:34
	← kfpratt left	23:34
	← p-l left	23:34
	← rubie left	23:35
user083	Does libgit2 have bindings for the Ada programming language?	23:35
	← sssilver left	23:36
Fissure	jpleau: is X a merge commit? I don't see how a bisect could get you a commit not on the works/doesn't work boundary	23:36
	← elastix left	23:36
	→ sssilver joined	23:37
jpleau	Fissure: the tree doesn't look like it's a merge. Here it is: http://source.winehq.org/git/wine.git/commit/1a16235de1f4c3a16486710c899fea39bfa9bafe	23:38
	s/tree/commit	23:38
	← a_thakur left	23:38
jpleau	there's ~325 commits between the 2 versions, I'm going to try manually I think. I ran bisect 3 times and always came to this particular commit	23:38
Fissure	that's very strange	23:39
	did you use git bisect run or manual checks on each version?	23:39
jpleau	manual checks, it's a little involved to test... have to run a windows game on linux, then inject a .dll into it	23:39
	if it crashes: bad, if it doesn't crash: good, that's easy to spot	23:40
	→ gusto joined	23:40
	→ tsums joined	23:40
	→ rubie joined	23:40
	← sssilver left	23:41
	→ sssilver joined	23:42
	→ dopesong joined	23:43
	→ a_thakur joined	23:43
Fissure	i consider it unlikely there's a bug in bisect that would make it binary search incorrectly	23:43
	if it happened to me i'd assume i typed good when i meant bad or vice versa	23:44
jpleau	yeah. That's why I ran it 3 times ;)	23:44
	← rubie left	23:44
jpleau	I narrowed it down to a series of 20 commits, gonna see if maybe the problem got fixed but "unfixed" somehow	23:44
	← sssilver left	23:45
	→ p-l joined	23:45
	→ sssilver joined	23:46
	← Noldorin left	23:47
	← sssilver left	23:47
	→ eletuchy joined	23:47
	← dopesong left	23:47
Fissure	i have no ideas. good luck	23:48
jpleau	Fissure: well. I just found a commit before commit "X" that does not work	23:48
	← Bruce_ left	23:48
	→ sssilver joined	23:48
	→ ariel_17 joined	23:48
jpleau	still strange. anyway, thanks	23:48
	← th0m_ left	23:49
	→ elastix joined	23:49
	→ xelxebar_ joined	23:50
	← sssilver left	23:51
	← eletuchy left	23:51
	→ sssilver joined	23:51
jancoow	Fissure: awh.. :( So it isn't possible to commit on the same configuration with different users?	23:52
	→ staticshock_ joined	23:52
	→ liamonade joined	23:52
Fissure	git commit --author lets you override	23:52
	but if they're different users they don't have the same configuration...	23:53
	← sssilver left	23:54
jancoow	we are working on the same workspace	23:54
	→ sssilver joined	23:55
	→ mikiones joined	23:56
	← sssilver left	23:56
	← staticshock_ left	23:56
BtbN	stop doing that?	23:57
	→ sssilver joined	23:57
	← diogenese left	23:57
jancoow	meh	23:58
	→ dreiss joined	23:58
	← sssilver left	23:58
jancoow	but thanks, --author works :)	23:58
	that's fine for now.	23:58
	HAve a goodnight!	23:58
	← jancoow left	23:58
	→ sssilver joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation