IRCloggy #git 2015-12-25

Provider of IRC logs since 2005.

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

	2015-12-25
johnw	there's nothing "broken" about it, it represents a true reflection of my use case	00:02
	← localuser- left	00:03
	← lindenle left	00:04
	← daito left	00:04
	→ vikas027 joined	00:05
	→ lindenle joined	00:06
	← dlitz left	00:06
	← s8321414 left	00:08
	← nilg left	00:08
	← cheetah2 left	00:09
	→ IWishIKnew joined	00:09
	← ferr left	00:10
	← lindenle left	00:11
	← vikas027 left	00:11
	← _nadim left	00:12
	← hexagoxel left	00:12
	← cagedwisdom left	00:12
	← peoliye_ left	00:13
	← fuchsi_ left	00:13
	← Balliad left	00:13
	→ hexagoxel joined	00:14
	← dreiss left	00:14
	→ lindenle joined	00:15
	← dr3w left	00:15
qsx	hmhm i wonder whether /voice -yes * is smart enough only to voice the people who still need	00:15
	← nfk left	00:15
	→ dsdeiz joined	00:15
qsx	well what could possibly go wrong	00:15
	ChanServ set mode: +o	00:15
	qsx set mode: +vvvv	00:16
	qsx set mode: +vvvv	00:16
	qsx set mode: +vvvv	00:16
	→ weltall joined	00:16
	qsx set mode: +vvvv	00:16
	qsx set mode: +vvvv	00:16
	qsx set mode: +vvvv	00:16
	qsx set mode: +vvv	00:16
	qsx set mode: +v	00:16
qsx	whoa.	00:16
	→ whomp joined	00:18
	← lindenle left	00:18
	← Ahmed90 left	00:18
johnw	why do we all need voices?	00:18
	→ peoliye joined	00:19
	→ lindenle joined	00:19
qsx	christmas!	00:19
	→ dlitz joined	00:20
qsx	it started with Eugene aka Eugrinch	00:20
	→ devoldmx joined	00:20
johnw	ahh	00:20
	← whomp left	00:22
	← devoldmx left	00:24
	→ cagedwisdom joined	00:25
	→ empedokles78 joined	00:27
empedokles78	how can I set my linux shell to english?	00:27
	← mcint left	00:27
	← lindenle left	00:27
qsx	that depends on quite some factors and hasn’t really to do with git	00:29
absk007	qsx, why are we all voiced?	00:29
	→ cheetah2 joined	00:29
	→ lindenle joined	00:30
qsx	absk007: christmas!	00:30
absk007	lol	00:30
	← _cyril_ left	00:30
	→ espindola joined	00:31
	← lindenle left	00:32
	← espindola left	00:33
	← jmpp left	00:33
	→ espindola joined	00:33
	→ lindenle joined	00:34
johnw	I take it that come New Year's, my voice will be ripped from my throat most vehemently	00:34
qsx	not by me	00:34
	gradually by dying connections, weird netsplits etc pp	00:34
	← Yeomra left	00:34
	← darxun left	00:35
	← cagedwisdom left	00:35
empedokles78	qsx, it says something that my push was refused because the remote-repository containes commits which are not locally present	00:36
	(loosely translated)	00:36
qsx	oh i see	00:37
	prepend LANG=en_US.UTF-8	00:37
	and what on earth was the factoid for that problem	00:37
empedokles78	"wasn't found. did you mean »pdepend« from package »pdepend« (universe)	00:38
	?"	00:38
qsx	well, you have to integrate upstream’s changes, either by rebase or merge	00:38
	… prepend was a verb.	00:38
	i take it you understand german, „voranstellen“	00:39
	← lindenle left	00:39
empedokles78	qsx: "LANG=en_US.UTF-8 git push https://" didn't change the language.	00:40
	← cheetah2 left	00:40
	→ cheetah2 joined	00:41
	← fahadash left	00:41
Joseph__Silber	johnw, I did fetch. Yes.	00:41
johnw	Joseph__Silber: hmm	00:42
	→ lindenle joined	00:43
Joseph__Silber	johnw, I hope I explained this correctly. The two projects share no history.	00:44
	← mehola left	00:44
Joseph__Silber	They just have very similar contents.	00:44
	← cheetah2 left	00:45
	← toothrot left	00:45
	→ dr3w joined	00:46
	← lindenle left	00:47
	→ ilmgb joined	00:47
Joseph__Silber	.	00:47
	0.	00:47
	.0	00:47
	→ cheetah2 joined	00:48
	← fees left	00:48
Joseph__Silber	Just got a new keyboard. Was plugging it in.	00:49
	→ lindenle joined	00:49
Joseph__Silber	Sorry for the gibberish there.	00:49
	:(	00:49
	→ ag4ve joined	00:49
	← dr3w left	00:51
	← ilmgb left	00:52
	→ keroro520 joined	00:54
	→ jonno11___ joined	00:55
	← lindenle left	00:58
	← potteratt left	00:58
	← keroro520 left	00:58
	← fstd left	00:59
	→ fstd joined	00:59
	→ potteratt joined	00:59
	← jonno11___ left	01:00
	→ daito joined	01:00
	← peoliye left	01:00
	→ circ-user-5EyFq joined	01:00
	→ robbyoconnor joined	01:01
	→ mcint joined	01:03
	→ lindenle joined	01:03
	← mcint left	01:03
	← robbyoconnor left	01:05
	← cheetah2 left	01:05
	← daito left	01:05
	→ robbyoconnor joined	01:05
	→ cheetah2 joined	01:05
	← Jackneill left	01:06
	→ vikas027 joined	01:06
	→ _cyril_ joined	01:09
	← tristanp left	01:11
	← endiruna left	01:12
	← cheetah2 left	01:13
	→ nowhereman joined	01:14
	→ xcesariox joined	01:14
	← nowhere_man left	01:14
	→ localuser- joined	01:15
	← TomyLobo left	01:15
	← dsdeiz left	01:15
	→ dreiss joined	01:18
	← localuser- left	01:20
	→ daito joined	01:20
	nowhereman → nowhere_man	01:21
	← josuebrunel_ left	01:22
	→ dr3w joined	01:22
	→ ajustrun joined	01:24
	→ obiwahn joined	01:24
obiwahn	hey	01:24
	how do i change the commit date of multiple commits?	01:24
	→ llmage joined	01:24
grawity	`git filter-branch --env-filter`	01:27
	← lindenle left	01:27
	← dr3w left	01:27
	← xcesariox left	01:28
	← ajustrun left	01:30
	← justanotheruser left	01:32
	→ keroro520 joined	01:33
	→ lindenle joined	01:34
	← llmage left	01:36
	← fscala left	01:36
	→ fscala joined	01:38
	→ UniFreak joined	01:38
	← tgunr left	01:40
	→ justanotheruser joined	01:40
	← hightower4 left	01:44
	← justanotheruser left	01:45
	→ justanot1eruser joined	01:45
	→ jteneyck_ joined	01:48
	→ ilmgb joined	01:48
	← jteneyck_ left	01:52
	→ jteneyc__ joined	01:52
	← ilmgb left	01:52
	→ peoliye joined	01:54
	→ linux-modder joined	01:54
	← linux-modder left	01:54
	→ linux-modder joined	01:54
	← lindenle left	01:54
	← justanot1eruser left	01:56
	→ kadoban joined	01:56
	→ jonno11___ joined	01:56
	→ justanotheruser joined	01:57
	← dreiss left	01:58
	→ Tee_Pee joined	01:58
	→ griotspeak joined	01:59
	→ lindenle joined	02:01
	← jonno11___ left	02:05
	→ RRCFD joined	02:06
	← pks left	02:07
	→ arescorpio joined	02:07
	→ pks joined	02:08
	← RRCFD left	02:09
	→ RRCFD joined	02:09
	← aerth left	02:10
	→ tristanp joined	02:12
	← lindenle left	02:12
	→ nnyk_ joined	02:13
	→ pozitron joined	02:13
	→ Vampire0 joined	02:15
	← tristanp left	02:17
	← Goplat left	02:17
	← jteneyc__ left	02:17
	← Vampire0_ left	02:18
	→ lindenle joined	02:20
	→ Rodya_ joined	02:20
	→ devoldmx joined	02:20
	→ toothrot joined	02:24
	→ tyll joined	02:24
	→ dsantiago joined	02:25
	→ ajustrun joined	02:26
	← IWishIKnew left	02:26
	← tyll_ left	02:26
	→ Goplat joined	02:26
	→ SimonNa joined	02:28
	← Rodya_ left	02:32
	← ajustrun left	02:33
	← unreal left	02:34
	→ jteneyck joined	02:34
	← m0viefreak left	02:34
	← jteneyck left	02:39
	← msonntag left	02:42
	→ msonntag_ joined	02:42
	→ Tee_Pee_ joined	02:43
	→ mizu_no_oto joined	02:47
	← lindenle left	02:48
	→ mcint joined	02:49
	→ ilmgb joined	02:49
	← shinnya left	02:49
	→ EricPoe_ joined	02:50
	← yqt left	02:51
	→ moparisthebest joined	02:51
	→ lindenle joined	02:53
	← ilmgb left	02:53
	← WaReZ left	02:54
	→ zer0ph joined	02:56
	→ sharkmeiser joined	02:57
	← albel727 left	02:59
	← Tee_Pee_ left	02:59
	← mizu_no_oto left	03:01
	→ jonno11___ joined	03:01
	→ Rodya_ joined	03:03
	← Aboba left	03:03
	→ ryez joined	03:05
	← jonno11___ left	03:05
	→ jteneyck joined	03:06
	← jteneyck left	03:06
	→ jteneyck joined	03:06
	→ strayPuppy joined	03:07
	← jteneyck left	03:08
	← sharkmeiser left	03:12
	→ mizu_no_oto joined	03:13
	← lindenle left	03:14
	→ jteneyck joined	03:15
	← fission6 left	03:15
	← skcin7 left	03:17
	← jteneyck left	03:20
	→ lindenle joined	03:22
	← mezod left	03:24
	← thiago left	03:25
	← Chill_Surf left	03:26
	← M4v3r1ckk left	03:31
	→ shibly joined	03:38
shibly	Anyone there?	03:38
	If someway wants to do git push origin master to my github repository, does he need to type username and password? Where would he get password?	03:38
	How can others do "git push origin master" to my github repository?	03:39
	justanotheruser → justanotherelf	03:40
ryez	shibly: u need to make him a contributor of your github repo	03:41
	the password is just his github credential	03:42
	← espindola left	03:42
ryez	better to setup ssh access to avoid typing password	03:42
	→ jteneyck joined	03:43
	← jteneyck left	03:43
	→ jteneyck joined	03:43
shibly	ryez: Do i have to give him my github password?	03:44
	ryez: How can i make him contributor?	03:44
ryez	check your github repo settings	03:45
	never give others your password	03:45
	← aidalgol left	03:45
ryez	he should create his own github account	03:45
	→ Motoko joined	03:45
	← daito left	03:46
	← lindenle left	03:47
	← dopesong left	03:48
	← mcint left	03:48
	← shibly left	03:50
	→ ilmgb joined	03:50
	→ marscher joined	03:50
	← otter768 left	03:52
	← mizu_no_oto left	03:52
	→ lindenle joined	03:53
	→ mizu_no_oto joined	03:54
	← ilmgb left	03:55
	← nnyk_ left	03:57
	← jteneyck left	04:01
	→ jonno11___ joined	04:02
	→ Thorn joined	04:03
	→ dreiss joined	04:03
	→ shibly joined	04:06
	← jonno11___ left	04:07
shibly	How can i make others contributor on github?	04:07
	Someone was answering my question before, who is he?	04:07
	From Settings of github i don't see any collaboration	04:07
	→ tristanp joined	04:12
	→ daito joined	04:12
	← tristanp left	04:19
	→ kpease joined	04:19
	← devoldmx left	04:19
	→ fission6 joined	04:20
	← kpease left	04:20
	→ DolphinDream joined	04:25
	← dreiss left	04:25
shibly	I got Add collaborator	04:26
	← mizu_no_oto left	04:27
shibly	If i add someone to my repository, then will he be able to do "git push origin master" ?	04:27
	to my repository?	04:27
	→ tanath joined	04:28
	← rewt left	04:29
	← joki left	04:30
	← tanath left	04:31
	← lindenle left	04:33
	→ aidalgol joined	04:33
	→ rewt joined	04:33
	→ joki joined	04:35
	← marscher left	04:40
	→ lindenle joined	04:41
	← shibly left	04:43
	← peoliye left	04:44
	→ jteneyck joined	04:46
	→ devoldmx joined	04:46
	← vikas027 left	04:47
	→ dr3w joined	04:48
	→ ilmgb joined	04:50
	→ mehola joined	04:52
	← dr3w left	04:52
	← jteneyck left	04:53
	← ilmgb left	04:55
	← heroux left	04:55
	→ peoliye joined	05:01
	← pacbard left	05:01
	→ jonno11___ joined	05:03
	→ nnyk_ joined	05:03
	← jonno11___ left	05:07
	→ sssilver joined	05:08
	← sssilver left	05:08
	→ happy-dude joined	05:09
	← daito left	05:10
	→ utanapischti joined	05:11
	→ yes`r joined	05:12
	← keroro520 left	05:13
	← utanapischti left	05:13
	→ wxg joined	05:16
	→ daito joined	05:16
	→ _cyril__ joined	05:20
	← _cyril_ left	05:22
	→ josuebrunel joined	05:23
	← lindenle left	05:23
	← peoliye left	05:25
	← nnyk_ left	05:30
	→ lindenle joined	05:31
	← netj left	05:33
	→ netj joined	05:33
	→ pena joined	05:34
	→ keroro520 joined	05:34
	→ nilg joined	05:35
pena	Has anyone tried deployBot? I am trying to add new branch i the server settings of deployBot, howerver after I push the new branch it is not showing.	05:35
	→ ajustrun joined	05:37
	← nilg left	05:38
	→ peoliye joined	05:40
	→ cagedwisdom joined	05:41
	→ dr3w joined	05:42
	← sdothum left	05:42
	→ fahadash joined	05:43
	← ajustrun left	05:45
	← daito left	05:46
	← ryez left	05:46
	← dr3w left	05:46
	← arescorpio left	05:46
	← cagedwisdom left	05:47
	← fscala left	05:48
	→ subhojit777 joined	05:50
	→ fscala joined	05:50
	→ ilmgb joined	05:51
	→ otter768 joined	05:53
	← lindenle left	05:56
	← ilmgb left	05:56
	→ shibly joined	05:57
shibly	Are git add -A and git add -a same?	05:57
	← otter768 left	05:57
	→ cagedwisdom joined	05:59
	← linux-modder left	06:00
kadoban	shibly: no	06:00
	← EricPoe_ left	06:00
shibly	What's the difference?	06:01
kadoban	shibly: One doesn't mean anything, unless you just like error messages followed by usage statements. The other is -A	06:01
	→ jonno11___ joined	06:04
	→ xcesariox joined	06:04
	→ lindenle joined	06:05
	← peoliye left	06:06
	→ sanketdg joined	06:06
	← shibly left	06:07
	→ EricPoe_ joined	06:08
	← griotspeak left	06:08
	→ Wetmelon joined	06:08
	← jonno11___ left	06:08
	justanotherelf → apache	06:10
	apache → justanotherelf	06:11
	→ tristanp joined	06:12
	← kadoban left	06:15
	→ dsdeiz joined	06:15
	← Rodya_ left	06:15
	← lindenle left	06:16
	→ lindenle joined	06:17
	← xcesariox left	06:19
	→ griotspeak joined	06:20
	← lindenle left	06:22
	→ lindenle joined	06:25
	→ nnyk_ joined	06:25
	→ peoliye joined	06:26
	← lindenle left	06:26
	← duderonomy left	06:26
	← subhojit777 left	06:27
julius	i just checked in a change in a file, but pulling it from other machines says "already up to date"	06:28
	http://pastebin.ca/3300628	06:28
	but im sure that i edited ~/.bashrc_meins and that it is tracked	06:28
	← toothrot left	06:30
	→ duderonomy joined	06:30
	← dsdeiz left	06:32
	← Shentino left	06:34
	→ ShapeShifter499 joined	06:36
	← nnyk_ left	06:37
	→ dr3w joined	06:37
	← EricPoe_ left	06:39
	→ dsdeiz joined	06:40
	→ subhojit777 joined	06:40
	→ roar363_ joined	06:40
	→ ajustrun joined	06:41
	← dr3w left	06:43
	← moei left	06:44
	→ moei joined	06:45
	← ag4ve left	06:45
	→ absk007_ joined	06:45
	absk007 → Guest66117	06:45
	→ howdoi joined	06:45
	← Guest66117 left	06:45
	← rewt left	06:46
	← ajustrun left	06:47
	← dsdeiz left	06:48
	← surfdue left	06:48
	→ relipse joined	06:50
	← subhojit777 left	06:51
	→ ilmgb joined	06:52
	→ surfdue joined	06:52
	→ nilg joined	06:53
	→ rewt joined	06:53
_ikke_	julius: Did you commit the change?	06:53
	← Pseudocrat left	06:56
	← ilmgb left	06:56
julius	yes and push	06:58
	git status says nothing to commit	06:58
	Tronsha → [UPA]Stefan	07:00
	← griotspeak left	07:01
	→ subhojit777 joined	07:03
	→ jonno11___ joined	07:05
	← FireArrow133 left	07:05
	← roar363_ left	07:07
	← jonno11___ left	07:09
	← foul_owl left	07:11
	← netj left	07:13
	→ netj joined	07:14
	absk007_ → absk007	07:14
	← rewt left	07:15
	← Motoko left	07:17
	← fission6 left	07:18
	← nilg left	07:19
	→ daito joined	07:19
	← Gamecubic left	07:21
	→ rewt joined	07:22
	← Domhack left	07:27
	→ Domhack joined	07:28
	→ rom-dos joined	07:34
	← relipse left	07:36
	← MistahKurtz left	07:36
	← toogy left	07:37
	→ toogy joined	07:37
	→ omri joined	07:38
	← moei left	07:39
	→ moei joined	07:40
	← eka left	07:41
	← mehola left	07:41
	← gusnan left	07:41
	→ eka joined	07:41
	← omri left	07:42
	→ acetakwas joined	07:43
	→ gusnan joined	07:44
	← gusnan left	07:44
	→ gusnan joined	07:44
	← tzero left	07:45
	← sparetire_ left	07:46
	→ zotherstupidguy joined	07:47
	← tristanp left	07:48
	← rom-dos left	07:49
	← fahadash left	07:51
	→ tristanp_ joined	07:52
	← acetakwas left	07:52
	→ ilmgb joined	07:53
	→ MistahKurtz joined	07:53
	← diogenese left	07:54
	→ otter768 joined	07:54
	← Goplat left	07:54
	→ _nadim joined	07:54
	← ilmgb left	07:57
	→ mahendra_ joined	07:58
	← MistahKurtz left	07:58
	← daito left	07:59
	← otter768 left	07:59
	→ tzero joined	08:04
	→ DWestCoast joined	08:04
	→ jonno11___ joined	08:05
	← tristanp_ left	08:06
	→ treaki joined	08:07
	← jacksparrow007 left	08:09
	← mac_ified left	08:09
	← jonno11___ left	08:10
	→ diogenese joined	08:12
	→ dreiss joined	08:14
	→ roxlu joined	08:22
	→ daito joined	08:24
	→ dr3w joined	08:26
	← avgn5 left	08:26
	→ David1977 joined	08:28
	← abc123 left	08:30
	← waspinator left	08:30
	→ albel727 joined	08:30
	← dr3w left	08:30
	← Norm left	08:31
	← dreiss left	08:32
	→ The_Phoenix joined	08:33
	← dangranos left	08:35
	← subhojit777 left	08:35
	← ArmOrAttAk left	08:37
	→ tomzx joined	08:38
	← RRCFD left	08:38
	← freeze left	08:39
	← gusnan left	08:40
	→ freeze joined	08:41
	← devoldmx left	08:41
	→ gusnan joined	08:42
	← zer0ph left	08:43
	→ vikas027 joined	08:44
	→ ajustrun joined	08:46
	→ ArmOrAttAk joined	08:47
	← DolphinDream left	08:48
	← ajustrun left	08:52
	→ ilmgb joined	08:53
	→ subhojit777 joined	08:55
	→ denimsoft joined	08:57
	← denimsoft left	08:57
	→ mcint joined	08:58
	← ilmgb left	08:58
	→ zer0ph joined	09:00
	← julius left	09:02
	← The_Phoenix left	09:03
	→ dantix joined	09:09
	→ cheetah2 joined	09:14
	→ BSaboia joined	09:16
	← Domhack left	09:17
	← ShapeShifter499 left	09:20
	← zer0ph left	09:26
	← pozitron left	09:28
	→ fees joined	09:28
	← pena left	09:30
	→ Yeomra joined	09:30
	→ _cyril_ joined	09:31
	← jagob left	09:33
	← _cyril__ left	09:33
	← vikas027 left	09:34
	← dantix left	09:36
	→ dantix joined	09:36
	→ vikas027 joined	09:38
	→ peoliye_ joined	09:39
	← Yeomra left	09:42
	→ Yeomra joined	09:42
	← wxg left	09:42
	← peoliye left	09:43
	← Wetmelon left	09:46
	→ Burgerz joined	09:47
	→ ajustrun joined	09:48
	→ ahr3n joined	09:49
	← David1977 left	09:51
	→ ilmgb joined	09:52
	→ hardenedapple joined	09:52
	← ajustrun left	09:52
	→ David1977 joined	09:53
	← wcpan left	09:54
	→ otter768 joined	09:55
	→ wcpan joined	09:56
	← otter768 left	10:00
	← fscala left	10:01
	→ fscala joined	10:03
	← josuebrunel left	10:10
	→ jonno11___ joined	10:10
	→ wxg joined	10:12
	→ likk joined	10:14
	← strayPuppy left	10:15
	→ elastix joined	10:15
	← likk left	10:16
	← Nikhil_D left	10:19
	← wxg left	10:20
	← sanketdg left	10:20
	→ The_Phoenix joined	10:20
	→ Nikhil_D joined	10:21
	← aidalgol left	10:22
	→ arup_r joined	10:22
	→ kam270 joined	10:25
	← kam270 left	10:25
	→ mahendrak joined	10:25
	← mcint left	10:25
	← mahendra_ left	10:29
	→ kam270 joined	10:29
	← kam270 left	10:29
	← kaiza left	10:30
	→ CareBear\ joined	10:32
	← peoliye_ left	10:32
	← ahr3n left	10:34
	→ peoliye joined	10:34
	→ xcesariox joined	10:37
	← zotherstupidguy left	10:46
	← roentgen left	10:49
	← cheetah2 left	10:50
	→ roentgen joined	10:52
	← subhojit777 left	10:53
	← peoliye left	10:55
	← gusnan left	10:56
	→ gusnan joined	10:58
	← gusnan left	10:58
	→ gusnan joined	10:58
	→ roelmonnens joined	10:58
	→ treaki_ joined	11:01
	← jonno11___ left	11:01
	→ Jackneill joined	11:02
	→ jonno11___ joined	11:02
	→ mezod joined	11:02
	← zmachine left	11:03
	← treaki left	11:04
	→ zmachine joined	11:05
	← jonno11___ left	11:06
	Upsanta → Uptime	11:07
	← ilmgb left	11:08
	→ ilmgb joined	11:08
	← roelmonnens left	11:09
	→ lello joined	11:12
	← lello left	11:13
	← ilmgb left	11:13
	← David1977 left	11:14
	← boudiccas__ left	11:15
	→ boudiccas__ joined	11:17
	← keroro520 left	11:21
	← synthmeat left	11:23
	← daito left	11:23
	→ zer0ph joined	11:26
	→ lello21 joined	11:27
	← lello21 left	11:31
	→ Jackneill_ joined	11:32
	← _cyril_ left	11:32
	→ jonno11___ joined	11:33
	← Jackneill left	11:33
	← jonno11___ left	11:35
	→ m0viefreak joined	11:35
	→ jonno11___ joined	11:36
	← vikas027 left	11:38
	← jonno11___ left	11:40
	← xcesariox left	11:44
	→ sebbel joined	11:46
	← WakiMiko left	11:49
	→ WakiMiko joined	11:50
	→ iLembus joined	11:50
	← gusnan left	11:50
	→ gusnan joined	11:51
	← gusnan left	11:51
	→ gusnan joined	11:51
	→ Jackneill joined	11:52
	← Chunkr left	11:52
	← Jackneill_ left	11:53
	→ otter768 joined	11:56
	→ WaReZ joined	11:56
	→ mkathirvel joined	11:56
	→ unreal joined	11:57
	← causasui left	11:59
	← mahendrak left	11:59
	← otter768 left	12:00
	→ nnyk_ joined	12:02
	→ dr3w joined	12:02
	→ causasui joined	12:03
	← elastix left	12:04
	← UniFreak left	12:04
	→ Mechtilde joined	12:05
	← mezod left	12:05
	gitinfo set mode: +v	12:06
Mechtilde	I clones an upstream repo, now there is a new branch. how can I pull the new branch	12:06
	→ skcin7 joined	12:07
Mechtilde	as a separate branch	12:07
	→ heroux joined	12:07
	← dr3w left	12:07
	← mkathirvel left	12:09
	→ ilmgb joined	12:09
	→ keroro520 joined	12:09
	→ thiago joined	12:09
_ikke_	git fetch, git checkout <branch>	12:10
	→ arup___ joined	12:11
Mechtilde	git checkout <branchname> changed the working directory local	12:13
	← ilmgb left	12:13
_ikke_	yes, that's it's goal	12:13
Mechtilde	but how can I get a new upstream branch	12:14
	← arup_r left	12:14
	← keroro520 left	12:14
	→ xcesariox joined	12:14
Mechtilde	the upstream branch was created after my clone	12:14
_ikke_	Mechtilde: You already have it after git fetch	12:14
	git branch -a	12:14
	→ mcint joined	12:15
Mechtilde	git branch -a doesn't contain it	12:15
_ikke_	did you execute git fetch?	12:15
	← sebbel left	12:15
Mechtilde	ok so I try to understand what this means	12:16
	thanks	12:16
	← BtbN left	12:16
	← sonOfRa left	12:16
	→ BtbN joined	12:17
	→ sonOfRa joined	12:17
	→ mkathirvel joined	12:18
	→ keroro520 joined	12:21
	→ daito joined	12:24
	→ subhojit777 joined	12:25
	→ mahendrak joined	12:28
	← daito left	12:28
	← mkathirvel left	12:28
	→ jonno11___ joined	12:31
_ikke_	git pull first does git fetch, and then git merge	12:31
	→ zotherstupidguy joined	12:31
	← zotherstupidguy left	12:31
	→ zotherstupidguy joined	12:31
	← jonno11___ left	12:32
Mechtilde	that's why I didn't want git pull	12:32
	Is it possible to get a branch back from upstream I deleted local	12:32
	→ acetakwas joined	12:34
	→ jonno11___ joined	12:35
	← jzk left	12:35
	→ pozitrono joined	12:37
	→ mkathirvel joined	12:38
	→ mezod joined	12:38
	→ sanketdg joined	12:38
	← mahendrak left	12:40
circ-user-5EyFq	I see that StringBuilder.dropRight creates some other builders, likewise StringBuilder is a ususal collection.	12:41
	Wait, they cannot simply set length because that is mutable.	12:42
_ikke_	circ-user-5EyFq: this is #git	12:42
circ-user-5EyFq	sorry :)	12:42
_ikke_	np, just wanted to let you know ;-)	12:42
	← mezod left	12:43
_ikke_	Mechtilde: You just deleted the branch name	12:43
	Mechtilde: No need to get it from upstream again	12:43
	→ SimonNaa joined	12:43
_ikke_	Mechtilde: If your branch is called foo, you just need to do: git branch foo origin/foo	12:43
Mechtilde	and how do I get the name back?	12:44
_ikke_	^^	12:44
	→ Max_ joined	12:44
	→ xolubi joined	12:44
	→ UniFreak joined	12:44
	Max_ → Guest53840	12:44
Mechtilde	not depending in which branch I am?	12:44
_ikke_	Nope	12:45
	← xolubi left	12:45
	← jonno11___ left	12:46
	← SimonNa left	12:46
	← Guest53840 left	12:47
	← Jackneill left	12:48
	→ RRCFD joined	12:48
	→ jonno11___ joined	12:48
	→ SrPx joined	12:50
	← arup___ left	12:50
	→ iLembus_ joined	12:51
	← SrPx left	12:52
	→ arup_r joined	12:53
	→ SrPx joined	12:53
	→ jleclanche joined	12:54
	→ BrunoSaboia joined	12:54
	→ _Vi joined	12:55
	→ toogley joined	12:55
	→ codeman joined	12:55
	← skcin7 left	12:56
jleclanche	Why is it that git reset --hard <tag> does not work the same when --git-dir is specified and I'm outside of the specified git-dir? It seems to behave like git reset --mixed	12:57
	← deavidsedice left	12:57
	→ deavid joined	12:57
jleclanche	think this might be a bug	12:57
	← reactormonk left	12:58
	← BSaboia left	12:58
	← themill left	12:58
	← zapb_ left	12:58
	→ zapb_ joined	12:58
	← fstd left	12:59
	→ themill joined	12:59
	→ hiironymus joined	12:59
	← xcesariox left	12:59
	→ reactormonk joined	12:59
	→ fstd joined	12:59
	→ dsdeiz joined	13:00
	→ mahendrak joined	13:00
	→ Balliad joined	13:00
	← mcint left	13:01
	← mkathirvel left	13:02
	→ mahendra_ joined	13:03
	→ netcarver joined	13:04
	← mungojelly left	13:04
_ikke_	jleclanche: You also have to specify the working-tree	13:05
jleclanche	_ikke_: how so?	13:05
_ikke_	jleclanche: Easiest is to use git -C path/to/dir	13:05
	← mahendrak left	13:06
jleclanche	oh oops	13:06
	i see, nvm	13:06
	_ikke_: -C works fine thank you :)	13:07
	→ diegoviola joined	13:07
	→ Jackneill joined	13:08
	← acetakwas left	13:08
_ikke_	np	13:09
	← skul left	13:09
	→ ilmgb joined	13:09
	← gravitron left	13:10
	→ gravitron joined	13:11
	→ ag4ve joined	13:11
	← d0nn1e left	13:12
	→ d0nn1e joined	13:14
	← ilmgb left	13:14
ELLIOTTCABLE	Is `git fetch origin refs/notes/:refs/notes/` still the canonical way to retrieve git-notes from a remote? o_o	13:15
	← netcarver left	13:15
	→ sdothum joined	13:15
ELLIOTTCABLE	was that ever improved upon?	13:15
	(Does anybody here actually use notes in a successful way in their workflow; and if so, what are your thoughts and tips?)	13:15
	← iLembus left	13:16
	← Balliad left	13:16
	← iLembus_ left	13:17
	← mahendra_ left	13:18
	→ Juergen4711 joined	13:18
	→ petersr joined	13:18
	← sarri left	13:18
grawity	git config remote.origin.fetch --add refs/notes/:refs/notes/	13:19
	this has worked since day one	13:19
	← DWestCoast left	13:19
	← petersr left	13:19
	→ sarri joined	13:20
	→ localuser- joined	13:20
	→ diego1 joined	13:21
	→ mahendra_ joined	13:22
	← diego1 left	13:22
	→ diego1 joined	13:22
	← eka left	13:23
	→ linux-modder joined	13:23
	← linux-modder left	13:23
	→ linux-modder joined	13:23
	← diegoviola left	13:23
	← _Vi left	13:24
ELLIOTTCABLE	grawity: what about the merging stuff; has that been improved?	13:25
grawity	dunno	13:26
ELLIOTTCABLE	also, is there any way to make sure that when somebody clones a repository, they already have all the notes? that would require them to run an extra command when cloning	13:26
	diego1 → diegoviola	13:27
	→ eka joined	13:29
	→ lindenle joined	13:29
	→ strozyka joined	13:29
	[UPA]Stefan → Tronsha	13:30
	← causasui left	13:31
	← lindenle left	13:33
	→ causasui joined	13:35
	← keroro520 left	13:39
	→ italoacasas joined	13:40
	→ felixis joined	13:41
	→ keroro520 joined	13:43
	→ mhg joined	13:44
	→ _cyril_ joined	13:46
	→ yn5 joined	13:48
	← WaReZ left	13:51
	→ mizu_no_oto joined	13:52
	→ BSaboia joined	13:52
	→ nhyk joined	13:52
	← yn5 left	13:54
ELLIOTTCABLE	grawity: is there a similar way to make them automatically push?	13:55
	probably a stupid question. :x	13:55
	← roxlu left	13:55
	← gusnan left	13:56
	← mizu_no_oto left	13:56
	→ otter768 joined	13:56
	→ jyuan joined	13:56
	→ gusnan joined	13:57
	→ _cyril__ joined	13:58
	← arup_r left	13:59
	← _cyril_ left	13:59
	← otter768 left	14:01
	← localuser- left	14:01
	← strozyka left	14:02
	→ Gamecubic joined	14:03
	← roentgen left	14:04
	→ roentgen joined	14:05
	→ xcesariox joined	14:07
	← _cyril__ left	14:07
	→ t0by joined	14:08
	← xcesariox left	14:08
	→ ilmgb joined	14:10
	→ mahendrak joined	14:11
	← fscala left	14:13
	← mahendra_ left	14:15
	← felixis left	14:15
	→ dopesong joined	14:15
	← ilmgb left	14:15
	→ fscala joined	14:16
	← bket left	14:16
	→ reim joined	14:17
	→ bket joined	14:20
	→ Nickeeh joined	14:21
	→ strozyka joined	14:21
	→ Chunkr joined	14:21
	→ jogassd joined	14:25
	← circ-user-5EyFq left	14:25
	← mahendrak left	14:25
	→ gaen joined	14:26
	→ d4rklit3 joined	14:28
	← jogassd left	14:33
	← reim left	14:36
	→ mahendrak joined	14:36
	→ reim joined	14:36
	→ arup_r joined	14:38
	← SrPx left	14:38
	← diegoviola left	14:39
	→ dstarh joined	14:40
	← subhojit777 left	14:42
	→ localuser- joined	14:45
	→ circ-user-5EyFq joined	14:45
	← yes`r left	14:46
	← zer0ph left	14:47
	← jonno11___ left	14:48
	→ lindenle joined	14:54
	← treaki_ left	14:56
	← Mechtilde left	14:56
	← lindenle left	15:00
	→ zer0ph joined	15:01
	→ Jackneill_ joined	15:02
	→ treaki joined	15:03
	← treaki left	15:03
	← Jackneill left	15:03
	← RRCFD left	15:03
	→ lindenle joined	15:04
	→ subhojit777 joined	15:04
	→ Shentino joined	15:05
	← happy-dude left	15:09
	← dstarh left	15:10
	→ ilmgb joined	15:11
	→ yes`r joined	15:14
	← dopesong left	15:14
	→ mellernoia joined	15:14
	→ petersr joined	15:15
	← ilmgb left	15:15
	← petersr left	15:15
	→ fission6 joined	15:16
	→ Karkus joined	15:16
	← localuser- left	15:17
	→ shinnya joined	15:20
	→ Juergen4711_ joined	15:21
	← Juergen4711 left	15:23
	→ daito joined	15:25
	← linux-modder left	15:26
	→ linux-modder joined	15:26
	← Didac left	15:29
	→ iLembus joined	15:29
	← daito left	15:30
	← lindenle left	15:32
	← mellernoia left	15:34
	→ lindenle joined	15:36
	→ Ragnar joined	15:37
	→ SrPx joined	15:37
	→ otter768 joined	15:38
	→ jayeshsolanki joined	15:38
	→ acetakwas joined	15:38
	← zer0ph left	15:40
	→ FireArrow133 joined	15:41
	← SrPx left	15:42
	→ josuebrunel joined	15:44
	← Juergen4711_ left	15:44
	→ Ahmed90 joined	15:45
	→ happy-dude joined	15:46
	← lindenle left	15:50
	← mahendrak left	15:50
	← Jackneill_ left	15:53
	→ feders joined	15:53
	→ toothrot joined	15:53
	→ Jackneill joined	15:53
	→ ajustrun joined	15:54
	→ _cyril__ joined	15:54
	← iLembus left	15:55
	→ petersr joined	15:55
	→ lindenle joined	15:55
	→ dkliw joined	15:56
	→ frivol joined	15:56
	← dkliw left	15:56
	→ mizu_no_oto joined	15:56
	← toogley left	15:57
	→ toogley joined	15:57
	← Ragnar left	15:57
	→ leeN joined	15:58
	→ DWestCoast joined	15:59
	← keroro520 left	15:59
	← acetakwas left	15:59
	→ EricPoe_ joined	15:59
	→ griotspeak joined	15:59
	← ajustrun left	16:00
	← The_Phoenix left	16:01
	→ acetakwas joined	16:01
	→ Sonicbit joined	16:04
	← EricPoe_ left	16:04
	← toogley left	16:04
	→ David1977 joined	16:05
	← petersr left	16:05
	→ Jackneill_ joined	16:05
	→ Didac joined	16:05
	→ MaceBewley joined	16:06
	← Jackneill left	16:07
	→ The_Phoenix joined	16:09
	← ag4ve left	16:10
	← linux-modder left	16:10
	→ synthmeat joined	16:11
	→ Darcidride joined	16:11
	← d4rklit3 left	16:11
	→ ilmgb joined	16:12
	→ toogley joined	16:12
	→ kadoban joined	16:13
	← mhg left	16:14
	← feders left	16:16
	← ilmgb left	16:16
	→ ErKa joined	16:17
	← lindenle left	16:20
	← Derega left	16:21
	← ErKa left	16:21
	← synthmeat left	16:22
	← zotherstupidguy left	16:22
	← reim left	16:22
	→ synthmeat joined	16:22
	→ Derega joined	16:24
	→ lindenle joined	16:27
	← David1977 left	16:28
	← mizu_no_oto left	16:32
	→ reim joined	16:32
	← _cyril__ left	16:32
	→ Goplat joined	16:33
	→ Rodya_ joined	16:34
	← skylite left	16:35
	← otter768 left	16:35
	← reim left	16:36
	← griotspeak left	16:38
	← BombStrike left	16:41
	→ LeRieur joined	16:43
	→ dreiss joined	16:44
	→ relipse joined	16:45
	← codeman left	16:45
	→ BombStrike joined	16:47
	→ xelxebar joined	16:48
	→ mizu_no_oto joined	16:48
	→ Boniche joined	16:48
	← Boniche left	16:49
	→ IWishIKnew joined	16:50
	→ Boniche joined	16:50
	← lindenle left	16:50
	→ lindenle joined	16:54
	← josuebrunel left	16:57
	→ zotherstupidguy joined	16:57
	← Darcidride left	16:57
	→ Darcidride joined	16:58
	← Rodya_ left	16:59
	← MaceBewley left	17:00
	→ Rodya_ joined	17:00
	← Rodya_ left	17:02
	→ Wetmelon joined	17:03
	→ Rodya_ joined	17:03
	→ mahendra_ joined	17:03
	← circ-user-5EyFq left	17:04
	← dreiss left	17:04
	→ lucianangelus joined	17:06
	← mizu_no_oto left	17:07
	← subhojit777 left	17:08
	→ subhojit777 joined	17:08
johnw	they'd need to add a fetchspec after pulling	17:08
	I've used notes effectively in a small team setting to capture the output from builds and test runs on the CI server	17:09
	→ avgn5 joined	17:09
johnw	that way, you can historically see whether a given commit passed all tests or not	17:09
	→ circ-user-5EyFq joined	17:12
	→ ilmgb joined	17:12
	← xelxebar left	17:13
alanjf	Merry Christmas!	17:14
	→ mizu_no_oto joined	17:14
avgn5	Merry Christmas!	17:14
	→ MaceBewley joined	17:15
	← toogley left	17:15
	→ abc123_ joined	17:15
	← dantix left	17:15
	→ toogley joined	17:15
	gaen → gaen[away]	17:17
	← ilmgb left	17:17
johnw	what you do you call Git's ability to track	17:18
	"patechs"	17:18
	← mizu_no_oto left	17:18
johnw	that is, to know that it's already seen the content of a particular commit's changes before	17:18
	→ SrPx joined	17:18
johnw	it's not patch tracking...	17:18
	← lindenle left	17:19
	← BrunoSaboia left	17:21
bremner	dunno. maybe a careful reading of man git-patch-id helps	17:21
gitinfo	the git-patch-id manpage is available at http://jk.gs/git-patch-id.html	17:21
	← arup_r left	17:21
	← BSaboia left	17:21
bremner	although it didn't help me	17:22
	→ eijk joined	17:22
johnw	k	17:22
	→ jteneyck joined	17:25
	→ lindenle joined	17:27
	← dsdeiz left	17:27
	→ mizu_no_oto joined	17:27
	← mizu_no_oto left	17:27
	← howdoi left	17:28
	→ robh71 joined	17:30
	→ mattfoo joined	17:32
	← justanotherelf left	17:33
	→ arup_r joined	17:34
	→ skorgon joined	17:37
	→ devoldmx joined	17:37
	→ dangranos joined	17:38
	→ jay-m joined	17:39
	→ mizu_no_oto joined	17:41
	← blackjid left	17:42
	← devoldmx left	17:42
	→ blackjid joined	17:42
	→ sparetire_ joined	17:43
	← skorgon left	17:44
	← MaceBewley left	17:44
	← mizu_no_oto left	17:45
	← robh71 left	17:47
	← gusnan left	17:51
	→ fcoelho joined	17:51
	← Rodya_ left	17:51
	← jay-m left	17:51
	→ gusnan joined	17:52
	← gusnan left	17:52
	→ gusnan joined	17:52
	gaen[away] → gaen	17:53
	← troyt left	17:56
	← toogley left	17:56
	→ toogley joined	17:57
	→ ajustrun joined	17:57
	← lindenle left	17:58
	→ d4rklit3 joined	18:00
	→ tomog999_ joined	18:02
	← tomog999 left	18:05
	← ajustrun left	18:05
	← jteneyck left	18:05
	← IWishIKnew left	18:06
	→ _Vi joined	18:06
	→ lindenle joined	18:08
	→ xelxebar joined	18:10
	← eijk left	18:10
	← pozitrono left	18:11
	→ MaceBewley joined	18:11
	← Karkus left	18:11
	← dr_lepper left	18:12
	→ Aides joined	18:12
	Aides → dr_lepper	18:12
	→ ilmgb joined	18:13
	→ sq-one joined	18:14
	→ codedmart joined	18:17
	→ durham joined	18:17
	← ilmgb left	18:18
	← mahendra_ left	18:20
	← nnyk_ left	18:20
	→ s00pcan_ joined	18:23
	← d4rklit3 left	18:24
	→ zer0ph joined	18:25
	← Wetmelon left	18:26
	← sanketdg left	18:27
	← fscala left	18:28
	→ fscala joined	18:30
	← gaen left	18:31
	→ Sasazuka__ joined	18:33
	→ dstarh joined	18:33
	→ otter768 joined	18:36
	→ Daredel joined	18:36
	→ Karkus joined	18:37
	← mattfoo left	18:39
	← lindenle left	18:40
	← otter768 left	18:41
	← Hello71 left	18:42
	→ lindenle joined	18:42
	← xelxebar left	18:43
	→ robh71 joined	18:44
	← frivol left	18:45
	← subhojit777 left	18:45
	← durham left	18:45
	→ diegoviola joined	18:47
	→ daito joined	18:47
	→ Hello71 joined	18:47
	→ durham joined	18:49
	→ nicoulaj joined	18:51
	→ rxc joined	18:51
	← rxc left	18:51
	→ rxc joined	18:51
	← daito left	18:52
	← Sonicbit left	18:54
	← toothrot left	18:56
	← jayeshsolanki left	18:57
	→ tristanp joined	18:58
	← MaceBewley left	18:59
	← Karkus left	18:59
	← crankyadmin left	19:01
	→ toothrot joined	19:02
	→ subhojit777 joined	19:02
	← zer0ph left	19:02
	Alissa → SatanClaus	19:03
	← codedmart left	19:04
	→ codedmart joined	19:04
	← codedmart left	19:04
	→ codedmart joined	19:04
	→ Sonicbit joined	19:06
	← blackjid left	19:07
	→ blackjid joined	19:08
	← tristanp left	19:09
	← Sonicbit left	19:10
	← nicoulaj left	19:11
	→ Douhan joined	19:12
	← lindenle left	19:12
	→ FireArrow133_ joined	19:13
	→ ilmgb joined	19:14
	→ MaceBewley joined	19:14
	← FireArrow133 left	19:17
	→ FireArrow133 joined	19:17
	→ troyt joined	19:18
	← FireArrow133_ left	19:18
	← ilmgb left	19:18
	→ lindenle joined	19:19
	→ nicoulaj joined	19:19
	→ Karkus joined	19:22
	← Karkus left	19:22
	→ Karkus joined	19:22
	→ eijk joined	19:23
	← circ-user-5EyFq left	19:26
toogley	how can i switch to a specific commit and temporarily change the working dir the the from the commit? i just want to look at a specific file.	19:28
	← s00pcan_ left	19:29
cbreak	git checkout thatcommit	19:29
	← deltab left	19:29
	← acetakwas left	19:29
	← Sasazuka__ left	19:30
	→ gopar joined	19:30
	→ deltab joined	19:31
	→ keroro520 joined	19:31
toogley	cbreak: ah, i think i just mistyped sth. works now	19:32
	→ s00pcan_ joined	19:34
	← keroro520 left	19:36
	← relipse left	19:36
	→ devoldmx joined	19:38
	← lindenle left	19:38
	← toogley left	19:40
fission6	i am on a branch where i am git rm a bunch of stuff, i decided i don't want to do that anymore, how do i chuck th ebranch's efforts and return to master?	19:40
	→ gaen joined	19:40
	← s00pcan_ left	19:40
	← fcoelho left	19:41
	→ stamina joined	19:42
	← kadoban left	19:43
	← devoldmx left	19:43
	← causasui left	19:43
	→ lindenle joined	19:44
johnw	git checkout master?	19:45
	→ iLembus joined	19:45
johnw	if you want to throw away everything you done:	19:45
qsx	git status is always helpful.	19:45
johnw	git reset --hard HEAD ; git checkout master ; git branch -d <old branch>	19:46
	← durham left	19:46
johnw	that's a pretty firm hand, though, so watch out	19:46
	→ oberststen joined	19:46
johnw	I guess i don't actually need to type 'HEAD' either, do i	19:46
	→ mellernoia joined	19:47
	← Karkus left	19:48
	→ causasui joined	19:48
	→ HelloAtMega joined	19:52
	→ dr3w joined	19:52
	→ toogley joined	19:53
	→ tristanp joined	19:53
	← toogley left	19:54
	→ toogley joined	19:54
	← toogley left	19:56
	→ toogley joined	19:56
	← mellernoia left	19:56
	← batrick left	19:56
	← cschneid left	19:57
	← tristanp left	19:57
	→ CheckDavid joined	19:58
	→ Rodya_ joined	19:59
	← jgornick left	20:00
	← AustinMatherne left	20:00
	→ tristanp joined	20:00
	← imMute left	20:00
	← Kamilion left	20:00
	← GGMethos left	20:01
	← dlitz left	20:01
	← rideh left	20:01
	← Neal_ left	20:01
	← Hedgework left	20:01
	← HedgeMage left	20:01
Douhan	Does git trim a commit message?	20:01
	← italoacasas left	20:01
Douhan	Like " test "	20:01
	or unnecessary new lines	20:01
qsx	Douhan: if at all, only trailing new lines	20:02
Douhan	How can I check if I have trailing new line in my commit	20:03
	→ rath joined	20:03
	← robh71 left	20:03
Douhan	in my commit message*	20:03
	← dr3w left	20:03
qsx	print it, e.g. git show $commit, git log -1 $commit, git cat-file -p $commit, …	20:03
avgn5	git commit -m 'Merry Christmas, Charlie Brown'	20:04
	← DWestCoast left	20:05
	← Goplat left	20:06
	→ skcin7 joined	20:06
Douhan	Thanks qsx	20:06
	→ beemo joined	20:06
	← beemo left	20:06
	← tristanp left	20:09
	→ jagob joined	20:10
	→ tristanp joined	20:11
	← toogley left	20:11
	→ toogley joined	20:11
	← nydel07 left	20:12
	← toogley left	20:12
	→ toogley joined	20:12
	→ s00pcan_ joined	20:13
	← lindenle left	20:13
	← toogley left	20:13
	→ toogley joined	20:13
	→ daito joined	20:15
	→ ilmgb joined	20:15
	→ nydel07 joined	20:18
	← ilmgb left	20:19
	← tristanp left	20:19
	← daito left	20:20
	→ tristanp joined	20:20
	→ lindenle joined	20:21
	→ tgunr joined	20:21
	→ shuaib joined	20:22
	→ aidalgol joined	20:23
	→ dreiss joined	20:23
	→ daito joined	20:23
	→ EduardoMartins joined	20:24
	ChristmasMagic → sublimate_likes_	20:26
	sublimate_likes_ → subl_christmas	20:27
	← oberststen left	20:27
	→ Sasazuka__ joined	20:29
	← PCatinean left	20:29
	← daito left	20:30
	← dstarh left	20:33
	→ peoliye joined	20:33
	→ durham joined	20:34
	← Sasazuka__ left	20:34
	← s00pcan_ left	20:34
	→ constantinexvi joined	20:35
	→ jgornick joined	20:36
	→ rideh joined	20:36
	→ Neal_ joined	20:36
	→ Hedgework joined	20:36
	→ HedgeMage joined	20:36
	→ dlitz joined	20:37
	→ cschneid joined	20:37
	→ otter768 joined	20:37
	← rath left	20:37
	→ batrick joined	20:38
	→ Dandelock joined	20:38
	← durham left	20:39
	→ italoacasas joined	20:39
	→ hhaim joined	20:39
	← hhaim left	20:40
	→ joshc joined	20:40
	→ Karkus joined	20:41
	→ IWishIKnew joined	20:42
	← otter768 left	20:42
	← Karkus left	20:43
	→ imMute joined	20:43
	← imMute left	20:43
	→ imMute joined	20:43
	→ AustinMatherne joined	20:43
	→ josuebrunel_ joined	20:44
	→ mepo joined	20:44
	← mepo left	20:44
	→ s00pcan_ joined	20:45
	→ Goplat joined	20:45
	→ Kvelc joined	20:46
	← Kvelc left	20:46
	→ Kamilion joined	20:46
	← causasui left	20:47
	→ GGMethos joined	20:47
	← subhojit777 left	20:48
	← stamina left	20:48
	← jagob left	20:49
	← EduardoMartins left	20:50
	← LiENUS left	20:50
	← dreiss left	20:50
	→ zacts joined	20:51
	→ LiENUS joined	20:52
	← arup_r left	20:53
	← robbyoconnor left	20:54
	← lindenle left	20:54
	→ EduardoMartins joined	20:57
	→ jteneyck joined	20:57
	← SrPx left	20:57
	→ David1977 joined	20:58
	→ oberststen joined	20:58
	→ robh71 joined	20:59
	→ lindenle joined	20:59
	→ SrPx joined	20:59
	→ Balliad joined	21:00
	← SrPx left	21:02
	← toothrot left	21:02
	→ SrPx joined	21:02
	→ lethalspoons joined	21:03
	→ \toothrot joined	21:04
	← peoliye left	21:06
	→ relipse joined	21:08
	→ ajustrun joined	21:08
	← relipse left	21:09
	ec\ → ec	21:11
	← tristanp left	21:11
	→ tristanp joined	21:14
	← eka left	21:14
	→ mihaicris joined	21:15
	→ ilmgb joined	21:15
	← lethalspoons left	21:16
	← ajustrun left	21:17
	← s00pcan_ left	21:17
	→ Karkus joined	21:19
	← tristanp left	21:20
	← ilmgb left	21:20
	→ lethalspoons joined	21:20
	← italoacasas left	21:21
	→ acetakwas joined	21:23
	→ dopesong joined	21:23
	← Balliad left	21:24
	→ reim joined	21:25
	← EduardoMartins left	21:26
	← jteneyck left	21:26
	→ jteneyck joined	21:27
	← jteneyck left	21:27
	→ balau joined	21:27
	→ jteneyck joined	21:27
	← jteneyck left	21:27
	→ jteneyck joined	21:27
	← dopesong left	21:28
	← acetakwas left	21:28
	← lindenle left	21:28
	← The_Phoenix left	21:29
empedokles78	I receive the following error while pushing: http://pastie.org/private/fefqdjffdywlm7yg1hqcdg	21:29
_ikke_	It means you have to get the changes from the remote first, before you can push new changes	21:32
qsx	do we have a trigger for that?	21:32
	← codedmart left	21:32
	← HelloAtMega left	21:34
	← robh71 left	21:34
	→ lindenle joined	21:35
_ikke_	dunno	21:35
	→ s00pcan_ joined	21:35
	← sdothum left	21:36
empedokles78	_ikke_: Then I receive: http://pastie.org/private/6nj0lj6wxfotsuzsltjua	21:37
	→ sdothum joined	21:38
	← shuaib left	21:38
	← rideh left	21:38
	→ devoldmx joined	21:39
qsx	that’s a whole lot of problems in a row	21:39
	← dlitz left	21:40
qsx	empedokles78: i’d start with !dropbox, although that technically is not a part of your current problem	21:40
gitinfo	empedokles78: Using Git's native access with Dropbox will eventually corrupt your repository. Read !dropbox_why for details. Either use a free hosting service such as Bitbucket or GitHub, or use https://github.com/anishathalye/git-remote-dropbox.	21:40
	→ rideh joined	21:41
	→ acetakwas joined	21:41
Seveas	empedokles78: and the nano issue is because you once did 'sudo nano'. chown the file back to you and avoid frivolous use of sudo.	21:42
	→ dlitz joined	21:42
Seveas	and yeah, never stick repos in Dropbox.	21:42
	→ Balliad joined	21:43
	← devoldmx left	21:43
	→ stonerfish joined	21:46
	← IWishIKnew left	21:46
	→ IWishIKnew joined	21:47
	← iLembus left	21:47
	← diegoviola left	21:48
empedokles78	gitinfo: I'm using Bitbucket, the dropbox folder is just where everything of me lives.	21:49
qsx	another cent	21:50
	empedokles78: !bot	21:50
gitinfo	empedokles78: [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to (ab)use me.	21:50
qsx	empedokles78: and this does not matter, dropbox WILL set your repos including any kittens on fire.	21:50
empedokles78	Seveas: Which file? Can you rephrase your sentence in a more newbie-friendly manner?	21:51
_ikke_	empedokles78: The file is in the error message	21:51
empedokles78	qsx: Really? I thought the purpose of dropbox is to have a backup in the first place?	21:52
	→ medfly joined	21:52
	→ filisko joined	21:52
_ikke_	It's to synchronize files	21:52
	and that conflicts with git	21:52
medfly	hi, I have all of the files in a repository and it's completely identical except it's not a git repository, is there a way to convince git not to fetch everything anew?	21:53
empedokles78	_ikke_: I don't get what you're saying either.	21:53
qsx	empedokles78: !dropbox_why	21:53
gitinfo	empedokles78: git uses a lot of frequently-changed small files, which dropbox's synchronization algorithms barf on. Use of multiple dropbox clients compounds this, with hilarious results	21:53
medfly	2.5 hours to grab a repository when I already have all of it seems kinda bad :D	21:54
	→ WaReZ joined	21:54
	← lindenle left	21:54
qsx	medfly: well you’re also fetching the whole history of it, so …	21:54
empedokles78	Please provide me with a step of commands to solve my issue. And what is my alternative to dropbox?	21:55
medfly	sigh	21:55
	this has 20 years of history	21:55
qsx	medfly: you could create a shallow repo, though i don’t know whether you can create without using `git clone`	21:56
	medfly: for that, see man git clone --depth	21:56
gitinfo	medfly: the git-clone manpage is available at http://jk.gs/git-clone.html	21:56
	→ mmw joined	21:56
BlessJah	/1/1	21:57
qsx	BlessJah: exactly.	21:57
	← oberststen left	21:57
Sc0rpius	empedokles78, did you merge/rebase/pull from another repository?	21:57
	I don't think your problem is related to dropbox	21:57
medfly	seems like setting depth is an improvement, thanks	21:58
empedokles78	Sc0rpius: No. The only thing I believe is I deleted a file in my online bitbucket repo.	21:58
	← CheckDavid left	21:59
Sc0rpius	it's hard to say without knowing what you do. But the error means that there's at least one commit in the remote that you don't have and you kept working on your local copy without pulling first	21:59
medfly	set --depth=500 and it went from 2.6 mil objects to to 150k :D	21:59
Sc0rpius	that's why people shouldn't work on "master" branches directly unless they own the project...	21:59
	← Goplat left	22:00
	→ Noldorin joined	22:01
	→ nilg joined	22:01
	→ lindenle joined	22:02
	→ robh71 joined	22:02
	← mihaicris left	22:02
	→ ahr3n joined	22:04
	← dlitz left	22:04
empedokles78	Sc0rpius: I'm the only worker.	22:05
	← Noldorin left	22:05
empedokles78	It's a private project.	22:05
	← IWishIKnew left	22:06
	→ dlitz joined	22:07
	→ dopesong joined	22:07
empedokles78	How can I resolve it?	22:08
Sc0rpius	you have to git pull, understand that commit is there that you don't have, merge it with your local copy, and then push	22:08
	→ devoldmx joined	22:09
Sc0rpius	also, that's the only repo right? that's not a fork of another repo and things like that	22:09
	← happy-dude left	22:09
	→ justanotherelf joined	22:09
	← LeRieur left	22:09
	← gaen left	22:10
	→ gaen joined	22:10
	← Balliad left	22:11
empedokles78	Sc0rpius: It is the only repo (it's my first endavour with git and bitbucket). The git pull didn't work, the error is: http://pastie.org/private/6nj0lj6wxfotsuzsltjua	22:11
	→ krsr joined	22:12
Sc0rpius	were you pulling/pushing using another user than nuc?	22:12
	because the permission denied because it can't write that file but it's not a git issue, it's Linux permissions issue.	22:12
	but anyway, it worked	22:12
	← krsr left	22:13
Sc0rpius	well it kinda worked, but it can't load the nano editor because you have some permissions issues in your home directory.	22:13
empedokles78	Sc0rpius: Nope. The only thing I could imagine is that I could have forgot to activate the venv (at least that's the only thing I could think of right now).	22:13
Sc0rpius	ls -l /home/nuc/.nano_history	22:13
	→ ajustrun joined	22:13
Sc0rpius	looks like .nano_history is owned by somebody else.	22:13
	→ waspinator joined	22:14
	← robh71 left	22:14
Sc0rpius	anyway if you press enter after that message you pasted, nano should have loaded explaining the merge	22:15
empedokles78	Sc0rpius: http://pastie.org/private/qk9htsvvvssrporrbfocca	22:15
Sc0rpius	it's owned by root	22:15
empedokles78	I already closed that and didn't inspect it, shall I rerun the pull?	22:15
Sc0rpius	and not by the nuc user	22:15
	fix your filesystem firstr	22:15
	→ MattMaker joined	22:15
Sc0rpius	you have root files under /home/nuc and that shouldn't be.	22:15
empedokles78	Has this something to do with the venv?	22:16
	→ ilmgb joined	22:16
empedokles78	And why is that?	22:16
Sc0rpius	I dunno, I don't use venv	22:17
	you can fix that file wiht something like sudo chown nuc:nuc /home/nuc/.nano_history	22:17
	but who knows if you have other files with the problem	22:17
	but anyway, that shouldn't stop the merge	22:18
	← mmw left	22:18
empedokles78	Sc0rpius: The pull seemed to have worked: http://pastie.org/private/wj86rmutpiap3fbz8w7rnw	22:19
	Now the same command with merge?	22:19
Sc0rpius	no, type git status and see what's your status.	22:20
	← nicoulaj left	22:20
	← ilmgb left	22:21
Sc0rpius	and if everything is fine and you have commits pending for push, then you should push with no problem or whatsoever	22:21
	→ beemo joined	22:21
	← beemo left	22:21
	← ajustrun left	22:22
empedokles78	Sc0rpius: This is what git status yields: http://pastie.org/private/u7460klolgzkk40bxc9q	22:23
	← lindenle left	22:25
thiago	empedokles78: "branch is ahead of 'origin/master'"	22:25
	if you're ahead of, you can push	22:26
	if you've diverged, you'll need to pull or pull --rebase	22:26
Sc0rpius	that means, you can push.	22:26
	→ daito joined	22:26
thiago	if you're behind, you should pull	22:26
Sc0rpius	so everything is fine and now you can finally push (your problem was that you couldn't push)	22:26
	and it also says that you have a modified file that haven't commited its changes	22:27
	← strozyka left	22:27
	← MattMaker left	22:27
	← gaen left	22:28
	→ gaen joined	22:28
empedokles78	thiago and Sc0rpius: Thanks, did work out. What was this?: http://pastie.org/private/ha02mk78at2efhttgr87w	22:28
thiago	read what it says	22:29
	← medfly left	22:29
empedokles78	I don't get the text. :)	22:31
	← daito left	22:31
Sc0rpius	it means you haven't set the default push method, and that you have two options.	22:32
	→ lindenle joined	22:32
empedokles78	That I did understand.	22:32
	→ David1977\|2 joined	22:32
	← dopesong left	22:32
	David1977 → Guest85617	22:32
	David1977\|2 → David1977	22:32
Sc0rpius	just set it to simple to push only the current branch	22:33
	git config --global push.default simple	22:33
	and that's it.	22:33
	← s00pcan_ left	22:33
	→ lidza joined	22:34
	← gopar left	22:35
	← Guest85617 left	22:35
	→ robh71 joined	22:35
	→ DavidDudson joined	22:36
empedokles78	So matching is for multiple repos?	22:36
	← gaen left	22:38
	→ gaen_ joined	22:38
	→ otter768 joined	22:38
	→ s00pcan_ joined	22:39
empedokles78	Sc0rpius: Thanks a lot for resolving my issue.	22:39
	← Burgerz left	22:39
	← Douhan left	22:41
	→ mehola joined	22:43
	← otter768 left	22:43
	→ dopesong joined	22:43
	← dopesong left	22:44
	← mehola left	22:45
	→ danteu joined	22:45
	→ mehola joined	22:45
	← t0by left	22:46
	→ dopesong joined	22:49
	← danteu left	22:49
	← hardenedapple left	22:50
	→ danteu joined	22:50
	← danteu left	22:50
	← dopesong left	22:50
	← fees left	22:55
	→ jottr joined	22:55
	→ raedah joined	22:58
	← DavidDudson left	22:58
	→ Goplat joined	23:00
	← Karkus left	23:01
	→ dsdeiz joined	23:01
	→ tristanp joined	23:01
	→ vdv joined	23:02
	← s00pcan_ left	23:04
	← tristanp left	23:06
	← balau left	23:06
	→ tristanp joined	23:06
	← lindenle left	23:07
	← mehola left	23:08
	→ Sonicbit joined	23:09
	→ yqt joined	23:09
	← dsdeiz left	23:09
	← Sonicbit left	23:11
	← Jackneill_ left	23:13
	→ lindenle joined	23:15
	← toogley left	23:16
	→ mezod joined	23:16
	→ toogley joined	23:16
	← webguynow left	23:16
	→ webguynow joined	23:17
	← jottr left	23:17
	→ ilmgb joined	23:17
	→ s00pcan_ joined	23:17
	→ BrianBlaze420 joined	23:17
	→ jottr joined	23:18
	← s00pcan_ left	23:21
	← ilmgb left	23:22
	→ Karkus joined	23:23
	← nilg left	23:24
	→ mezcan joined	23:25
	← David1977 left	23:26
	← ahr3n left	23:26
	→ David1977 joined	23:26
	→ MattMaker joined	23:28
	← meep left	23:28
	→ linux-modder joined	23:29
	← David1977 left	23:29
	→ meep joined	23:32
	← Karkus left	23:32
	← MattMaker left	23:32
	← lucianangelus left	23:33
	→ keroro520 joined	23:33
	← lindenle left	23:34
	Christmasiumn → Xack	23:34
	← kermit left	23:35
	← skcin7 left	23:36
	→ s00pcan_ joined	23:36
	← robh71 left	23:36
	← tristanp left	23:36
	→ skcin7 joined	23:36
	→ tristanp joined	23:37
	→ Sonicbit joined	23:38
	← keroro520 left	23:38
	← tristanp left	23:38
	→ tristanp joined	23:39
	← tristanp left	23:39
	← jbondhus_ left	23:40
	→ jbondhus joined	23:41
	→ tristanp joined	23:41
	→ Karkus joined	23:42
	→ lindenle joined	23:42
	← justanotherelf left	23:42
	← filisko left	23:43
	← tristanp left	23:45
	← toogley left	23:46
	← lethalspoons left	23:46
	→ DavidDudson joined	23:48
	→ nilg joined	23:49
	← Ahmed90 left	23:49
	→ MattMaker joined	23:58
	← acetakwas left	23:59
	← sq-one left	23:59
	→ acetakwas joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation