IRCloggy #git 2016-07-02

Provider of IRC logs since 2005.

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

	2016-07-02
	→ eletuch__ joined	00:01
	→ ahmedelgabri joined	00:01
	← eletuchy left	00:01
	→ ffabi joined	00:02
	← eletuchy_ left	00:03
	→ geerc joined	00:03
	→ eletuchy joined	00:04
	→ MattMaker joined	00:06
	← bobdobbs left	00:06
	← eletuch__ left	00:06
	← ahmedelgabri left	00:06
	→ eletuchy_ joined	00:06
	→ paul424 joined	00:07
	→ tesuji_ joined	00:08
	→ eletuch__ joined	00:08
	← eletuchy left	00:09
	→ HoierM joined	00:09
	→ watabou joined	00:09
	← geerc left	00:09
	piling_ → piling	00:09
	← tesuji left	00:10
	← digidog left	00:10
	→ hahuang61 joined	00:11
	← eletuchy_ left	00:11
	→ eletuchy joined	00:12
	← shgysk8zer0_ left	00:12
	← eletuch__ left	00:14
	← watabou left	00:14
	→ jaguarmagenta joined	00:15
	→ eletuchy_ joined	00:16
	← elastix left	00:17
	← hahuang61 left	00:17
	→ hahuang61 joined	00:17
	← m0viefreak left	00:18
	→ eletuch__ joined	00:18
	← eletuchy left	00:18
	← jaguarmagenta left	00:20
	← eletuchy_ left	00:20
	← unbalancedparen left	00:21
	→ efdetonator joined	00:22
	← CheckDavid left	00:22
	← hahuang61 left	00:23
	→ eletuchy joined	00:24
	→ fornax joined	00:24
	← sbeller left	00:25
	← eletuch__ left	00:26
	→ Rikairchy joined	00:28
	→ guzzlefry joined	00:28
	← LeMike left	00:28
	→ _xor joined	00:28
	→ Nick2 joined	00:28
	→ fuchstronaut joined	00:29
	Nick2 → Guest61177	00:29
	→ eletuchy_ joined	00:29
	← dreiss left	00:30
	← Guest61177 left	00:30
	← eletuchy left	00:31
	→ Nick3 joined	00:31
	→ eletuchy joined	00:31
	→ pnorman joined	00:31
	→ MattMake_ joined	00:31
	← eletuchy_ left	00:33
	→ eletuch__ joined	00:33
	← fuchstronaut left	00:33
	← vbsales left	00:35
	← MattMaker left	00:35
	→ eletuchy_ joined	00:35
	← eletuchy left	00:35
pnorman	I need to backport some changes to an old version, but am not sure of the best way to do so. The changes are in the form of a set of commits and a merge commit. In the past I've done git cherry-pick -x commitish..commitish or git cherry-pick -x merge_commitish -m 1. Is there a best practice?	00:35
	← Nick3 left	00:35
	← mwhooker left	00:36
	→ Nick3 joined	00:36
	→ fstd_ joined	00:36
	← eletuch__ left	00:38
	← Nick3 left	00:39
	← hahuang65 left	00:40
	← fstd left	00:40
	fstd_ → fstd	00:40
	← paakku left	00:44
	→ clemf joined	00:44
	← denimsoft left	00:48
	← eletuchy_ left	00:52
	← paul424 left	00:54
	→ arescorpio joined	00:57
	← fhackdroid left	00:58
	tm512` → tm512	00:58
	→ romerocesar joined	00:59
	→ stantonk joined	00:59
	← clemf left	00:59
	→ rgrinberg joined	01:00
	→ ToBeCloud joined	01:00
	gitinfo set mode: +v	01:00
	← TomyLobo left	01:01
	← realz left	01:01
	← gigidell left	01:02
	→ eletuchy joined	01:03
	← romerocesar left	01:04
	← ntonjeta left	01:04
	← endiruna left	01:07
	→ rbr joined	01:08
	→ jimi_ joined	01:08
	← ascarter left	01:08
	← eletuchy left	01:08
	← mischat left	01:08
	→ watabou joined	01:09
	→ stantonk_ joined	01:10
	← stantonk left	01:10
	← texasmynsted left	01:10
	→ ensyde joined	01:10
	← stantonk_ left	01:10
	← eck left	01:11
	← zumba_addict left	01:11
	→ harish joined	01:13
	→ shgysk8zer0_ joined	01:15
	→ zumba_addict joined	01:17
	→ eletuchy joined	01:18
	→ wxg joined	01:18
	→ ahmedelgabri joined	01:19
	← Jason_ left	01:21
	→ sandroqz joined	01:21
	→ denimsoft joined	01:22
	← sandroqz left	01:23
	→ hahuang61 joined	01:23
	→ The_Phoenix joined	01:23
	← The_Phoenix left	01:23
	← ahmedelgabri left	01:24
	→ Jason_ joined	01:25
	→ Hobbyboy\|BNC joined	01:25
	← tgunr left	01:25
	→ fhackdroid joined	01:26
	← maestrojed left	01:28
	← Jason_ left	01:30
	→ fcrick joined	01:30
	→ ekinmur joined	01:30
	→ astrofog joined	01:31
	← MattMake_ left	01:31
fcrick	hey there i was looking for examples of tools built on top of git's database that use it for something other than version control of a file system tree - any come to mind?	01:32
	→ Jason_ joined	01:33
	← pks left	01:34
	→ mischat joined	01:34
	← psacrifice left	01:35
	→ pks joined	01:36
	→ psacrifice joined	01:37
	→ tgunr joined	01:38
	← netj left	01:38
	→ netj joined	01:38
	→ darkbit joined	01:43
	→ kbs joined	01:44
	← rbr left	01:44
	← zumba_addict left	01:45
	← psacrifice left	01:46
	→ rbr joined	01:48
	→ psacrifice joined	01:48
	→ zumba_addict joined	01:50
	→ romerocesar joined	01:50
	→ Electrometro joined	01:50
	← Electrometro left	01:50
	→ eletuchy_ joined	01:51
	← shgysk8zer0_ left	01:51
	← nettoweb left	01:51
	← eletuchy left	01:53
	→ eletuchy joined	01:53
	← justanotheruser left	01:54
	→ justanotheruser joined	01:54
	← romerocesar left	01:54
	→ chrisshattuck joined	01:55
	Hobbyboy\|BNC → Hobbyboy	01:56
	← eletuchy_ left	01:56
	→ eletuchy_ joined	01:56
	← jsgrant left	01:57
	← eletuchy left	01:59
	← chrisshattuck left	02:00
	→ eletuchy joined	02:00
	← fracting left	02:00
	→ tarkus joined	02:01
	← eletuchy_ left	02:02
	← LaptopBrain left	02:03
	→ eletuchy_ joined	02:03
	→ milki_ joined	02:04
	← eletuchy left	02:05
	← King_Hual left	02:05
	← milki left	02:05
	→ Douhan joined	02:06
	→ eletuchy joined	02:06
	← molt left	02:07
	← justanotheruser left	02:07
	→ justanotheruser joined	02:07
	← eletuchy_ left	02:08
	→ eletuchy_ joined	02:09
	→ Goplat joined	02:09
	→ romerocesar joined	02:10
	→ molt joined	02:11
	← eletuchy left	02:11
	→ eletuchy joined	02:11
	← chachasmooth left	02:12
	→ fracting joined	02:13
	← githogori left	02:14
	→ mebigfatguy joined	02:14
	← eletuchy_ left	02:14
	← romerocesar left	02:14
	→ chachasmooth joined	02:14
	→ eletuchy_ joined	02:15
	← b1tchcakes left	02:16
mebigfatguy	i have a hash, on which i do git checkout {hash} but get: fatal: reference is not a tree: 092054170ec3daf92ec494a0db295037d3563229 i have done this before with other hashes and they work fine... i see the hash here https://git1-us-west.apache.org/repos/asf?p=cassandra.git;a=commit;h=092054170ec3daf92ec494a0db295037d3563229 am i doing something wrong?	02:16
	→ eletuch__ joined	02:17
	← eletuchy left	02:17
	→ greymalkin joined	02:18
	→ eletuchy joined	02:18
	← eletuchy_ left	02:19
	→ romerocesar joined	02:20
	← sdothum left	02:20
	→ User458764 joined	02:21
rewt	mebigfatguy, are you sure you did checkout? not sure why it's complaining that it's not a tree	02:21
	← eletuch__ left	02:21
mebigfatguy	yes	02:21
	and my local is up to date (git pull)	02:21
	→ Electrometro joined	02:22
mebigfatguy	i can do get checkout {hash} where hash is listed as the parent 017ec3e99e704db5e1a36ad153af08d6e7eca523 on that page	02:22
kbs	not a git expert, but out of curiosity - what does git cat-file -p show for that hash?	02:23
mebigfatguy	sorry parent: ea8c430124dbe6395f00d8f06831bd1374581abe	02:23
	→ eletuchy_ joined	02:23
mebigfatguy	fatal: Not a valid object name 092054170ec3daf92ec494a0db295037d3563229	02:23
	← molt left	02:24
kbs	so it seems that you may not have that object at all, or something is corrupted?	02:24
	(assuming the pull worked, etc..)	02:24
	← Noldorin left	02:24
kbs	git fsck might also have some tips, perhaps	02:24
	← romerocesar left	02:25
	← eletuchy left	02:25
mebigfatguy	when i do get branch --contains 092054170ec3daf92ec494a0db295037d3563229 it says error: no such commit 092054170ec3daf92ec494a0db295037d3563229	02:25
	→ githogori joined	02:26
mebigfatguy	i guess i'll try recloning it	02:27
rewt	i just cloned it, and looks like i can checkout that hash	02:27
mebigfatguy	thanks	02:28
	← hexagoxel left	02:28
	← shinnya left	02:28
	→ eletuchy joined	02:29
	← eletuchy_ left	02:29
	→ fuchstronaut joined	02:29
	→ ome joined	02:31
	→ eletuchy_ joined	02:32
	→ cd-rum joined	02:32
mebigfatguy	ha! on a re-clone it works fine... shrug -- thanks everyone	02:33
	← bouncy left	02:33
	← githogori left	02:33
	→ eletuch__ joined	02:34
	← rbr left	02:34
	→ hexagoxel joined	02:34
	← fuchstronaut left	02:34
	← eletuchy left	02:34
	← HoierM left	02:35
	← eletuchy_ left	02:36
	→ eletuchy joined	02:37
	→ parachan joined	02:37
	← Ahmed90 left	02:38
parachan	Quick I think basic question - is it normal to have a git server that you push to and that is where your production web site lives	02:38
	→ sauvin joined	02:38
	← eletuch__ left	02:39
	→ eletuchy_ joined	02:39
mebigfatguy	it is not normal for the git server and the web site to be on the same server	02:39
pnorman	normal workflow I've seen is that you push to a git server, and your production site pulls from that server. or your build server pulls from that server and prepares a binary package	02:39
parachan	what if the only point of having the git server is to push production code to it easier	02:39
	I'm actually planning on doing this for a personal site but wanted to know if it was typical production style so don't judge too much! :3	02:40
	oo i like that .. just remoting in and pulling	02:40
pnorman	in many cases the git server is run by someone else (e.g. github)	02:41
	→ eletuch__ joined	02:41
parachan	yeah i'm using github now to track changes / work on multiple computers. i think i'm going to do the pull method just mentioned to update it	02:41
	← eletuchy left	02:41
	→ githogori joined	02:42
	← xaa left	02:43
	→ chrisshattuck joined	02:44
	← eletuchy_ left	02:44
parachan	Thanks folks	02:44
rewt	when you push to a remote repo, you still need a checkout on that side, so might as well just pull from there	02:44
	→ eletuchy joined	02:44
	→ PaulCape_ joined	02:44
	→ eletuchy_ joined	02:46
	→ bouncy joined	02:46
	← eletuch__ left	02:46
	← githogori left	02:48
	← PaulCapestany left	02:48
	← eletuchy left	02:49
	→ eletuchy joined	02:50
	← Jason_ left	02:50
	← eletuchy_ left	02:51
	→ eletuchy_ joined	02:52
	← mischat left	02:52
	→ githogori joined	02:53
	→ eletuch__ joined	02:54
	← eletuchy left	02:54
	← Hobbyboy left	02:54
	← xaviergmail left	02:56
	← eletuchy_ left	02:56
	← githogori left	02:57
	→ eletuchy joined	02:57
	← Urbany left	02:57
	→ xaviergmail joined	02:57
	← arand left	02:58
	← WizJin left	02:58
	← eletuch__ left	02:59
	→ Hobbyboy joined	02:59
	→ WizJin joined	02:59
	← DARSCODE left	03:00
	→ arand joined	03:00
	→ Urbany joined	03:00
	→ eletuchy_ joined	03:00
	→ d4rklit3 joined	03:01
	→ githogori joined	03:01
	← eletuchy left	03:02
	← tesuji_ left	03:03
	← psacrifice left	03:03
	← d4rklit3 left	03:03
	→ eletuchy joined	03:04
	← Hobbyboy left	03:04
	← ToBeCloud left	03:04
	→ Literphor joined	03:05
	← fracting left	03:05
	← Literphor left	03:05
	→ MattMaker joined	03:05
	→ tesuji joined	03:05
	← drodger left	03:05
	→ eletuch__ joined	03:05
	← eletuchy_ left	03:06
	← eletuchy left	03:08
	→ eletuchy joined	03:09
	→ d4rklit3 joined	03:10
	→ eletuchy_ joined	03:11
	← eletuch__ left	03:11
	→ Literphor joined	03:12
	→ eletuch__ joined	03:13
	→ mehola joined	03:13
	← eletuchy left	03:13
	← eletuchy_ left	03:15
	← tanuki left	03:15
	→ tanuki joined	03:16
	→ eletuchy joined	03:16
	→ fracting joined	03:17
	← chrisshattuck left	03:18
	← mehola left	03:18
	← eletuch__ left	03:18
	→ eletuchy_ joined	03:19
	← d4rklit3 left	03:19
	→ ahmedelgabri joined	03:20
	← cyphase left	03:21
	→ eletuch__ joined	03:21
	← eletuchy left	03:21
	← eletuchy_ left	03:23
	→ eletuchy joined	03:24
	→ Rodya_ joined	03:25
	← ahmedelgabri left	03:25
	← fracting left	03:26
	← eletuch__ left	03:26
	→ ensyde__ joined	03:26
	→ Motoko joined	03:26
	→ eletuchy_ joined	03:26
	→ treaki_ joined	03:29
	← eletuchy left	03:29
	→ eletuchy joined	03:30
	← ensyde left	03:30
	→ romerocesar joined	03:30
	← efdetonator left	03:31
	← Motoko left	03:31
	→ eletuch__ joined	03:31
	← eletuchy_ left	03:32
	→ Motoko joined	03:32
	← treaki left	03:33
	→ Hitch joined	03:33
	← eletuchy left	03:34
	→ eletuchy joined	03:35
	← romerocesar left	03:35
	← wxg left	03:35
	← Motoko left	03:36
	→ nilg joined	03:36
	→ Motoko joined	03:36
	→ eletuchy_ joined	03:37
	← eletuch__ left	03:37
	← eletuchy left	03:39
	→ eletuchy joined	03:40
	← eletuchy_ left	03:42
	← harish left	03:43
	← ploop left	03:43
	← Codfection left	03:44
	← stonerfish left	03:44
	→ Codfection joined	03:44
	→ eletuchy_ joined	03:45
	← arescorpio left	03:45
	→ hk238 joined	03:46
	→ eletuch__ joined	03:47
	← ekinmur left	03:47
	← eletuchy left	03:47
	← hahuang61 left	03:48
	← eletuchy_ left	03:49
	← Literphor left	03:50
	← astrofog left	03:50
	→ eletuchy joined	03:50
	← eletuch__ left	03:52
	→ eletuchy_ joined	03:53
	→ xall joined	03:55
	← eletuchy left	03:55
	→ jbitdrop_ joined	03:57
	← jbitdrop_ left	03:58
	← cd-rum left	03:59
	→ nnyk_ joined	04:00
	← jbitdrop left	04:00
	← kbs left	04:01
	→ phanimahesh joined	04:01
	→ romerocesar joined	04:01
	→ cd-rum joined	04:02
	← liuzhen left	04:02
	→ Chiko joined	04:04
	← preyalone left	04:04
	← nilg left	04:05
	← romerocesar left	04:05
	← nnyk_ left	04:05
	→ liuzhen joined	04:07
	← eletuchy_ left	04:08
	← User458764 left	04:09
	→ shgysk8zer0_ joined	04:09
	← Rodya_ left	04:09
	← shgysk8zer0_ left	04:10
	→ jaguarmagenta joined	04:17
	→ wxg joined	04:17
	← jimi_ left	04:17
	→ chrisshattuck joined	04:19
	→ nettoweb joined	04:19
	→ mehola joined	04:20
	→ cyan__ joined	04:20
	→ SwiftMatt joined	04:20
	← nettoweb left	04:21
	→ drodger joined	04:21
	← jaguarmagenta left	04:21
	← digitalpeer left	04:22
	→ Literphor joined	04:22
	← Literphor left	04:23
	→ dreiss joined	04:23
	→ nnyk_ joined	04:23
	← nnyk_ left	04:23
	→ nnyk_ joined	04:23
	← chrisshattuck left	04:25
	→ Literphor joined	04:25
	→ eletuchy joined	04:28
	→ fuchstronaut joined	04:30
	→ Rodya_ joined	04:32
	← Douhan left	04:33
	→ hahuang61 joined	04:33
	← fhackdroid left	04:34
	→ fhackdroid joined	04:34
	← fuchstronaut left	04:35
	← denimsoft left	04:36
	← piling left	04:39
	→ piling joined	04:39
	→ nitin joined	04:40
	← hahuang61 left	04:41
	→ romerocesar joined	04:42
	→ eletuchy_ joined	04:42
	← SwiftMatt left	04:43
	→ eletuch__ joined	04:44
	→ shinnya joined	04:44
	← eletuchy left	04:45
	→ SwiftMatt joined	04:45
	→ clemf joined	04:45
	→ guardianJ joined	04:46
	← eletuchy_ left	04:47
	← SwiftMatt left	04:47
	→ a_thakur_ joined	04:47
	→ eletuchy joined	04:47
	→ jungsubk joined	04:48
	→ yaewa joined	04:48
	← rgrinberg left	04:48
	← moei left	04:49
	→ ploop joined	04:49
	← eletuch__ left	04:50
	← Literphor left	04:51
	← nnyk_ left	04:52
	← fahadash left	04:52
	← mebigfatguy left	04:53
	← Cabanossi left	04:54
	→ ochorocho__ joined	04:55
	← ploop left	04:56
	→ Cabanossi joined	04:56
	← guardianJ left	04:56
	→ stantonk joined	04:58
	→ nnyk_ joined	04:58
	→ eletuchy_ joined	04:58
	← ochorocho__ left	04:59
	← jeffreylevesque left	04:59
	→ jeffreylevesque_ joined	04:59
	→ milki joined	05:00
	← eletuchy left	05:01
	← nitin left	05:01
	→ phaleth joined	05:01
_ikke_	parachan: We usually not recommend push to deploy here	05:02
	← leeN left	05:03
	→ eletuchy joined	05:03
	→ Lea2 joined	05:03
	→ JrCs_ joined	05:03
	→ languitar_ joined	05:03
	→ beatdown_ joined	05:03
	→ totemizer joined	05:03
	→ dan joined	05:03
	→ bakingbread joined	05:03
	← bakingbread left	05:03
	→ bakingbread joined	05:03
	→ tcurdt_ joined	05:03
	→ Olipro_ joined	05:03
	→ MTwister joined	05:03
	→ mniip_ joined	05:03
	→ JeremyD joined	05:03
	← JeremyD left	05:03
	→ JeremyD joined	05:03
	→ rogerraymond joined	05:03
	→ jor_ joined	05:03
	→ hfp__work joined	05:03
	→ naitsirhc_ joined	05:03
	Olipro_ → Guest92364	05:03
	→ Olipro- joined	05:04
	← romerocesar left	05:04
	← jungsubk left	05:04
	← githogori left	05:04
	← milki_ left	05:04
	← watabou left	05:04
	← _xor left	05:04
	← fornax left	05:04
	← ffabi left	05:04
	← _rgn left	05:04
	← rishi left	05:04
	← filcab left	05:04
	← Learath2 left	05:04
	← ohcibi left	05:04
	← Blkt left	05:04
	← wgrant left	05:04
	← Aaeriele left	05:04
	← docnvk left	05:04
	← SleePy left	05:04
	← ashnur left	05:04
	← icedp left	05:04
	← worstadmin left	05:04
	← JackMc left	05:04
	← efc left	05:04
	← mniip left	05:04
	← SpeakerToMeat left	05:04
	← snowkidind left	05:04
	← kek64 left	05:04
	← ScottG489 left	05:04
	← SporkWitch left	05:04
	← tomboy65 left	05:04
	← rbern left	05:04
	← languitar left	05:04
	← tribly left	05:04
	← interne7y left	05:04
	← JrCs left	05:04
	← mrkat left	05:04
	← nickthetait left	05:04
	← jrnieder left	05:04
	← ManiacTwister left	05:04
	← saidelike left	05:04
	← DolphinDream left	05:04
	← beatdown left	05:04
	← toydestroyer left	05:04
	← chrysa left	05:04
	← MacGyver left	05:04
	← Guest71530 left	05:04
	← hfp_work left	05:04
	← mepholic1 left	05:04
	← cloudcell__ left	05:04
	← [diecast] left	05:04
	← epic left	05:04
	← Tee_Pee left	05:04
	← ec left	05:04
	← aspellip_ left	05:04
	← Olipro left	05:04
	← jor left	05:04
	← tcurdt left	05:04
	← DANtheBEASTman left	05:04
	← Limes left	05:04
	← roger_raymond left	05:04
	← davidosomething left	05:04
	← ketas left	05:04
	totemizer → ashnur	05:04
	← ashnur left	05:04
	→ ashnur joined	05:04
	hfp__work → hfp_work	05:04
	JeremyD → SleePy	05:04
	← eletuchy_ left	05:04
	dan → DANtheBEASTman	05:05
	→ toydestroyer joined	05:05
	Olipro- → Olipro	05:05
	→ User458764 joined	05:06
	→ docnvk_ joined	05:06
	→ monty joined	05:07
	→ saidelike_ joined	05:07
	→ ploop joined	05:07
	→ rbern joined	05:07
	→ ketas joined	05:08
	→ lordjancso joined	05:09
	→ eletuchy_ joined	05:10
	← ploop left	05:10
	← cd-rum left	05:11
	→ romerocesar joined	05:11
	→ eletuch__ joined	05:12
	← eletuchy left	05:12
	← zumba_addict left	05:13
	← pnorman left	05:13
	← BombStrike left	05:13
	← User458764 left	05:13
	← eletuchy_ left	05:14
	← clemf left	05:16
	← dreiss left	05:17
	→ BombStrike joined	05:18
	← Rodya_ left	05:19
	→ a_thakur joined	05:20
	← a_thakur_ left	05:20
	→ ahmedelgabri joined	05:21
	→ Aaeriele joined	05:23
	→ nickthetait joined	05:23
	→ DolphinDream joined	05:23
	→ interne7y joined	05:23
	→ githogori joined	05:23
	→ Limes joined	05:24
	← xaviergmail left	05:24
	→ xaviergmail joined	05:25
	← liuzhen left	05:25
	→ eletuchy joined	05:26
	← ahmedelgabri left	05:26
	← eletuchy left	05:26
	← lindenle left	05:26
	→ liuzhen joined	05:26
	← a_thakur left	05:27
	← eletuch__ left	05:28
	→ ploop joined	05:29
	→ Sonicbit joined	05:30
	→ eletuchy joined	05:31
	→ hero616_ joined	05:32
	← phaleth left	05:32
	← wxg left	05:33
	← Sleepy63 left	05:34
	→ eletuchy_ joined	05:34
	← madewokherd left	05:34
	← nnyk_ left	05:36
	← eletuchy left	05:36
	→ EvilPenguin joined	05:38
	← tarkus left	05:39
	← mmmveggies left	05:39
	← Smirnov left	05:41
	← darkbit left	05:41
	→ Smirnov joined	05:42
	← Hitch left	05:43
	← EvilPenguin left	05:43
	← CrypticGator left	05:46
	→ harish joined	05:47
	← kutsuya left	05:48
	→ freimatz joined	05:49
	← tgunr left	05:49
	→ Sleepy63 joined	05:50
	→ tgunr joined	05:53
	← freimatz left	05:54
	→ cyphase joined	05:55
	← xall left	05:55
	→ ochorocho__ joined	05:55
	→ freimatz joined	05:57
	→ raijin joined	05:59
	→ nitin joined	05:59
	← ploop left	05:59
	→ eletuchy joined	05:59
	→ kutsuya joined	06:00
	← ochorocho__ left	06:00
	← eletuchy_ left	06:01
	→ zumba_addict joined	06:01
	→ ploop joined	06:02
	← eletuchy left	06:04
	→ eletuchy joined	06:05
	→ subhojit777 joined	06:06
	→ eletuchy_ joined	06:07
	← eletuchy left	06:10
	→ eletuchy joined	06:12
	← romerocesar left	06:14
	← xaviergmail left	06:14
	← ploop left	06:14
	← eletuchy_ left	06:15
	→ eletuchy_ joined	06:17
	→ bayman joined	06:17
	← eletuchy left	06:17
	→ jaguarmagenta joined	06:17
	← eletuchy_ left	06:18
	→ romerocesar joined	06:21
	← jaguarmagenta left	06:22
	→ eletuchy_ joined	06:22
	← eletuchy_ left	06:23
	→ ploop joined	06:23
	→ elgenie__ joined	06:26
	elgenie__ → elgenie	06:26
	→ a_thakur joined	06:26
	→ lindenle joined	06:27
	→ vuoto joined	06:27
	elgenie → elgenie__	06:27
	elgenie__ → elgenie_	06:28
	elgenie_ → elgenie	06:28
	→ TomyLobo joined	06:28
	→ hahuang61 joined	06:28
	← elgenie left	06:28
	→ elgenie joined	06:29
	← ome left	06:29
	← nitin left	06:30
	← cyan__ left	06:30
	← lindenle left	06:31
	← irqq left	06:31
	→ fuchstronaut joined	06:31
	→ Oebele joined	06:32
	← shinnya left	06:32
	→ circ-user-emArs joined	06:32
	→ OnBrokenWings joined	06:34
	← zumba_addict left	06:35
	← fuchstronaut left	06:36
	→ zumba_addict joined	06:36
	→ nnyk_ joined	06:37
	→ cyan__ joined	06:38
	→ Fijit joined	06:39
	← Motoko left	06:41
	← Oebele left	06:41
	← OnBrokenWings left	06:42
	→ fahadash joined	06:42
	→ ahmedelgabri joined	06:44
	← mehola left	06:44
	→ nitin joined	06:44
	← a_thakur left	06:44
	→ mehola joined	06:45
	← subhojit777 left	06:45
	← NeverDie left	06:45
	← mixfix41 left	06:47
	→ bayman- joined	06:47
	→ Rajeshk joined	06:48
	← bayman- left	06:49
	← bayman left	06:50
	← tgunr left	06:50
	→ a_thakur joined	06:51
	→ LeMike joined	06:51
	→ paakku joined	06:51
	→ xaa joined	06:52
	← LeMike left	06:52
	→ LeMike joined	06:52
	→ toogley joined	06:53
	← zarubin left	06:54
	← LeMike left	06:54
	→ LeMike joined	06:54
	→ InfoTest joined	06:54
	← Smirnov left	06:55
	→ ochorocho__ joined	06:56
	→ Sasazuka joined	06:56
	→ dreiss joined	06:57
	→ Smirnov joined	06:57
	← elgenie left	06:58
	← hahuang61 left	06:58
	← freimatz left	06:58
	← Goplat left	07:00
	→ zarubin joined	07:00
	← ochorocho__ left	07:01
	→ darkbit joined	07:02
	← circ-user-emArs left	07:04
	← a_thakur left	07:05
	← stantonk left	07:08
	→ xaviergmail joined	07:12
	← romerocesar left	07:14
	← fscala left	07:14
	← shgysk8zer0 left	07:16
	← gosti left	07:16
	→ fscala joined	07:17
	← dreiss left	07:18
	→ elgenie joined	07:18
	← raijin left	07:19
	→ raijin joined	07:20
	→ elgenie_ joined	07:22
	→ User458764 joined	07:22
	→ romerocesar joined	07:23
	→ nwkj86 joined	07:23
	← elgenie left	07:24
	→ elgenie joined	07:25
	→ ShekharReddy joined	07:25
	← Robdgreat left	07:26
	→ Robdgreat joined	07:26
	← ShekharReddy left	07:26
	← elgenie_ left	07:27
	→ chrisshattuck joined	07:27
	← parachan left	07:28
	← chrisshattuck left	07:28
	→ elgenie_ joined	07:31
	← nitin left	07:32
	← raijin left	07:33
	← elgenie left	07:33
	→ raijin joined	07:33
	→ romerocesar_ joined	07:33
	← vuoto left	07:33
	← Davey left	07:33
	→ Davey joined	07:33
	← Davey left	07:33
	→ Davey joined	07:33
	← romerocesar left	07:34
	→ circ-user-emArs joined	07:34
	→ vuoto joined	07:34
	← User458764 left	07:34
	→ jrnieder joined	07:35
	→ elgenie joined	07:37
	← romerocesar_ left	07:38
	→ PCatinean joined	07:38
	→ elgenie__ joined	07:39
	← elgenie_ left	07:39
	← nnyk_ left	07:40
	← zumba_addict left	07:40
	← xaa left	07:40
	← elgenie left	07:41
	→ zumba_addict joined	07:41
	→ elgenie joined	07:44
	← raijin left	07:44
	→ elgenie_ joined	07:46
	← elgenie__ left	07:46
	← zumba_addict left	07:46
	← multi_io left	07:46
	→ raijin joined	07:46
	→ zumba_addict joined	07:47
	← xaviergmail left	07:47
	→ multi_io joined	07:47
	→ romerocesar joined	07:48
	← elgenie left	07:48
	→ elgenie joined	07:51
	← romerocesar left	07:53
	← elgenie_ left	07:53
	→ elgenie_ joined	07:53
	→ elgenie__ joined	07:55
	← elgenie left	07:56
	← thiago left	07:57
	→ b100s joined	07:57
	→ ochorocho__ joined	07:57
	→ sanketdg joined	07:57
	→ ome joined	07:57
	← circ-user-emArs left	07:58
	← elgenie_ left	07:58
	→ elgenie joined	07:58
	← Fijit left	08:00
	→ elgenie_ joined	08:00
	← Sasazuka left	08:00
	← elgenie__ left	08:00
	← ochorocho__ left	08:02
	→ elgenie__ joined	08:02
	← elgenie left	08:03
	← elgenie__ left	08:03
	← vuoto left	08:03
	← elgenie_ left	08:05
	← yaewa left	08:08
	→ moei joined	08:08
	→ romerocesar joined	08:08
	→ SteffanW joined	08:09
	→ User458764 joined	08:11
	→ vuoto joined	08:11
	← romerocesar left	08:13
	← Sonicbit left	08:13
	← Rajeshk left	08:13
	→ jstein_ joined	08:14
	← jstein_ left	08:15
	→ subhojit777 joined	08:15
	→ Sasazuka joined	08:16
	→ nnyk_ joined	08:16
	→ jaguarmagenta joined	08:18
	→ romerocesar joined	08:18
	→ basiclaser joined	08:20
	← jrnieder left	08:23
	← Smirnov left	08:23
	→ Smirnov joined	08:23
	← romerocesar left	08:23
	→ jrnieder joined	08:23
	← jaguarmagenta left	08:23
	← phanimahesh left	08:25
	→ phanimahesh joined	08:27
	← M-shine left	08:27
	← M-mistake left	08:27
	← M-meznak left	08:27
	← BombStrike left	08:27
	← nivag left	08:29
	→ lindenle joined	08:29
	← Smirnov left	08:29
	← bb010g left	08:29
	← jrnieder left	08:30
	→ jrnieder joined	08:30
	→ BombStrike joined	08:31
	→ Smirnov joined	08:31
	← Smirnov left	08:31
	→ Smirnov joined	08:31
	→ fuchstronaut joined	08:32
	→ quetz joined	08:32
	→ nivag joined	08:33
	← lindenle left	08:34
	→ shinnya joined	08:34
	← fuchstronaut left	08:37
	← mehola left	08:37
	← sanketdg left	08:41
	← LeMike left	08:42
	→ robotroll joined	08:44
	→ LeMike joined	08:44
	→ JaffaKree joined	08:45
	← subhojit777 left	08:50
	← fahadash left	08:52
	← anbz left	08:57
	← Sasazuka left	08:57
	→ King_Hual joined	08:57
	← King_Hual left	08:57
	→ King_Hual joined	08:57
	→ M-shine joined	08:58
	→ anbz joined	08:58
	← anbz left	08:59
	→ anbz joined	09:00
	→ KeyWeeUsr joined	09:00
KeyWeeUsr	hi guys! git fetch -p doesn't remove local branches if they are not present in remote. why?	09:01
	git branch -r doesn't have any of them listed	09:01
	→ freimatz joined	09:01
	→ spudowiar joined	09:02
	→ thinsoldier joined	09:03
	← freimatz left	09:05
	→ molt joined	09:06
Bombe	KeyWeeUsr, because that’s simply not what it does.	09:07
	→ mkoskar joined	09:08
KeyWeeUsr	Bombe: oh and what does the thing?	09:09
	→ freimatz joined	09:09
Bombe	KeyWeeUsr, it removes the remove tracking references, just like it says in the man page.	09:10
KeyWeeUsr	I asked what removes the local branches O.o	09:11
	→ elastix joined	09:11
Bombe	No, you didn’t. Also, nobody removes the local branches except you.	09:11
	If there’s a local branch matching a remote branch, git didn’t create it, you did, so git also won’t delete it.	09:12
KeyWeeUsr	what "does" the thing, not what "does" that command "do" :P	09:12
	← zarubin left	09:12
Bombe	KeyWeeUsr, ah, misunderstood that. You delete local branches with git branch -d.	09:13
KeyWeeUsr	thanks! :)	09:13
	→ Jackneill joined	09:13
	→ troulouliou_dev joined	09:14
	→ M-mistake joined	09:14
	→ M-meznak joined	09:14
	→ OnBrokenWings joined	09:15
	→ Balliad joined	09:18
	→ romerocesar joined	09:18
	← OnBrokenWings left	09:19
	← ahmedelgabri left	09:20
	→ OnBrokenWings joined	09:20
	← User458764 left	09:21
	← romerocesar left	09:23
	→ satifant joined	09:23
	← MattMaker left	09:23
	← elastix left	09:24
	← troulouliou_dev left	09:25
	→ elastix joined	09:26
	← elastix left	09:27
	→ ahmedelgabri joined	09:28
	→ romerocesar joined	09:29
	← Samual left	09:30
	mniip_ → mniip	09:31
	→ fahadash joined	09:32
	← Balliad left	09:32
	← spudowiar left	09:32
	← romerocesar left	09:33
molt	hey everyone. Me and a friend have a repo and I just noticed a typo in the name of the repository. How can i change the name (when I am not the owner of the repo) ?	09:35
	→ WayToDoor joined	09:35
	→ jbitdrop joined	09:36
	→ rsukla joined	09:37
	→ mehola joined	09:38
	→ t0by joined	09:38
Bombe	molt, the concept of a repository name is external to git, i.e. do what you want with it, git doesn’t care.	09:38
molt	in other words: is there a way to request a rename of the repo?	09:38
Bombe	In other words: a repository does not have a name.	09:39
molt	wow - that is extremely helpful.	09:39
	← KeyWeeUsr left	09:40
	← molt left	09:40
Bombe	Yeah, well, I can imagine half a dozen different things you could call the name of the repo, you have to be more specific.	09:40
	← nkravchenko left	09:41
	← mehola left	09:42
	← InfoTest left	09:43
	→ Balliad joined	09:45
	→ filcab joined	09:47
	← guzzlefry left	09:48
	→ subhojit777 joined	09:50
	→ elastix joined	09:50
	← rsukla left	09:51
	← OnBrokenWings left	09:52
	← hero616_ left	09:53
	← elastix left	09:54
	→ anushil051 joined	09:54
	← Balliad left	09:55
	→ elastix joined	09:56
	← elastix left	09:56
	→ elastix joined	09:56
	→ Tryop88 joined	09:58
	← lordjancso left	09:58
	→ circ-user-emArs joined	09:58
	← Jeroen left	10:00
	→ irco joined	10:02
	→ Jeroen joined	10:03
	← oich left	10:03
	→ clivejo joined	10:04
	→ GandalfTheWizard joined	10:04
	→ oich joined	10:06
	← nnyk_ left	10:06
	→ keltvek joined	10:09
	← GandalfTheWizard left	10:09
	← nuck left	10:12
	→ GandalfTheWizard joined	10:13
	→ nuck joined	10:15
	nuck → Guest23954	10:15
	← oich left	10:16
	→ oich joined	10:18
	→ DARSCODE joined	10:19
	→ jaguarmagenta joined	10:19
	→ rubyonrailed joined	10:21
	→ sanketdg joined	10:22
	← DARSCODE left	10:24
	← jaguarmagenta left	10:24
	→ sdothum joined	10:24
	→ DARSCODE joined	10:24
	→ psprint joined	10:29
psprint	Hello. Can git log its output to a file?	10:29
	← DARSCODE left	10:31
	→ User458764 joined	10:31
	→ fornax joined	10:32
	→ fuchstronaut joined	10:32
	→ chrisshattuck joined	10:33
	← chrisshattuck left	10:34
	→ denimsoft joined	10:36
psprint	apparently not	10:37
	← fuchstronaut left	10:37
satifant	you can always let the shell redirect the output?	10:37
psprint	satifant: but the password prompt needs /dev/tty	10:40
satifant	hm, i see	10:40
	what about "\| tee output.log" ?	10:42
	← User458764 left	10:43
	← rossome left	10:44
psprint	doesn't help. I'm running git from vim via system()	10:44
_ikke_	psprint: whatabout defining pager as cat file.log?	10:47
	psprint: or an alternative, use credential helpers for password	10:48
	← PCatinean left	10:48
	← thinsoldier left	10:48
	← ome left	10:49
	→ weox joined	10:49
	→ rossome joined	10:50
	→ User458764 joined	10:58
	→ ochorocho__ joined	10:58
	→ mrina joined	11:01
	→ earational joined	11:01
	← mrina left	11:02
	→ Rajeshk joined	11:02
	← ochorocho__ left	11:03
	← ahmedelgabri left	11:04
	→ davisonio joined	11:07
	← ojdo left	11:08
psprint	actually the passwords are in some magical way remembered without credential helper being set. Where are they stored, how to remove them? OS X	11:09
	→ elsevero joined	11:09
	← elastix left	11:09
_ikke_	psprint: Might be that OS X sets up a credential helper itself	11:10
	→ elsevero_ joined	11:10
_ikke_	git config -l	11:10
	← netj left	11:10
j416	psprint: keychain	11:11
	→ netj joined	11:11
j416	not sure about credential helper, maybe	11:11
	if anywhere, keychain.	11:11
_ikke_	yes, the credential helper would invoke keychain	11:11
	← King_Hual left	11:12
	→ King_Hual joined	11:13
	← King_Hual left	11:13
	→ King_Hual joined	11:13
	← elsevero left	11:13
	elsevero_ → elsevero	11:13
	→ ojdo joined	11:15
	→ mablae joined	11:15
psprint	well grepped "git" in the keychain and rather nothing is found	11:15
_ikke_	And the site it's logging in to?	11:16
	All these kinds of things are defered to other programs	11:16
	The only time when git itself remembers passwords is through the cache / memory credential helpers	11:17
	← Codfection left	11:17
psprint	ahso	11:17
mablae	git subtree splitting ? can anyone help?	11:18
psprint	I'll try removing bitbucket site from Keychain in a moment	11:18
	→ _rgn joined	11:19
	← _rgn left	11:19
	→ Codfection joined	11:20
	← Rajeshk left	11:26
	→ Rajeshk joined	11:28
	→ rolha joined	11:30
	→ lindenle joined	11:31
psprint	_ikke_: indeed removing site from Keychain helped	11:33
	← rbern left	11:34
_ikke_	Note that git uses curl to talk http	11:36
	← lindenle left	11:36
_ikke_	so it might be curl that is coupled to keychain too	11:36
	→ johnmilton joined	11:37
	→ mehola joined	11:39
psprint	I once coded script that used curl to create github account and the password wasn't remembered	11:42
mablae	This shoud work for me: https://ariya.io/2014/07/extracting-parts-of-git-repository-and-keeping-the-history	11:43
	← mehola left	11:44
	→ _rgn joined	11:45
	→ Gamecubic joined	11:48
	← jbitdrop left	11:50
	→ ochorocho__ joined	11:51
	→ mischat joined	11:51
	← mischat left	11:52
	→ mischat joined	11:52
	← ochorocho__ left	11:56
	← synthmea1 left	11:56
	→ synthmeat joined	11:56
	→ ahmedelgabri joined	11:56
	→ tribly joined	11:58
	→ chris2 joined	11:58
	→ ochorocho__ joined	12:00
	→ tomog999_ joined	12:02
	← rolha left	12:03
	← nwf left	12:03
	← tomog999 left	12:05
	→ mariuscc joined	12:05
	→ Rooxo joined	12:06
	→ nwf joined	12:07
	→ stonerfish joined	12:08
mablae	Hey, when using filter-branch with subdirectory-filter how to maintain the path to that subdir? Or prefix it afterwards?	12:13
	← raijin left	12:14
mablae	atm the subdirectory becomes the top level. I dont want that. any pointers?	12:14
	sonOfRa_ → sonOfRa	12:15
mablae	I used git filter-branch --prune-empty --subdirectory-filter src/MyVendorNameSpace/MyBundle subtree-split	12:15
	The src/MyVendorNameSpace/MyBundle should be in the final splitted version ...	12:15
	→ jaguarmagenta joined	12:20
	→ raijin joined	12:20
	→ nitin joined	12:20
	← davisonio left	12:21
osse	mablae: The easiest is probably to run filter branch again to move everything	12:23
mablae	Yeah, I am on it: http://stackoverflow.com/a/9523876/693546	12:23
osse	Alternatively you can avoid subdirectory filter and create a filter that deletes everything except src	12:24
	→ HappyLoaf_ joined	12:24
	← jaguarmagenta left	12:24
	→ Hitch joined	12:24
mablae	osse, How would that work?	12:25
	← mda1_ left	12:30
	→ variable joined	12:30
osse	mablae: --tree-filter 'rm -r everything except src' I suppose	12:31
	→ dangerousdave joined	12:31
osse	subdir followed by a move is probably much easier	12:31
	→ fuchstronaut joined	12:33
	→ mda1_ joined	12:33
	← m1dnight_ left	12:34
	→ ohcibi joined	12:34
	← elsevero left	12:35
	← LeMike left	12:38
	← fuchstronaut left	12:39
	→ rishi joined	12:39
	→ LeMike joined	12:40
	→ davisonio joined	12:41
	← denimsoft left	12:43
	→ denimsoft joined	12:44
	← earational left	12:46
	→ GavinMagnus joined	12:52
psprint	This will show that branch contents is needed to be pushed: git diff origin/master..HEAD --name-status . Is doing git diff origin/{branchname}..{branchname} --name-status a correct fix for this?	12:52
	← vuoto left	12:53
	← anushil051 left	12:54
	← raijin left	12:55
	→ anushil05 joined	12:55
	← subhojit777 left	12:56
	← Hitch left	12:59
	← variable left	13:02
	← weox left	13:03
	→ NwS joined	13:06
	→ rbr joined	13:07
	← denimsoft left	13:08
	→ worstadmin joined	13:10
	→ moop joined	13:10
	→ epic joined	13:10
	→ dreiss joined	13:10
	→ JackMc joined	13:10
	→ [diecast] joined	13:10
	→ SpeakerToMeat joined	13:10
	→ ec joined	13:10
	→ romerocesar joined	13:11
	← ensyde__ left	13:12
	→ nettoweb joined	13:13
	→ ffabi joined	13:13
osse	psprint: fix for what?	13:15
	← romerocesar left	13:16
	→ rahtgaz joined	13:16
	← quetz left	13:16
psprint	osse: doing master..HEAD shows already pushed commits from say 'testbranch', because it doesn't see the commits in branch master	13:16
	so doing testbranch..testbranch, master..master is a logical answer to that	13:16
osse	yes	13:16
	→ Nick2 joined	13:16
osse	and you can use branchname@{u} to mean branchname's upstream (incase it's something other than origin/branchname)	13:17
psprint	asking because on soverflow people recommend that stuff	13:17
	Nick2 → Guest23529	13:17
osse	git diff branch@{u}..branch	13:17
psprint	upstream must be defined, though	13:17
osse	yes	13:17
psprint	so what is upstream? A distinction of repo that is main, while origin refers to own fork on say Github	13:19
	?	13:19
osse	since you're asking that, what did you mean by "upstream must be defined" ?	13:20
	← circ-user-emArs left	13:20
osse	I mean git branch -u (or git push -u)	13:20
	ie. set a remote tracking branch	13:20
	linuxdaemon → PhantomPhreak	13:21
psprint	I saw some posts about --set-upstream or similar option	13:21
	← GavinMagnus left	13:21
	→ romerocesar joined	13:21
	→ circ-user-emArs joined	13:21
osse	Example of git status:	13:22
	On branch master	13:22
	→ m0viefreak joined	13:22
osse	Your branch is up-to-date with 'origin/master'.	13:22
	→ astrofog joined	13:22
osse	here origin/master is configured to be master's upstream branch	13:22
	!upstream	13:22
gitinfo	Do you want to set the remote branch which is being tracked(!set_upstream), list what remote branches are being tracked(!show_upstream), or incorporate changes from another repo which is not your "origin"(!pull_upstream) ?	13:22
osse	but it could just as well have said:	13:23
	On branch chair	13:23
	Your branch is up-to-date with 'otherplace/sofa'	13:23
	that's why chair@{u} is useful instead of assuming it's origin/{same name}	13:24
	→ denimsoft joined	13:24
	→ psacrifice joined	13:25
psprint	luckily, my project will be about having repositories of dotfiles. That is being rarely forked, extended, requested to be pulled back, it is rather "my remote repo", "my repo", "someone's repo"	13:25
	← romerocesar left	13:25
osse	in that case it's fine	13:26
	this was more if you're writing a script meant to be used by other people	13:26
	← User458764 left	13:26
psprint	well the project is for others	13:27
	← basiclaser left	13:27
	← johnmilton left	13:28
	→ Hobbyboy joined	13:29
psprint	user will have his repo "/zkl" on his account "his", that repo will contain a database of dotfiles. He will be able to share bits of the dotfiles, pull other's bits, but rather not: fork a zkl repo, extend the fork, request the changes to be pulled back (this is how upstream is useful as far as I understand)	13:30
	→ digidog joined	13:40
	→ mehola joined	13:40
	→ chrisshattuck joined	13:40
	→ raijin joined	13:40
	← keltvek left	13:41
	← chrisshattuck left	13:41
	→ johnmilton joined	13:41
	→ HoierM joined	13:42
	→ rgrinberg joined	13:43
	→ rolha joined	13:44
	← mehola left	13:45
	← tcurdt_ left	13:45
	→ tcurdt joined	13:45
	→ liquidjamm joined	13:46
	← dreiss left	13:46
	→ piattino joined	13:47
	← cyan__ left	13:47
	→ jbitdrop joined	13:48
	← anushil05 left	13:49
	← yang left	13:52
	→ zumba_ad_ joined	13:52
	→ yang joined	13:52
	← zumba_addict left	13:54
	→ paws_ joined	13:55
	→ anushil051 joined	13:56
	← ahmedelgabri left	13:57
	← nitin left	13:57
	← yang left	13:59
	→ ahmedelgabri joined	13:59
	→ yang joined	13:59
	← D-Boy left	14:00
	← piattino left	14:00
	→ endiruna joined	14:01
	← wiky left	14:02
	← ahmedelgabri left	14:04
	← UTAN_dev left	14:04
	← rolha left	14:06
	← kappy left	14:06
	← JaffaKree left	14:06
	→ kappy joined	14:06
	→ Samual joined	14:07
	← Guest23529 left	14:07
	→ Nick2 joined	14:07
	Nick2 → Guest13183	14:08
	→ anushil_ joined	14:08
	→ Rajesh_ joined	14:10
	← anushil051 left	14:11
	→ GavinMagnus joined	14:11
	→ ahmedelgabri joined	14:12
	→ snowkidind joined	14:13
	→ D-Boy joined	14:13
	← anushil_ left	14:13
	→ anushil051 joined	14:13
	← Rajeshk left	14:13
	→ anushil_ joined	14:14
	→ tomboy64 joined	14:15
	→ cyan__ joined	14:15
	← anushil051 left	14:16
	→ nitin joined	14:20
	→ User458764 joined	14:20
	→ jaguarmagenta joined	14:21
	← a3Dman left	14:21
	→ ntonjeta joined	14:22
	← darkbit left	14:22
	← Jackneill left	14:22
	← zumba_ad_ left	14:23
	← phanimahesh left	14:24
	← jaguarmagenta left	14:25
	→ phanimahesh joined	14:25
	← ahmedelgabri left	14:26
	→ zumba_addict joined	14:27
	→ ag4ve joined	14:28
	→ zarel joined	14:31
	← cyan__ left	14:31
	← davisonio left	14:33
	→ lindenle joined	14:33
	→ wrouesnel joined	14:34
	← Rajesh_ left	14:34
	→ fuchstronaut joined	14:34
	→ darkbit joined	14:35
	← LeMike left	14:35
	→ mostlybadfly joined	14:36
	← lindenle left	14:38
	← anushil_ left	14:39
	← fuchstronaut left	14:39
	→ davisonio joined	14:40
	← Rooxo left	14:40
	← denimsoft left	14:40
	← Guest13183 left	14:41
	→ denimsoft joined	14:42
	← mischat left	14:42
	← FunkyAss left	14:44
	→ elsevero joined	14:45
	→ rolha joined	14:45
	← ochorocho__ left	14:46
	→ ochorocho__ joined	14:46
	← nitin left	14:47
	→ edude03 joined	14:47
	← inflames left	14:48
	← nettoweb left	14:48
	← GavinMagnus left	14:50
	→ bp9110 joined	14:50
	← liuzhen left	14:50
bp9110	Hey guys - very new to git and I'm running into an issue. I"m doing a 'git pull' and getting this message: Your local changes to the following files would be overwritten by merge: oauth.ini. Please, commit your changes or stash them before you can merge.	14:51
	Aborting	14:51
	→ liuzhen joined	14:51
bp9110	oauth.ini contains sensitive info that I don't want to commit	14:51
	→ ahmedelgabri joined	14:51
bp9110	Basically the version on GitHub is a template but I want to keep the sensitive version oocally	14:52
	*locally. How would I do that?	14:52
_ikke_	Rename the template	14:52
	→ chrysa joined	14:52
_ikke_	So that they don't clash	14:52
	← diogenese left	14:53
bp9110	_ikke_: Hmm interesting. Okay, so say I do that, would I just add oauth.ini to my .gitignore file so that it never gets committed?	14:53
	→ nettoweb joined	14:54
	→ FunkyAss joined	14:54
	→ ekinmur joined	14:55
	→ mischat joined	14:56
	→ tgunr joined	14:56
	← nettoweb left	14:57
	→ d4rklit3 joined	14:57
_ikke_	correct	14:58
	← raijin left	14:59
	← toogley left	14:59
bp9110	_ikke_: Okay so I did that, now I still have to resolve my conflict that keeps me from doing a pull. Currently oauth.ini exists on github in template form but since that file will now be ignored, how do I remove it from my remote repo?	15:00
	→ toogley joined	15:00
	← ahmedelgabri left	15:02
	← darkbit left	15:02
	→ anushil05 joined	15:02
	→ xaa joined	15:02
	→ Ordentlig joined	15:03
Ordentlig	hi, how can I remove all commits?	15:03
	I only made 2	15:03
	← ekinmur left	15:04
Ordentlig	I commited, tagged, realized that I did something wrong I then fixed the problem and did git amend, git push --force	15:04
	now I have two commits	15:04
	in my logs	15:04
	→ CtrlC joined	15:04
	← anushil05 left	15:05
	→ ekinmur joined	15:05
CtrlC	To remove some parts of the project, deleting the file and doing a commit would be enough. right?	15:05
	→ anushil051 joined	15:05
	→ Jackneill joined	15:06
CtrlC	by delete I mean "git rm".	15:06
	← BombStrike left	15:06
	→ madewokherd joined	15:08
Ordentlig	nvm, I just removed .git reinitialized the project removed tags from remote and overwrote remote	15:08
koro	you can do git commit -a -m "blah"	15:09
	that's a little bit drastic	15:09
	→ ShekharReddy joined	15:09
	← zumba_addict left	15:09
	← bp9110 left	15:11
	→ BombStrike joined	15:11
	← Jackneill left	15:13
	← ShekharReddy left	15:14
	→ anushil05 joined	15:15
	← edude03 left	15:15
	← anushil051 left	15:16
	→ OnBrokenWings joined	15:16
	→ edude03 joined	15:16
	← elsevero left	15:16
	→ thiago joined	15:16
	→ Jackneill joined	15:17
	← d4rklit3 left	15:18
	→ Rodya_ joined	15:18
	→ irqq joined	15:19
	→ zumba_ad_ joined	15:19
	← ochorocho__ left	15:21
	← edude03 left	15:21
	→ edude03 joined	15:21
	← Rodya_ left	15:23
	→ ochorocho__ joined	15:23
	→ marcelofr joined	15:24
	→ macslab7 joined	15:26
	← circ-user-emArs left	15:27
	→ livingstn joined	15:29
	← anushil05 left	15:30
	→ anushil05 joined	15:31
	← Jackneill left	15:31
	← OnBrokenWings left	15:33
	← ochorocho__ left	15:33
	→ elsevero joined	15:34
	→ ochorocho__ joined	15:34
	← zumba_ad_ left	15:34
	← t0by left	15:35
	← fscala left	15:36
	→ t0by joined	15:36
	→ Jackneill joined	15:37
	→ stuh84 joined	15:37
	→ circ-user-emArs joined	15:38
	→ Vauff joined	15:38
	→ fscala joined	15:38
	→ mehola joined	15:40
	← Jackneill left	15:42
	← phanimahesh left	15:42
	← stuh84 left	15:42
	← livingstn left	15:42
	← xaa left	15:43
	← tjone270__ left	15:45
	← mehola left	15:45
	← CtrlC left	15:45
EckyEcky	Is it possible to set the code to an old commit and later reverse it again to the current status?	15:46
	← edude03 left	15:47
canton7	EckyEcky, sure. you can 'git checkout old_commit', then later, 'git checkout master'. be aware that checking out an old commit directly gives you a !detached HEAD: any work you do and commits you make may be lost, until you checkout a proper branch again	15:47
gitinfo	EckyEcky: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	15:47
	→ NeverDie joined	15:48
	→ Jackneill joined	15:48
EckyEcky	tx	15:48
	← t0by left	15:49
	→ efdetonator joined	15:51
	→ nitin joined	15:51
EckyEcky	so It's useful for just having a look at the code?	15:52
canton7	yeah, exactly	15:54
	→ Noldorin joined	15:54
	← ochorocho__ left	15:54
	→ tjone270 joined	15:55
BlessJah	EckyEcky: actually compiling or running tests, diff and log alone are enought to take a look	15:55
	→ jaguarmagenta joined	15:55
canton7	... if you want to make some commits, then create and checkout a branch first	15:56
EckyEcky	Not if you want to look at the file structure changes	15:56
BlessJah	git log --name-status	15:56
	diff has such option as well	15:57
canton7	that tells you which files have changed in each commit. that's different to see how a file looked at some point in the past	15:57
	→ ochorocho__ joined	15:57
canton7	*to seeing	15:57
	→ Bizkit joined	15:58
	→ chrisshattuck joined	15:58
	← chrisshattuck left	15:58
	→ ahmedelgabri joined	15:58
EckyEcky	I need to see the whole directory structure at a certain commit, and what is in the files	16:00
	← ochorocho__ left	16:00
BlessJah	canton7: my point is that for looking with eyeballs it's actually better to see log and diff - changes are hilighted and listed so you dont need to hunt for them	16:00
	→ ochorocho__ joined	16:00
BlessJah	canton7: checkout gives you just snapshot, nearly useless for eyeballs but it's what machine needs to run tests or compile/deploy prior version for comparision	16:01
canton7	BlessJah, it depends what you need to do. Sometimes you want to see a diff; sometimes you just want to see what a historic file looked like	16:02
	I've needed both in the past	16:02
BlessJah	others uses are still valid, but checkouts sometimes turns into weird changes-hunting fest	16:03
j416	only when you're using it wrongly? :P	16:04
	← Smirnov left	16:04
BlessJah	j416: exactly what I'm saying: sometimes it's better to stick with other tools	16:05
j416	nod	16:05
	→ Smirnov joined	16:06
	← Chiko left	16:06
	→ Chiko joined	16:07
	← Tryop88 left	16:11
	← ahmedelgabri left	16:11
	← snowkidind left	16:11
	→ diogenese joined	16:11
	→ narendraj9 joined	16:12
	← rolha left	16:13
	← ekinmur left	16:14
	→ diegoviola joined	16:14
	← marcelofr left	16:14
	→ subhojit777 joined	16:15
	→ marcelofr joined	16:15
	→ Bizkit_ joined	16:15
	→ piattino joined	16:16
	→ rolha joined	16:16
	← waruqi left	16:17
	← ochorocho__ left	16:17
	→ Darcidride joined	16:18
	→ ochorocho__ joined	16:18
	→ warthog9 joined	16:18
	→ zeroed joined	16:19
	→ ferr joined	16:19
	→ ShekharReddy joined	16:19
Bizkit_	hey i am currently trying to learn the arts of git in the command line, my setup is this: i have my university server as a remote, i have set up my usb stick as a remote and of course i have my local repo. Now i am testing a scenario where i delete something locally and commit that and then want to get to the state of my project on either the university server or my usb stick that haven't gotten that commit pushed	16:19
	to yet, how do i do that?	16:19
	← ShekharReddy left	16:20
	→ sangy joined	16:21
_rgn	git reset --hard usb-stick-remote/commit-or-branch-etc	16:21
	← zeroed left	16:22
	→ romerocesar joined	16:22
	→ jstein_ joined	16:23
	← King_Hual left	16:23
j416	Bizkit_: when I was starting out, I found it much easier to learn without involving remotes. Add them later.	16:23
	Bizkit_: everything is local, except when you fetch or push to a remote	16:24
	← elsevero left	16:24
	jstein_ → jstein	16:25
	← Jackneill left	16:25
	← ochorocho__ left	16:25
Bizkit_	_rgn do i need to pull after that?	16:25
	→ ochorocho__ joined	16:25
_rgn	to do what?	16:26
	← piattino left	16:26
Bizkit_	_rgn to get the missing files	16:26
	→ piattino joined	16:27
_rgn	no	16:27
	← romerocesar left	16:27
Bizkit_	doesn't seem like it got them for me though	16:27
	← ochorocho__ left	16:29
	→ ochorocho__ joined	16:29
j416	Bizkit_: you need to fetch the changes from the remote that has them, to be able to check them out.	16:30
	→ Phaf joined	16:31
Bizkit_	j416 so git fetch on the remote that has the files and then git merge?	16:32
	→ spudowiar joined	16:32
j416	Bizkit_: fetch from the remote.	16:32
	Bizkit_: not at the remote.	16:32
	→ romerocesar joined	16:33
	← piattino left	16:33
	← diegoviola left	16:33
	→ dreiss joined	16:33
	→ elsevero joined	16:34
Bizkit_	j416 what's the difference between from and at?	16:34
	← endiruna left	16:34
j416	Bizkit_: from indicates direction, at indicates location.	16:34
	→ fuchstronaut joined	16:35
	→ diegoviola joined	16:35
j416	Bizkit_: you committed something on your.. laptop, and you want to have the change where?	16:36
	→ surfnturf_ joined	16:36
	→ piattino joined	16:36
j416	Bizkit_: did you read the part on remotes in e.g. pro git? !book	16:37
gitinfo	Bizkit_: 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	16:37
spudowiar	Anyone know how to pull a ViewGit repository?	16:37
	← efdetonator left	16:37
	← romerocesar left	16:37
Bizkit_	scenario is this: i delete something on my laptop and commit that change, then notice that this was a mistake and want to roll back to the state of the project on my remote repository	16:38
j416	Bizkit_: do you have the remote added as a remote?	16:38
Bizkit_	j416 yes in fact i have 2 remotes	16:38
j416	Bizkit_: (you did git remote add foo url/to/foo	16:38
	Bizkit_: ok.	16:38
	Bizkit_: then as _rgn says	16:38
	← ochorocho__ left	16:38
j416	Bizkit_: however	16:39
	Bizkit_: you didn't commit the change?	16:39
	← diegoviola left	16:39
Bizkit_	i did commit but not push	16:39
	→ ochorocho__ joined	16:39
j416	Bizkit_: I don't understand if you want new changes from the remote, or if you want to get back to where you were before the commit	16:39
	← fuchstronaut left	16:39
_rgn	in reality you'd probably just do reset --hard HEAD~ to discard the latest commit (and other uncommitted changes)	16:40
	← liquidjamm left	16:40
	→ Nicolas joined	16:40
j416	_rgn: depends entirely on his answer	16:40
Bizkit_	basically i want to get back to before the delete	16:40
	→ f3r70rr35f joined	16:40
j416	Bizkit_: then you don't need your remotes at all	16:40
	Bizkit_: git reset --hard HEAD^	16:41
	← nitin left	16:41
	→ liquidjamm joined	16:41
j416	Bizkit_: the syntax _rgn uses above is also ok	16:41
Bizkit_	j416 ok command line says i am one commit in the past now do i need to apply that or something along those lines?	16:42
j416	not sure what you mean	16:42
	what exactly does it say?	16:43
Bizkit_	"Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded."	16:43
_rgn	you have pushed the change then	16:43
j416	Bizkit_: it means either you pushed that commit, or you didn't do a commit at all. And that you are now one commit behond.	16:43
	behind* even	16:44
Bizkit_	ah nevermind i pushed it to one of the remotes	16:44
	← mischat left	16:46
Bizkit_	j416 now how would i get the one remote that is a commit ahead to be in line with my local version that is a commit behind?	16:46
j416	Bizkit_: push	16:47
	→ endiruna joined	16:47
j416	Bizkit_: in this case, you are altering history on the remote, so you need to pass --force	16:47
Bizkit_	j416 if i do that i get "remote: GitLab: You are not allowed to force push code to a protected branch on this project."	16:48
j416	Bizkit_: that's a gitlab setting then.	16:49
	Bizkit_: go to project settings -> protected branches.	16:49
	Bizkit_: it has nothing to do with git itself.	16:49
	→ jokajak joined	16:49
Bizkit_	j416 _rgn sweet everything works now, thanks for all the help, i guess i'll i have to read the whole ebook when i find the time to get a better understanding of what i am actually doing	16:52
j416	Bizkit_: o/	16:53
	→ zumba_addict joined	16:53
	→ anushil_ joined	16:55
	← User458764 left	16:56
	→ diegoviola joined	16:56
	← sveinse left	16:56
	→ cyan__ joined	16:57
	→ mablae_ joined	16:57
	← mablae left	16:59
	← anushil05 left	17:00
	← endiruna left	17:02
	← anushil_ left	17:05
	→ basiclaser joined	17:05
	→ anushil05 joined	17:05
	← anushil05 left	17:05
	← Ordentlig left	17:06
	→ anushil051 joined	17:06
	← astrofog left	17:06
	← Chiko left	17:07
	← APic left	17:09
	→ APic joined	17:10
	← ochorocho__ left	17:10
	→ viper474 joined	17:11
	→ ochorocho__ joined	17:11
	← piattino left	17:11
	→ moldy joined	17:11
moldy	hi	17:11
	git push -u origin HEAD:some-branch <-- this doesn't work if some-branch doesn't exist yet, right?	17:11
thiago	I think you're right	17:12
	→ PresidentIvanka joined	17:12
	→ piattino joined	17:12
thiago	it will refuse to push to "unqualified some-branch that doesn't exist"	17:12
	you have to write "HEAD:refs/heads/some-branch"	17:12
moldy	thiago: ahh. thanks.	17:13
PresidentIvanka	how do I get rid of every commit before a certain commit?	17:13
thiago	PresidentIvanka: nice nickname	17:13
j416	PresidentIvanka: filter-branch or rebase	17:13
thiago	PresidentIvanka: are you sure you want to do that?	17:13
	PresidentIvanka: !rewrite	17:13
gitinfo	PresidentIvanka: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	17:13
_ikke_	git replace + git filter-branch	17:13
PresidentIvanka	rewriting for to a new repo	17:13
thiago	PresidentIvanka: ok, the easiest way is this: write the SHA-1 of the commit that should have no parents in .git/info/grafts	17:13
j416	+1 to _ikke_'s suggestion; this is quite nice	17:13
thiago	use git log to confirm the history looks like what you want	17:14
	then git filter-branch --all	17:14
i7c	There's also checkout --orphan if you just wanna start over.	17:14
j416	thiago: I tried out replace recently, it works just like grafts but it actually has documentation	17:14
	not bad at all.	17:14
thiago	interesting	17:14
PresidentIvanka	_ikke_ is a git god	17:14
thiago	I'm not able to recommend it, having never used it	17:14
	← liquidjamm left	17:15
j416	thiago: yeah, I was in the same boat before. It's even easier than grafts, in fact.	17:15
_ikke_	It's basically grafts done in a git way	17:15
j416	thiago: just one command line, then there's a graft	17:15
	→ liquidjamm joined	17:15
PresidentIvanka	so what flags am I passing to git replace?	17:16
j416	PresidentIvanka: --graft	17:17
	PresidentIvanka: see man git-replace read section on --graft	17:17
gitinfo	PresidentIvanka: the git-replace manpage is available at http://jk.gs/git-replace.html	17:17
_ikke_	git replace --graft <last_commit_to_keep>	17:17
	← ntonjeta left	17:17
PresidentIvanka	yeah I had the man open	17:17
	thx	17:17
_ikke_	You need to make sure the older commits are not referenced through another path	17:18
PresidentIvanka	basically what I want to do is turn one branch into its own project without the history of master branch	17:20
	what flag am I passing to git filter-branch?	17:21
thiago	--all	17:22
	or that branch name, at leat	17:22
	← WayToDoor left	17:22
_ikke_	git filter-branch -- --all	17:22
	← wrouesnel left	17:23
	→ IanV0rn2341 joined	17:24
	← IanV0rn2341 left	17:24
	← piattino left	17:25
PresidentIvanka	ok perfect	17:25
	I want to now get rid of master	17:25
	and then rename the current branch as master	17:25
	← ochorocho__ left	17:25
	→ ochorocho__ joined	17:26
	PresidentIvanka → allah	17:26
	← ag4ve left	17:26
	allah → PresidentIvanka	17:26
	← denimsoft left	17:27
	← flopsec left	17:28
	← arand left	17:28
	← WizJin left	17:28
	← satbyy left	17:28
	← Urbany left	17:28
	← davisonio left	17:28
	← cdesai left	17:30
	← sangy left	17:31
	→ Literphor joined	17:31
	← elsevero left	17:31
	← cyan__ left	17:31
	→ elsevero joined	17:31
PresidentIvanka	meh used brute force...	17:32
	→ Goplat joined	17:33
	→ cdesai joined	17:33
PresidentIvanka	no I didn't.... whoops I push the branch I was trying to get rid of	17:34
	→ nitin joined	17:34
	← surfnturf_ left	17:34
	← ochorocho__ left	17:35
spudowiar	hahaha	17:35
	→ ochorocho__ joined	17:35
	← Nicolas left	17:36
PresidentIvanka	ok localbranch:remotebranch	17:36
	→ lindenle joined	17:36
PresidentIvanka	pray this works	17:36
	← Literphor left	17:36
spudowiar	it will	17:36
	→ davisonio joined	17:39
	← ochorocho__ left	17:39
PresidentIvanka	it did	17:39
	magic... git is evil	17:39
	→ denimsoft joined	17:40
	← lindenle left	17:40
	→ flopsec joined	17:41
	→ mehola joined	17:41
	→ ochorocho__ joined	17:41
	→ darkbit joined	17:45
	→ Ordentlig joined	17:46
	← mehola left	17:46
	→ mischat joined	17:46
	← Phaf left	17:46
	← circ-user-emArs left	17:49
	← Goplat left	17:50
	← blahdodo left	17:50
	← viper474 left	17:51
	← ochorocho__ left	17:51
	→ ochorocho__ joined	17:51
	← denimsoft left	17:52
	→ sangy joined	17:52
	← mischat left	17:52
	→ xaviergmail joined	17:52
	→ Hitch joined	17:53
	→ blahdodo joined	17:54
	← ochorocho__ left	17:54
	← blahdodo left	17:55
	→ satbyy joined	17:55
	→ ochorocho__ joined	17:57
	← zumba_addict left	17:57
	→ blahdodo joined	17:58
	← dreiss left	17:58
	→ Urbany joined	17:59
	← tgunr left	18:01
	→ Nicolas joined	18:04
	← Nicolas left	18:04
moritz	is there any solution to the zeroPaddedFilemode error with receive.fsckObjects other than rewriting history?	18:05
	← ochorocho__ left	18:05
	← liquidjamm left	18:06
	→ ochorocho__ joined	18:06
	→ axiom_1 joined	18:06
	→ tmz joined	18:06
	→ ahmedelgabri joined	18:07
	← ybden left	18:08
	← rgrinberg left	18:10
	← GandalfTheWizard left	18:10
	← elsevero left	18:10
	→ ybden joined	18:11
	← PresidentIvanka left	18:12
	← ochorocho__ left	18:13
	← nitin left	18:13
	→ dreiss joined	18:13
	← Hitch left	18:13
	→ GavinMagnus joined	18:13
	← tmz left	18:15
	← stonerfish left	18:16
	→ m1dnight_ joined	18:16
	→ cdown joined	18:17
	→ stonerfish joined	18:17
	← davisonio left	18:18
	spudowiar → jcase	18:20
	← jcase left	18:20
	→ jost__ joined	18:21
	→ jcase joined	18:22
	jcase → spudowiar	18:22
	→ Raging_Hog joined	18:24
	← jost_ left	18:24
	← rolha left	18:25
	← robotroll left	18:26
	← chris2 left	18:28
	→ hahuang65 joined	18:29
	← diegoviola left	18:30
	→ chris2 joined	18:31
	← cdown left	18:32
	→ mdw joined	18:34
	→ fuchstronaut joined	18:36
	→ a3Dman joined	18:36
	← chris2 left	18:37
	→ chris2 joined	18:37
	→ Bieo joined	18:37
	← Bieo left	18:37
	→ davisonio joined	18:38
	→ nephyrin joined	18:38
	→ arand joined	18:39
	→ User458764 joined	18:39
	← jeffreylevesque_ left	18:40
	← fuchstronaut left	18:40
	← hk238 left	18:41
	→ romerocesar joined	18:44
	→ WizJin joined	18:44
	→ Sonicbit joined	18:45
	← marcelofr left	18:47
	→ yqt joined	18:48
	→ mischat joined	18:48
	← romerocesar left	18:49
	← mangolisk_ left	18:52
	→ tmz joined	18:52
	→ circ-user-jjOUE joined	18:52
	← mischat left	18:54
	← narendraj9 left	18:55
vivekp	hi, i have a problem. Whenever i clone a remote repo from Github, all i see is only one branch is present and other branch just don't exist.	18:56
Bombe	Have you tried listing the remote branches?	18:56
vivekp	how could i see other branches that I have in the remote repo?	18:57
Bombe	git branch has an option for that.	18:57
	← ahmedelgabri left	18:57
vivekp	Bombe: not sure, what you are asking. Pardon me, i'm not very good at using git.	18:58
	"git branch" shows just master branch	18:58
_ikke_	git branch -r	18:58
Bombe	vivekp, yes, that’s why I told you that it has an option for listing remote branches.	18:58
	→ quetz joined	18:59
vivekp	ok let me see	18:59
	what _ikke_ said... is that it?	18:59
Bombe	If only there was a way to find out…	19:00
	→ rolha joined	19:00
	← Bizkit left	19:01
	→ doener joined	19:03
	→ vuoto joined	19:04
	→ mangolisk joined	19:04
	← sauvin left	19:04
vivekp	well, git branch -r did list all branches nicely	19:05
	→ cyan__ joined	19:05
vivekp	tried checking out to one those branches and it goes in detached head state	19:05
	→ mischat joined	19:06
_ikke_	check them out without the origin/ part	19:06
vivekp	ok brb	19:06
	→ zumba_addict joined	19:07
	← jaguarmagenta left	19:07
vivekp	works! thanks	19:07
	← cyphase left	19:07
	→ schwepps joined	19:07
	→ Literphor joined	19:09
	→ PCatinean joined	19:11
	→ cyphase joined	19:12
vivekp	_ikke_: i can't guess what was missing in my previous attempts; probably i should remember to use git branch -r before checkout ?	19:13
	because all the previous times when i used git checkout other_branch, it took all the master branch commits with it onto other branches	19:14
_ikke_	No, git branch -r has no influence on git checkout	19:14
vivekp	ahh okay but i did nothing different other than git branch -r. Anyway, i'm happy it worked FINALLY.	19:19
	← davisonio left	19:19
	→ davisoni_ joined	19:20
	← jchonig left	19:21
	→ cdg joined	19:22
	→ Tee_Pee joined	19:25
	→ nnyk_ joined	19:25
	← _rgn left	19:27
	← basiclaser left	19:27
	→ _rgn joined	19:27
	← cdg left	19:28
	→ jchonig joined	19:30
	← _rgn left	19:30
	→ _rgn joined	19:30
	→ liquidjamm joined	19:30
	→ ESphynx joined	19:31
	→ settermjd joined	19:31
ESphynx	hey guys... is there a way for git to smarten up with code?	19:31
	← settermjd left	19:31
bremner	wat?	19:32
ESphynx	make it syntax aware? if a function has a different body...	19:32
	← njbair left	19:32
bremner	in what context?	19:32
ESphynx	bremner: well I'm stuggling here trying to rebase stuff	19:33
bremner	you can, in principle, define custom merge drivers	19:33
ESphynx	and git just has no idea when it comes to basic code constructs....	19:33
	→ diegoviola joined	19:33
_ikke_	Git does not do semantic merging	19:33
	It does not know anything about code	19:34
ESphynx	bremner: that's the answer I get that everytime, but it's always in principle maning probably no one does it and it's not practica	19:34
_ikke_	You'd need a separate merge driver	19:34
ESphynx	Does anyon do this?	19:34
	← Bizkit_ left	19:34
_ikke_	https://www.semanticmerge.com/	19:34
ESphynx	that offers a driver for git or it's a whole different thing?	19:35
_ikke_	Not sure if it cooperates with git	19:35
ESphynx	I mean semantic merge makes so much more sense, it's a shame it's not more popular / built-in	19:35
_ikke_	You have to define something for every language	19:35
ESphynx	of course	19:35
_ikke_	and maintain it	19:35
	And expectations of such a merge would be much higher	19:36
	chances for bugs increase	19:36
ESphynx	but this is the 21st century :P	19:36
	merge should be semantics aware :P	19:36
_ikke_	It's very easy to say it should	19:37
	but it's quite hard to implement correctly	19:37
ESphynx	what's a starting point	19:38
moritz	ESphynx: I'm sure somebody will teach git merge semantic merge within the 21st century	19:38
	ESphynx: ... unless it will be replaced by something more awesome, of course :-)	19:38
ESphynx	moritz: well I'm trying to build the momentum here	19:38
	I find this a major time drainer	19:38
	so where would you plug this driver exactly?	19:38
bremner	into git merge	19:39
	← mdw left	19:39
ESphynx	it would be used when you execute cherry-picks, rebases, diffs, and so on?	19:39
_ikke_	man gitattributes	19:39
gitinfo	the gitattributes manpage is available at http://jk.gs/gitattributes.html	19:39
moritz	ESphynx: there are custom merge driver for debian/changelog files out there, for example	19:39
	← NeverDie left	19:40
	← sonOfRa left	19:40
moritz	which is a simple file format, and has pretty easy rules for merging	19:40
ESphynx	moritz: what I'm looking for is a very basic driver for C derived languages, that understand basic things like comments and function blocks { }	19:40
	that would take git a long way	19:40
	→ sonOfRa joined	19:40
ESphynx	instad of merging unrelated structs and because it matches a context line containing only '{'	19:41
moritz	yes, might be worth a shot	19:41
ESphynx	basically if you don't match the meaningful beginning of the block, don't go matching it's opening or closing bracket	19:41
moritz	a semi-semantic merge that doesn't understand all of the language, but does know wich parts are significant and which aren't	19:41
	→ tgunr joined	19:41
ESphynx	exactly.	19:42
	← spudowiar left	19:42
	→ spudowiar joined	19:42
	→ mehola joined	19:42
ESphynx	Is there any tutorial / info on how to write a git merge driver?	19:44
	← _rgn left	19:44
ESphynx	that would plug in as a separate executable?	19:45
moritz	ESphynx: I don't know of a tutorial, but I'd recommend you look at the debian/changelog merge as an example	19:47
	← mehola left	19:47
moritz	because it's probably not too complicated	19:47
ESphynx	moritz: that would do... any link?	19:48
moritz	ESphynx: no; i'd have to google them too	19:48
ESphynx	hehe ok thanks :)	19:49
	I guess though it's just an executable... so best thing is probably to try and see what git is sending it :P	19:49
moritz	aye	19:50
	→ Rodya_ joined	19:50
	← fscala left	19:50
	→ fscala joined	19:51
	→ _rgn joined	19:51
	← _rgn left	19:52
	→ ag4ve joined	19:52
	← tmz left	19:52
	← oich left	19:53
	← sanketdg left	19:53
ag4ve	how do I copy the changes made in one directory to a branch?	19:53
	← Rodya_ left	19:53
ag4ve	git subtree split --prefix dir -b branch # almost DWIW	19:54
	but it moves the dir to ./	19:56
	→ oich joined	19:56
	→ RahulAN_ joined	19:56
ag4ve	and I want to keep the location in tact	19:56
	→ jimi_ joined	19:56
	← vuoto left	19:57
	→ vuoto joined	19:57
	← SteffanW left	19:57
	→ tmz joined	20:01
	← vuoto left	20:01
RahulAN_	hi all	20:02
gitinfo	RahulAN_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	20:02
	→ vuoto joined	20:02
RahulAN_	How do i start using git on linux	20:02
	← vuoto left	20:03
	→ vuoto joined	20:03
RahulAN_	I mean i want to share my project with my friends also , how do we start using it via git	20:03
	← vuoto left	20:03
qsx	RahulAN_: !book	20:03
gitinfo	RahulAN_: 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	20:03
	→ vuoto joined	20:04
ag4ve	tar -,	20:04
	tar -czvf repo.tgz repo/	20:04
RahulAN_	git init , git add , git commit -m "msg" , git push	20:04
	this much i got ..	20:05
	but how do my friends can share the code in it ,.. (make the changes with my repo)	20:05
	← irqq left	20:05
	→ irqq joined	20:06
ag4ve	you can copy repos around like I indicated (nothing special) or see git-remote	20:06
	← tmz left	20:07
RahulAN_	ag4ve: after clone , what i have to do .. to contribute in it	20:08
jhass	RahulAN_: where did you clone it from?	20:10
ag4ve	I'm guessing you are looking at github or similar?	20:10
	← spudowiar left	20:11
RahulAN_	jhass: this is my account https://github.com/nested, and want to contribute here: https://github.com/citrix123/GrandShopping.git	20:11
jhass	see https://help.github.com/articles/using-pull-requests/	20:12
	← ESphynx left	20:12
RahulAN_	jhass: how to do it from command line	20:12
	← diegoviola left	20:12
jhass	RahulAN_: we've provided you documentation, please read it and come back with specific questions	20:13
RahulAN_	jhass: some time i have minimal linux	20:13
ag4ve	after you're done with that, there's #github	20:13
	← oich left	20:13
	→ Ahmed90 joined	20:13
ag4ve	(and if you don't like reading, there's tons on YouTube)	20:15
	→ v0n joined	20:16
	→ vuoto_ joined	20:16
	← nwkj86 left	20:16
	→ oich joined	20:17
	→ diegoviola joined	20:17
	→ d4rklit3 joined	20:18
	← d4rklit3 left	20:20
	→ d4rklit3 joined	20:20
RahulAN_	jhass: thats great	20:22
	just create a pull request and then merge it	20:22
	the reviewer willl review and merge it to master	20:22
	am i right ?	20:23
jhass	yes	20:23
	note that's specific to github, less so git	20:23
	← diegoviola left	20:23
	← schwepps left	20:24
	← Literphor left	20:24
RahulAN_	jhass: with web page it was so easy	20:24
	but how do i do in cmd ..	20:24
jhass	what step specifically?	20:24
	→ romerocesar joined	20:25
	← zumba_addict left	20:25
	→ mdw joined	20:25
RahulAN_	i mean after cloning , do changes, then how to request-pull	20:25
	→ ekinmur joined	20:25
	→ diegoviola joined	20:26
jhass	that's multiple steps, I'm still not sure about which specific step your question is	20:26
	→ peeps joined	20:26
	← PCatinean left	20:27
	← nnyk_ left	20:28
	→ nnyk_ joined	20:28
	← romerocesar left	20:30
	→ radsy joined	20:31
	→ Literphor joined	20:33
	→ sandstrom joined	20:33
	← d4rklit3 left	20:34
sandstrom	In hooks I've seen `# Redirect output to stderr; exec 1>&2` is it a bad idea to omit that?	20:34
	→ snowkidind joined	20:35
	→ fuchstronaut joined	20:36
kadoban	sandstrom: Depends what your hook is doing I guess. Often probably won't matter.	20:36
	→ slick joined	20:37
sandstrom	It will abort my commits if I've forgot to set the right user.email value. I want to see the message, but perhaps both std-out and std-err are shown in the console?	20:37
	kadoban	20:37
	→ lindenle joined	20:38
	← Literphor left	20:38
	→ tmz joined	20:39
RahulAN_	Is it possible to create a repo from command line?	20:40
	→ jaguarmagenta joined	20:40
	→ acetakwas joined	20:40
_ikke_	git init	20:40
RahulAN_	_ikke_: I did it	20:40
_ikke_	git status	20:40
RahulAN_	_ikke_: i did git add .	20:40
	→ WayToDoor joined	20:41
	→ xall joined	20:41
RahulAN_	_ikke_: as i am doing git commit -m "Codeigniter framework"	20:41
	← fuchstronaut left	20:41
	← tgunr left	20:42
RahulAN_	and git push origin master i am getting fatal: 'origin' does not appear to be a git repository	20:42
	_ikke_: there is no repo names origin on git	20:42
	what should i do to create one ?	20:43
	← lindenle left	20:43
	← xaviergmail left	20:44
	→ xaviergmail joined	20:45
	← oich left	20:46
RahulAN_	any one here?	20:46
	→ shgysk8zer0_ joined	20:47
	→ d4rklit3 joined	20:47
jhass	this is all covered in all basic tutorials and all books, we're here to clarify stuff in case you're confused about something you read or simply couldn't find an answer to after doing your research. We're not here to tutor you on your first steps, go read a tutorial or book	20:47
	→ oich joined	20:48
	→ inflames joined	20:48
	→ Goplat joined	20:48
	→ royanne joined	20:50
_ikke_	RahulAN_: Where are you pushing to?	20:50
RahulAN_	jhass: i know you are there to assist	20:51
	← royanne left	20:51
RahulAN_	but i want to know is there any way to create a new repository from command like	20:51
	_ikke_: i want to have a new repo from command line	20:51
jhass	you seem to be confused about the difference between github and git	20:52
	go read about that first	20:52
	← diegoviola left	20:54
	→ ahmedelgabri joined	20:54
	← shgysk8zer0_ left	20:56
	→ thinsoldier joined	20:56
	← mdw left	20:57
	← nnyk_ left	20:57
_ikke_	RahulAN_: You cannot with plain git create a remote repository from the command line	20:57
RahulAN_	_ikke_: Yes i got it	20:58
	http://stackoverflow.com/questions/2423777/is-it-possible-to-create-a-remote-repo-on-github-from-the-cli-without-opening-br	20:58
	← ahmedelgabri left	20:59
	→ mwhooker joined	21:00
	← doener left	21:01
	← User458764 left	21:02
	← freimatz left	21:02
	← vuoto_ left	21:03
	← vuoto left	21:03
	← HoierM left	21:04
	→ zumba_addict joined	21:06
	← d4rklit3 left	21:07
RahulAN_	jhass: i got some more thing by reading that book:D	21:07
	← ekinmur left	21:07
	← xall left	21:08
	→ ash_workz joined	21:09
	→ dkug joined	21:11
	→ elastix joined	21:11
	← thinsoldier left	21:13
	← davisoni_ left	21:13
	→ bjoe2k4 joined	21:16
	→ diegoviola joined	21:16
	→ thinsoldier joined	21:18
	→ HoierM joined	21:18
	← acetakwas left	21:21
	← arooni left	21:22
	→ arooni joined	21:22
	→ acetakwas joined	21:23
	← mwhooker left	21:24
	→ ekinmur joined	21:24
	→ d4rklit3 joined	21:24
	← jimi_ left	21:25
	→ Literphor joined	21:25
	→ xall joined	21:25
	→ MacGyver joined	21:26
	← tmz left	21:26
	← subhojit777 left	21:27
	← rubyonrailed left	21:27
	← d4rklit3 left	21:28
	→ mwhooker joined	21:29
RahulAN_	To contribute in one project i did forked a repository, now i made some changes and pushed to my master, nnow i want to pull-request ro the main repository	21:29
	how do i do it?	21:29
	→ todd_dsm joined	21:30
	← quetz left	21:30
RahulAN_	https://git-scm.com/docs/git-request-pull	21:30
	← rahtgaz left	21:30
RahulAN_	i am trying this.. but getting fatal: unable to access 'https://github.com/citrix123/Mayabazar/': The requested URL returned error: 403	21:31
sonOfRa	github pull requests aren't done with git-request-pull	21:31
	You want to use the github UI for that after you pushed your changes to your repository	21:31
RahulAN_	sonOfRa: with it is it not possible ?	21:32
	with command line ?	21:32
sonOfRa	no, command line git doesn't do what you need to do for github pull requests out of the box.	21:32
	There might be command line tools that allow you to do this, but they don't come with git itself	21:32
RahulAN_	Oh i see	21:33
moritz	RahulAN_: https://github.com/ingydotnet/git-hub	21:33
RahulAN_	moritz: does it have pull request?	21:34
	→ mmmveggies joined	21:35
moritz	RahulAN_: sure; the pr-new command	21:36
	← stonerfish left	21:36
	← radsy left	21:37
	→ stonerfish joined	21:38
	→ jeffreylevesque joined	21:41
	← dkug left	21:41
	→ tmz joined	21:41
	← tmz left	21:43
	→ mehola joined	21:43
	← jrnieder left	21:45
RahulAN_	moritz: i am getting API url '/repos//' looks suspiciously wrong	21:47
	moritz: i am doing this git hub pr-new --remote=github.com/citrix123/Mayabazar	21:47
	← mehola left	21:48
	→ davisonio joined	21:50
	← ferr left	21:50
	← mischat left	21:50
	→ mischat joined	21:51
	← mischat left	21:51
	→ keltvek joined	21:52
	← Raging_Hog left	21:52
	→ spudowiar joined	21:52
	→ tmz joined	21:53
	← davisonio left	21:54
	← joki left	21:55
	→ denimsoft joined	21:56
BlaXpirit	moritz, hoold up, why would you use this and not the official one?	21:57
	← jaguarmagenta left	21:58
	→ mneb joined	21:58
RahulAN_	BlaXpirit: any other suggestion instead of using the web page?	21:58
BlaXpirit	RahulAN_, https://github.com/github/hub pull-request	22:00
	→ joki joined	22:00
	← ekinmur left	22:01
	← superteece left	22:02
	→ jc174 joined	22:02
	← mwhooker left	22:03
	→ mwhooker joined	22:03
	← tmz left	22:05
RahulAN_	BlaXpirit: I will try it	22:07
	← satifant left	22:07
RahulAN_	if i changed many files and i want to add them , is there any way or command to diff and add those are change	22:07
	→ superteece joined	22:07
	← xall left	22:08
	→ Ahmed-90 joined	22:08
	→ duderonomy joined	22:08
BlaXpirit	RahulAN_, I don't understand	22:08
	← Ahmed90 left	22:08
RahulAN_	I mean i changed some files , and if in case to leave any one of the file for adding, is there any way so that i can get to knwo that how many files i had changed in my local workspace.	22:09
	BlaXpirit: sorry for my bad english :)	22:10
BlaXpirit	RahulAN_, git status	22:10
	→ tmz joined	22:10
	← jc174 left	22:11
	← acetakwas left	22:12
	← mneb left	22:12
	→ cd-rum joined	22:13
	→ Rodya_ joined	22:15
	← inflames left	22:15
	→ jstein__ joined	22:16
	jstein → Guest2482	22:16
	→ cd-rum_ joined	22:17
	→ endiruna joined	22:18
	jstein__ → jstein	22:18
	→ gosti joined	22:18
	← spudowiar left	22:18
	← cd-rum left	22:19
	← cyan__ left	22:20
	← Guest2482 left	22:20
	← mmlb left	22:21
	← RahulAN_ left	22:21
	← todd_dsm left	22:22
	→ piattino joined	22:22
	→ acetakwas joined	22:23
	→ spoiv joined	22:23
	← mwhooker left	22:24
	← spoiv left	22:24
	← piattino left	22:24
	→ piattino joined	22:25
	← GavinMagnus left	22:25
	← piattino left	22:26
	← zumba_addict left	22:27
	→ rubyonrailed joined	22:28
	→ robotroll joined	22:28
	→ CheckDavid joined	22:28
	→ inflames joined	22:28
	→ zumba_addict joined	22:30
	→ cyan__ joined	22:30
	← rubyonrailed left	22:33
	→ spudowiar joined	22:37
	→ fuchstronaut joined	22:37
	← robotroll left	22:38
	← Rodya_ left	22:38
	← acetakwas left	22:39
	← rbr left	22:41
	← fuchstronaut left	22:42
	← spudowiar left	22:44
	gitinfo set mode: +v	22:50
oich	I want to ignore everything in directory a/b except for a/b/special. So, in .gitignore I have a/b/* followed by !a/b/special but git status reports anything below a/b/ as untracked and check-ignore prints nothing for any file in a/b. what am I doing wrong?	22:50
	→ mischat joined	22:52
	← toogley left	22:52
	← jbitdrop left	22:52
	← cd-rum_ left	22:53
	← Literphor left	22:54
	→ shgysk8zer0 joined	22:55
	→ ahmedelgabri joined	22:55
	→ romerocesar joined	22:56
	→ Literphor joined	22:57
	→ livingstn joined	22:58
	→ piattino joined	22:58
	← livingstn left	22:58
	← Goplat left	22:59
	← digidog left	22:59
	← mischat left	22:59
	← endiruna left	23:00
	← ahmedelgabri left	23:00
	← romerocesar left	23:01
	← sandstrom left	23:02
	← xaviergmail left	23:04
	← dangerousdave left	23:05
	→ mmlb joined	23:05
	→ xaviergmail joined	23:05
	← shgysk8zer0 left	23:06
	→ shgysk8zer0 joined	23:06
	← dreiss left	23:07
	← WayToDoor left	23:09
	← rolha left	23:11
	← zarel left	23:13
	← vivekp left	23:17
	→ vivekp joined	23:17
	→ ddybing joined	23:19
	gitinfo set mode: +v	23:19
piattino	hi. in dir1, files f1, f2, f3, f-many-N have been both edited and renamed. which command helps me see the differences better? ideally, i would like to browse the 2 statuses of dir1 simultaneously	23:21
	← Waskeend left	23:22
	← cbreak left	23:23
	→ chrisshattuck joined	23:24
	← wagle left	23:24
	→ Waskeend joined	23:25
	→ wagle joined	23:25
	← chrisshattuck left	23:25
	→ cbreak joined	23:25
	← irco left	23:25
	→ Goplat joined	23:27
	← nd left	23:28
	→ nd joined	23:28
	← vivekp left	23:29
	→ vivekp joined	23:29
	← vivekp left	23:31
	→ vivekp joined	23:31
	← cbreak left	23:33
	→ mablae__ joined	23:34
	← inflames left	23:36
	→ inflames joined	23:37
	← mablae_ left	23:37
	→ cbreak joined	23:41
	← shgysk8zer0 left	23:42
	→ jrnieder joined	23:43
	← ddybing left	23:43
	→ mehola joined	23:44
	← mehola left	23:49
	← BSaboia left	23:49
	→ BSaboia joined	23:50
	← Codfection left	23:53
	→ Codfection joined	23:53
	→ Chiko joined	23:55
	→ ahmedelgabri joined	23:56
	→ mischat joined	23:56
	← denimsoft left	23:57
	→ jaguarmagenta joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation