IRCloggy #git 2015-12-18

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-18
	→ dopesong joined	00:00
	→ fahadash joined	00:00
	→ jteneyck joined	00:00
	← lindenle left	00:00
	→ madewokherd joined	00:01
	← durham left	00:01
	→ hahuang65 joined	00:02
	← enleeten left	00:02
	← quizzi left	00:03
	← ascarter left	00:04
	← mi100hael left	00:04
	→ lindenle joined	00:04
	← Zenith_ left	00:05
	← jmpp left	00:06
	→ jimi_ joined	00:07
	→ pozitron joined	00:08
	→ encod3 joined	00:08
	← erste left	00:09
	← heroux left	00:09
	→ enleeten joined	00:10
	→ heroux joined	00:10
	← pozitrono left	00:10
	→ quizzi joined	00:10
	→ durham joined	00:11
	→ samw joined	00:11
	← kpease left	00:12
	← cdg left	00:12
	← ag4ve left	00:12
	→ dsdeiz joined	00:12
	← dopesong left	00:13
	← encod3 left	00:13
	→ italoacasas joined	00:13
	→ ril joined	00:14
	→ peoliye joined	00:14
	← BillCriswell left	00:15
	← durham left	00:15
	→ bb010g joined	00:15
	gitinfo set mode: +v	00:15
	→ durham joined	00:16
	← _cyril__ left	00:16
	← lindenle left	00:16
	→ wethu joined	00:16
	← durham left	00:16
	← TinkerTyper left	00:16
	→ _cyril__ joined	00:16
	→ garples joined	00:17
	← jteneyck left	00:17
	→ abc123 joined	00:17
	← italoacasas left	00:18
	← abc123_ left	00:19
	abc123 → abc123_	00:19
wethu	Hi, I am having fun with git. Yesterday, I ran git pull origin some-branch on my feature branch. Now I'm trying to undo the merges caused by the pull. Immediately before pulling, i made a commit. I have found this commit in git reflogs and ran git reset --hard <sha>, however things aren't back to normal :( Someone able to point me in the right direction for why?	00:19
	← menace left	00:19
	→ italoacasas joined	00:19
	← codedmart left	00:21
aidalgol	How do I selective stash uncommitted changes?	00:21
	→ lindenle joined	00:21
	→ durham joined	00:22
	← samw left	00:22
	← hexagoxel left	00:22
aidalgol	e.g. I have changed to files foo.c and bar.c, and I want to stash them separately, so I can apply them separately later, because the two files are totally unrelated.	00:22
	→ hexagoxel joined	00:23
	← jimi_ left	00:25
gaen	git stash save -p	00:26
	← lindenle left	00:27
gaen	but I'd recommend to use temporary branches instead	00:27
	imho stash is good for simple operations and small amounts of changes, for more complex goals good old commits are more natural	00:29
	especially when you are expecting some conflicts on applying stashed changes	00:29
	→ lindenle joined	00:30
	→ otter768 joined	00:30
	← CausaMortis left	00:30
	→ mizu_no_oto joined	00:31
	→ nilg joined	00:31
gaen	or, if you want to apply your changes later anyway, you can just commit them (in separate commits), do some more commits, and then use git rebase -i to put that two commits on top of your history	00:33
	← espindol_ left	00:34
	← lindenle left	00:39
	← Limes_ left	00:39
	← s8321414 left	00:41
	← Aboba left	00:42
	← nilg left	00:42
	→ lindenle joined	00:43
	→ _hs2000_ joined	00:44
	← wethu left	00:45
	← ril left	00:46
	← lindenle left	00:51
	← gaen left	00:52
	→ daito joined	00:52
	→ Puhe joined	00:54
	→ lindenle joined	00:56
	← daito left	00:57
	← fstd left	00:59
	→ fstd joined	00:59
	← clemf left	01:00
	← otter768 left	01:00
	→ xelxebar joined	01:00
	→ jmpp joined	01:02
	← Faylite left	01:02
	← leb left	01:03
	← imachuchu left	01:03
	← Guest63249 left	01:05
	→ alanwill joined	01:05
	→ nilg joined	01:05
	← yqt left	01:07
	→ leb joined	01:07
	← kilo_bravo left	01:08
	← lindenle left	01:09
	→ nettoweb joined	01:10
	→ Lor_ joined	01:10
	→ wethu joined	01:11
	← harish_ left	01:12
	← dreiss left	01:12
	← mingwandroid left	01:12
	→ nowhereman joined	01:13
	→ lindenle joined	01:13
	← nowhere_man left	01:13
	← HelloAtMega left	01:15
	← MrWoohoo left	01:15
	← s00pcan left	01:15
	← under40min left	01:17
	→ under40min joined	01:17
	← sangy left	01:18
	← m0viefreak left	01:19
	→ eka_ joined	01:20
	← nettoweb left	01:21
	→ Noldorin joined	01:22
	← nidr0x left	01:23
	← radsy left	01:23
	← abc123_ left	01:23
	→ abc123 joined	01:23
	← mizu_no_oto left	01:25
	← tristanp left	01:26
	← santi_ left	01:27
	→ Lyqyd joined	01:27
	← lindenle left	01:28
	→ m_ben joined	01:30
	→ lindenle joined	01:31
	→ DavidDudson joined	01:31
	← d4rklit3 left	01:31
	← m_ben left	01:32
	→ joufflu joined	01:32
	→ encod3 joined	01:32
	← frem left	01:32
	← abc123 left	01:32
	← kadoban left	01:32
	→ nnyk_ joined	01:33
	← grootseun left	01:33
	→ grootseun joined	01:33
	→ abc123 joined	01:34
	→ jackburton joined	01:35
	→ samw joined	01:35
	→ espindola joined	01:35
	← Sucks left	01:35
	← jmpp left	01:36
	← encod3 left	01:37
	← kleops left	01:37
	← diegoviola left	01:37
	→ phrozensilver joined	01:38
	← samw left	01:40
	← espindola left	01:40
	← bitkiller left	01:41
	→ geomyidae joined	01:42
	← phrozensilver_ left	01:42
	← lindenle left	01:42
	← nafg left	01:43
	→ otter768 joined	01:44
	← Uptime left	01:45
	→ Uptime joined	01:45
	→ mellernoia joined	01:45
	→ lindenle joined	01:47
	← dsdeiz left	01:47
	→ clemf joined	01:48
	← abc123 left	01:48
	→ jimi_ joined	01:49
	← mellernoia left	01:50
	→ abc123 joined	01:50
	← _hs2000_ left	01:52
	→ skcin7 joined	01:53
	← JanC left	01:54
	→ dsdeiz joined	01:56
	← lindenle left	02:00
	← Noldorin left	02:03
	→ lindenle joined	02:03
	→ tristanp joined	02:03
	→ wxg joined	02:04
	← neanderslob left	02:04
	← msonntag left	02:04
	→ arescorpio joined	02:04
	← dsdeiz left	02:05
	→ neanderslob joined	02:05
	← sgambino left	02:05
	← lindenle left	02:06
	→ lindenle joined	02:06
	← xaa left	02:07
	→ msonntag joined	02:07
	→ govg joined	02:07
	← geomyidae left	02:08
	→ strayPuppy joined	02:09
	→ JanC joined	02:09
	← Sasazuka left	02:10
	→ Sucks joined	02:10
	← abc123 left	02:13
	→ abc123_ joined	02:13
	← phrozensilver left	02:14
	← govg left	02:14
	→ n00bdev joined	02:16
	← lindenle left	02:16
	← cmosguy left	02:16
	→ govg joined	02:16
	→ mablae__ joined	02:16
	← krawchyk left	02:16
	← tristanp left	02:18
	← mablae_ left	02:19
	← wethu left	02:20
	→ lindenle joined	02:20
	← pks left	02:20
	→ durham_ joined	02:22
	→ pks joined	02:22
	→ wethu joined	02:23
	→ Vampire0_ joined	02:23
	→ tristanp joined	02:24
	← clemf left	02:24
	→ tyll_ joined	02:25
	← durham left	02:25
	→ daito joined	02:25
	← durham_ left	02:26
	← Vampire0 left	02:26
	← tyll left	02:27
	→ SimonNaa joined	02:27
	← leb left	02:29
	→ harish_ joined	02:30
	→ maze_ joined	02:30
	← tristanp left	02:30
	← mezod left	02:31
	← SimonNa left	02:32
	← _cyril__ left	02:32
	← maze_ left	02:32
	→ jmpp joined	02:32
	→ tristanp joined	02:33
	← lindenle left	02:33
	← tristanp left	02:36
	→ abc123 joined	02:36
	→ lindenle joined	02:37
	→ sangy joined	02:37
	← jmpp left	02:38
	← abc123_ left	02:38
	abc123 → abc123_	02:38
	→ nurupo_ joined	02:40
	← ssarah left	02:40
	← relipse left	02:41
	← jagob left	02:41
	→ mizu_no_oto joined	02:41
	← nurupo left	02:41
	→ MistahKurtz joined	02:41
	nurupo_ → nurupo	02:41
	→ abc123 joined	02:42
	← govg left	02:42
	← abc123_ left	02:42
	abc123 → abc123_	02:42
	← italoacasas left	02:44
	← Chill_Surf left	02:45
	← wxg left	02:45
	← lindenle left	02:46
	← toothrot left	02:46
	→ tristanp joined	02:46
	→ toothrot joined	02:48
	→ govg joined	02:48
	← garples left	02:48
	→ lindenle joined	02:50
	← abc123_ left	02:51
	→ abc123 joined	02:51
	← ahr3n left	02:54
	→ derpvid joined	02:55
	← derpvid left	02:56
	← ome left	02:57
	← tristanp left	02:58
	→ boombatower joined	03:00
	→ espindola joined	03:00
	← espindola left	03:00
	← skcin7 left	03:01
	→ rpdprd joined	03:02
	← drbean_ left	03:02
	→ tristanp joined	03:02
	← lindenle left	03:02
	→ drbean joined	03:03
	→ jteneyck joined	03:05
	← jteneyck left	03:05
	→ jteneyck joined	03:05
	→ lindenle joined	03:06
	→ ril joined	03:07
	ril → ril[away]	03:08
	← wallyduchamp left	03:11
	→ sleezd_ joined	03:13
	→ jmpp joined	03:14
	→ jason237 joined	03:15
	→ phrozensilver joined	03:15
	→ kadoban joined	03:17
	← lindenle left	03:18
	→ nurupo_ joined	03:20
	← nurupo left	03:20
	nurupo_ → nurupo	03:21
	← abc123 left	03:22
	→ abc123_ joined	03:22
	→ Goplat joined	03:22
	→ lindenle joined	03:22
	→ Sucks_ joined	03:23
	← Sucks left	03:23
	→ ssarah joined	03:25
	→ nidr0x joined	03:26
	→ skcin7 joined	03:27
	← skcin7 left	03:28
	→ dreiss joined	03:29
	→ skcin7 joined	03:29
	← jimi_ left	03:30
	→ clemf joined	03:30
	← clemf left	03:32
	← dreiss left	03:33
	← lindenle left	03:35
	← pacbard left	03:36
	→ garples joined	03:36
	← Lor_ left	03:36
	→ gfixler joined	03:37
	ril[away] → ril	03:38
	→ lindenle joined	03:38
	→ rchavik joined	03:38
	← ril left	03:39
	→ dreiss joined	03:40
	← nidr0x left	03:41
	← a3Dman left	03:42
	← diogenese left	03:43
	→ diogenese joined	03:44
	→ abc123 joined	03:44
	→ a3Dman joined	03:44
	→ pacbard joined	03:45
	← lindenle left	03:47
	← abc123_ left	03:47
	abc123 → abc123_	03:47
	← a3Dman left	03:49
	→ lindenle joined	03:50
	→ jagob joined	03:50
	← abc123_ left	03:52
	← daito left	03:52
	← peoliye left	03:52
	→ abc123 joined	03:52
	← jteneyck left	03:53
	← vane- left	03:54
	→ jteneyck joined	03:56
	← jteneyck left	03:56
	→ jteneyck joined	03:56
	→ lucasmezencio joined	03:56
	→ ome joined	03:56
	← jteneyck left	03:56
	→ jteneyck joined	03:56
	← jteneyck left	03:56
	→ jteneyck joined	03:56
	← lucasmezencio left	03:57
	← eka_ left	03:57
	← mizu_no_oto left	03:57
	→ jimi_ joined	03:57
	→ a3Dman joined	03:57
	→ dstarh joined	03:57
	← diogenese left	03:58
	← jteneyck left	03:58
	→ mizu_no_oto joined	03:58
	→ diogenese joined	03:58
	← lindenle left	03:59
	→ lindenle joined	04:00
	← dreiss left	04:02
	← mizu_no_oto left	04:02
	← a3Dman left	04:05
	← garples left	04:06
	→ smithbone joined	04:06
	← n00bdev left	04:06
	→ sgambino joined	04:06
	← alanwill left	04:09
	→ eka joined	04:10
	← rpdprd left	04:12
	← Puhe left	04:14
	→ DSH105 joined	04:15
	← dstarh left	04:16
	→ mizu_no_oto joined	04:16
	→ danieli joined	04:17
	← otter768 left	04:18
	→ a3Dman joined	04:18
	← a3Dman left	04:18
	→ a3Dman joined	04:18
	← zacg left	04:19
	← boombatower left	04:19
	← DSH105 left	04:20
	→ DSH105 joined	04:20
	→ terminal_echo joined	04:21
	→ yeshacker joined	04:22
	← lindenle left	04:23
	← aidalgol left	04:23
	← joki left	04:25
	→ lindenle joined	04:26
	← bb010g left	04:28
	→ joki joined	04:29
	→ Khadafi joined	04:30
	→ zhiwliu joined	04:30
	← zhiwliu left	04:31
	→ _cyril__ joined	04:32
	← _cyril__ left	04:32
	→ daito joined	04:33
	→ mehola joined	04:33
	← Khadafi left	04:35
	← crayon left	04:35
	→ rchavik_ joined	04:36
	← mizu_no_oto left	04:36
	→ rpdprd joined	04:37
	← mehola left	04:37
	→ wallyduchamp joined	04:39
	← rchavik left	04:39
	→ Khadafi joined	04:41
	← lindenle left	04:42
	← terminal_echo left	04:44
	← chucky_z left	04:45
	← yeshacker left	04:48
	← Khadafi left	04:48
	→ d4rklit3 joined	04:48
	→ msankhala joined	04:48
	→ Khadafi joined	04:48
	→ tarkus26172 joined	04:49
	← CheckDavid left	04:49
	→ alanwill joined	04:50
	← fahadash left	04:51
	→ mehola joined	04:52
	← Sucks_ left	04:52
	← Khadafi left	04:53
	→ danmulvey joined	04:54
	→ watabou joined	04:59
	← danmulvey left	04:59
	← dermoth left	05:00
	← Yeomra left	05:00
	→ dermoth joined	05:00
	← jimi_ left	05:01
	← tpollard left	05:02
	→ Khadafi joined	05:02
	← Lyqyd left	05:03
	→ Khadafi995 joined	05:04
	→ acetakwas joined	05:05
	← joufflu left	05:08
	← Khadafi left	05:08
	← Khadafi995 left	05:14
	← FireArrow133 left	05:16
	→ Manikandan joined	05:16
	→ ril joined	05:17
	← acetakwas left	05:19
	← skelterjohn left	05:21
	← toothrot left	05:21
	← ril left	05:23
	← githogori left	05:24
	← sgen left	05:28
	→ Khadafi joined	05:29
	← sdothum left	05:30
	← blackwind_123 left	05:30
	→ _cyril__ joined	05:33
	→ Sucks joined	05:33
	← arescorpio left	05:34
	← Khadafi left	05:34
	← _cyril__ left	05:34
	← ssarah left	05:35
	← govg left	05:35
	→ Wetmelon joined	05:35
	→ settermjd joined	05:37
	→ kzisme joined	05:37
	→ ril joined	05:38
	→ molec joined	05:39
	← MistahKurtz left	05:40
	→ rubyonrailed joined	05:40
	← weox left	05:42
	← elementalest left	05:46
	→ ssarah joined	05:47
	← settermjd left	05:48
	→ devoldmx joined	05:49
	← Manikandan left	05:50
	← rchavik_ left	05:51
	→ Manikandan joined	05:51
	→ govg joined	05:51
	← SimonNaa left	05:52
	→ elementalest joined	05:54
	← ril left	05:55
	→ ayaz joined	05:56
	→ yeshacker joined	05:57
	← ayaz left	05:57
	→ encod3 joined	06:00
	← Sucks left	06:04
	→ ayaz joined	06:04
	← ayaz left	06:05
	← devhost left	06:06
	← Flyingmana left	06:06
	← sangy left	06:06
	← nnyk_ left	06:06
	→ Flyingmana joined	06:07
	← Lowell left	06:07
	← rfv left	06:07
	← ome left	06:07
	← yoyoyo___ left	06:07
	→ ayaz joined	06:07
	← keldwud left	06:07
	← Manikandan left	06:07
	← cstrahan left	06:07
	← paperziggurat left	06:08
	→ MechtiIde joined	06:09
	→ yoyoyo___ joined	06:10
	→ Lowell joined	06:10
	→ paperziggurat joined	06:10
	← encod3 left	06:10
	→ cstrahan joined	06:10
	→ rfv joined	06:11
	→ nidr0x joined	06:11
	← OnkelTem left	06:12
	→ Khadafi joined	06:13
	← molec left	06:14
	← nadim left	06:14
	→ nadim joined	06:14
	← phrozensilver left	06:14
	← Khadafi left	06:17
	→ otter768 joined	06:18
	← darkschneider left	06:19
	→ darkschneider joined	06:19
	→ encod3 joined	06:20
	← wallyduchamp left	06:20
	→ Manikandan joined	06:21
	→ garples joined	06:21
	→ wallyduchamp joined	06:21
	→ Rynomster joined	06:21
	← wallyduchamp left	06:22
	→ wallyduchamp joined	06:23
	← otter768 left	06:23
	→ devhost joined	06:27
	← under40min left	06:28
	← hackel left	06:28
	← encod3 left	06:31
	→ githogori joined	06:33
	→ _cyril__ joined	06:33
zv	Hi #git, I'm working on trying to pull in every change in a branch 'develop' that is not in a branch 'master' that touched the directory 'directory'. To do this I ran `git rev-list --reverse master..develop -- directory/ \| git cherry-pick -n --stdin`. But I got a set of conflicts which seemed to encompass every change in develop. Can anyone tell me why this might be and what I can do to get the correct behavior?	06:34
	→ wxg joined	06:34
	← _cyril__ left	06:36
	← star_prone left	06:36
	→ star_prone joined	06:37
	→ PCatinean joined	06:37
Rynomster	why not just checkout master, then checkout directory from the develop branch... git checkout master && git checkout origin/develop directory	06:39
	→ ThomasLocke joined	06:40
	→ Khadafi joined	06:43
	← star_prone left	06:43
	← [cust] left	06:45
	← Khadafi left	06:45
	→ kzisme_ joined	06:47
	← kzisme left	06:47
	← d4rklit3 left	06:48
	← MechtiIde left	06:51
Saturn812	is there a way to get a key over ssh? I need to do something with the repo on the other end of ssh. I have a key on my local machine. Remote machine is secure enough to enter credentials on it, but not secure to store a private key on it. Is there a work around? Using login/pass is annoying	06:53
_ikke_	You can use agent forwarding	06:54
	→ peoliye joined	06:54
_ikke_	ssh -A	06:54
	→ nnyk_ joined	06:54
	← tristanp left	06:55
	← Peaker left	06:56
Peng	Obviously, that means root/you on the remote machine can impersonate you while the connection with agent forwarding is still running.	06:57
	since .. that's the point	06:57
	→ tristanp joined	06:58
Saturn812	_ikke_, thank you! I will look more closely into that.	06:58
	→ jceb joined	06:58
	← peoliye left	06:58
Saturn812	Peng, thanks for the warning. I understand a problem.	06:59
	Tronsha → [UPA]Stefan	07:00
Peng	root/remote-you can't steal your keys over the connection, but they can obviousl call it to impersonate you while it's running.	07:00
Saturn812	i assume it is also the case if multiple people login with the same username?	07:01
	→ thiago joined	07:01
	→ Motoko joined	07:02
	← Manikandan left	07:06
	← sgambino left	07:06
	→ rominronin joined	07:06
_ikke_	yes	07:07
	← Lunatrius left	07:09
	→ settermjd joined	07:10
	→ dopesong joined	07:11
	← mac_ified left	07:14
	→ lb joined	07:15
	← rishi left	07:16
	← dopesong left	07:16
	→ rishi joined	07:16
	→ Manikandan joined	07:18
	→ roelmonnens joined	07:22
	→ acolson joined	07:23
	→ freimatz joined	07:23
	→ molec joined	07:24
Peng	It's anyone who has access to a socket in a directory owned by your user and chmod 700	07:25
	← harish_ left	07:25
	← anth0ny left	07:27
	→ anth0ny joined	07:27
	→ Anderson69s joined	07:29
	← happy-dude left	07:29
	← sparetire_ left	07:30
	← drodger left	07:30
	→ star_prone joined	07:32
	→ drodger joined	07:32
	→ CausaMortis joined	07:33
	→ tvw joined	07:35
	← wxg left	07:35
	→ _cyril__ joined	07:36
	← _cyril__ left	07:36
	→ wxg joined	07:36
	← Anderson69s left	07:37
	→ MrWoohoo joined	07:38
	→ skorgon joined	07:38
	→ MrWoohoo2 joined	07:38
	← nnyk_ left	07:40
	→ eijk_ joined	07:40
	← Motoko left	07:43
	→ Alienpruts joined	07:43
	→ Lunatrius joined	07:44
	← thiago left	07:45
	← fscala left	07:48
	← skorgon left	07:49
	→ weox joined	07:50
	→ fscala joined	07:50
	→ zeroed joined	07:51
	→ rscata joined	07:52
	→ alexsystemf_- joined	07:53
	→ jnavila joined	07:54
	→ akiva joined	07:55
	→ dopesong joined	07:55
	← Gamecubic left	07:55
	← nvahalik left	07:56
	→ mariuscc joined	07:56
	→ Kulrak joined	07:57
	← Kulrak left	07:57
	→ Kulrak joined	07:57
	→ cagedwisdom joined	08:00
	← dopesong left	08:00
	→ Sceorem joined	08:00
	→ dopesong joined	08:03
	→ wwwald joined	08:03
	→ gypsymauro joined	08:04
gypsymauro	hi	08:04
	← ThomasLocke left	08:04
gypsymauro	I'm managing many servers and on each of them I've some sh/python script , I want to keep that code versioned in a centralized place, what's the best way to achieve that?	08:05
	← cagedwisdom left	08:05
	→ ThomasLocke joined	08:06
	← watabou left	08:07
	← dopesong left	08:07
	→ survi joined	08:08
j416	gypsymauro: put it in a git repo	08:08
thorsten`	gypsymauro: It depends on the context, where to put the main git repo. It should be a place that can be accessed by all the servers you manage	08:09
	← stonerfish left	08:09
	← andschwa left	08:10
	← survi left	08:10
	→ Balliad joined	08:11
	→ fees joined	08:12
	→ andschwa joined	08:13
	→ mahendra_ joined	08:13
gypsymauro	thorsten`: yes I'm thinking to a server accessible via ssh and a repo structure like repository/samba repository/zimbra repository/various and so on , maybe with some more complex structure like repository/samba/usermanagement , on a specific server maybe I need just the usermanagement part not the whole repository	08:15
Seveas	gypsymauro: configuration management thing like puppet or chef.	08:15
	git != deployments, git != config management.	08:16
	→ PHPanos joined	08:16
	← neanderslob left	08:17
	← PHPanos left	08:17
	← drodger left	08:17
	→ BtbN joined	08:17
	→ neanderslob joined	08:17
gypsymauro	what I need isn't a config management or to deploy something, is to use git for versioning my spreaded script :)	08:17
	→ sonOfRa joined	08:17
	← rominronin left	08:18
	→ cagedwisdom joined	08:18
	→ rominronin joined	08:18
Seveas	what you describe is not version control though. What you describe is deployments (and for a single file deployments and config management come quite close).	08:18
	you can still have it in a git repo, git is just not a very good transport for these things.	08:19
	→ drodger joined	08:19
	→ otter768 joined	08:19
thorsten`	gypsymauro: then, just put the scripts you have into a single git,and make it accessible by the machines you have	08:20
	gypsymauro: it really depends on your context, how 'accessible'. And it depends on the amount (and heterogeneity) of servers, whether you should directly use git or whether a bigger solution seems preferable	08:22
	("many servers" = 3 or 400?)	08:23
gypsymauro	thorsten`: about 60	08:24
	← otter768 left	08:24
	→ astrofog joined	08:24
	← msankhala left	08:24
gypsymauro	but they are really some little scripts , i already use etckeeper to keep versioned my configurations	08:25
	and is backuped on tape, just wondering if it's possible to have a "script" repository , something like a "in house" github :) as you see I've not a really clear idea of tool available for that	08:27
	← kadoban left	08:28
	→ pR0Ps joined	08:29
	← wethu left	08:30
	→ Hounddog joined	08:31
	← tristanp left	08:31
	→ sazed joined	08:31
	← Darcidride_ left	08:31
	→ Poppa joined	08:32
thorsten`	well, then just create such a repository and keep it in house :-)	08:32
	→ Darcidride joined	08:32
thorsten`	gypsymauro: git != github. Just create a repository, and place a bare clone of it ("git clone --bare …") somewhere in your network, where it can be accessed by all your servers	08:33
	→ SOLDIERz joined	08:34
	→ josuebrunel joined	08:34
gypsymauro	thorsten`: yes I know that is differnt, I saw there are some web interfaces to git , I saw this too: http://schacon.github.io/git/git-read-tree.html#_sparse_checkout but isn't the same of SVN's capability to extract only some files from a repository	08:35
	→ FeuerbachMilomir joined	08:36
	→ _cyril__ joined	08:36
	← _cyril__ left	08:37
thorsten`	gypsymauro: 1) note, that you don't need a web-interface in order to have a distributed git setup, (and note that you never asked for a web interface), 2) you never asked how to extract only some files of a repository, and I don't see why you need it	08:37
	→ ChaoticEmergence joined	08:38
	→ encod3 joined	08:40
	→ msankhala joined	08:40
	← oojacoboo left	08:41
	→ nbdy joined	08:42
	← molec left	08:43
	← Goplat left	08:43
	← DavidDudson left	08:43
	→ _cyril__ joined	08:45
	← ChaoticEmergence left	08:46
	← sazed left	08:48
	→ skylite joined	08:48
	→ rkmylo joined	08:49
	→ ciampix joined	08:49
	→ dopesong joined	08:49
gypsymauro	thorsten`: I named github just to clarify a centralized repository concept, sorry, and yes I need to manage even a single file or folder from the repository, like svn does with sparse checkout, it seems git supoprt spare checkout too but not literally, it checkout all the repository in fact	08:50
	→ d3m0n joined	08:50
	→ encod3_ joined	08:50
grawity	it downloads the entire repository but checks out specific files	08:51
	in DVCSes these are separate things	08:51
d3m0n	Hey guys, I setup Git on GitLab awhile back has been sitting for a bit, I came back to update something and now the push doesn't seem to be going to GitLab's repo. There's no error either. How can I debug this and see where the upstream is going?	08:51
	← gopar left	08:51
grawity	git remote -v, git config push.default, git config remote.pushDefault	08:52
thorsten`	gypsymauro: then just setup a central repository and make it accessible over ssh, what's the problem with that? And no, I don't see yet why you need this 'sparse checkout'	08:53
	→ acetakwas joined	08:53
	← garples left	08:54
	← encod3 left	08:54
	← dopesong left	08:54
	← drager left	08:56
	→ compac joined	08:56
compac	Hello	08:56
d3m0n	grawity: Is that for me?	08:56
compac	Can I rebase if I deleted the topic branch?	08:56
	→ nettoweb joined	08:56
compac	I have a situation like https://git-scm.com/book/en/v2/book/03-git-branching/images/perils-of-rebasing-2.png first pic	08:56
	→ drager joined	08:57
	→ troulouliou_div2 joined	08:57
	← Manikandan left	09:00
	← a3Dman left	09:01
	→ a3Dman joined	09:03
	→ PeterBooker joined	09:04
	← MattMaker left	09:05
	← wxg left	09:05
	→ a-l-e joined	09:05
	→ marcogmonteiro joined	09:06
	← Rhonda left	09:07
	→ kurkale6ka joined	09:08
	← drager left	09:08
	→ drager joined	09:09
	→ MattMaker joined	09:09
	← pozitron left	09:11
	← Alienpruts left	09:12
	→ Jackneill joined	09:13
	← Wetmelon left	09:13
	→ Alienpruts joined	09:14
	→ Manikandan joined	09:14
	← MattMaker left	09:14
	← tarkus26172 left	09:14
	← encod3_ left	09:14
	← madewokherd left	09:14
	← Manikandan left	09:20
	← rkmylo left	09:22
	→ luke_penn joined	09:22
	→ chll joined	09:22
	→ David1977 joined	09:23
	← astrofog left	09:26
	→ powered joined	09:29
	← devoldmx left	09:29
	→ DavidDudson joined	09:29
	→ mhg joined	09:30
rominronin	giiiit	09:32
	in case : I want to run a script to fix file permissions every time files are written from a git repo to my working tree. where (which folder) do I place the scriptI want to run a script to fix file permissions every time files are written from a git repo to my working tree. where (which folder) do I place the script??	09:32
	← strayPuppy left	09:32
	→ UniFreak joined	09:36
David1977	robbyoconnor: as this is not a git question, more a bash/shell question..but you can place the script whereever you want it to have...just write that script properly with and use some parameters for it to point it to the correct direction	09:36
UniFreak	can I `git log` only specific line range?	09:36
	← acetakwas left	09:36
	← daito left	09:36
David1977	rominronin: ^^ that was for you	09:36
	robbyoconnor: sorry for highlighting	09:37
	→ reim joined	09:37
	→ wxg joined	09:37
rominronin	David1977: I was thinking of the post-receive folder - is that the right place for automating script execution upon pulls?	09:37
	← Peuc left	09:37
David1977	ah, ok...now I see what you want. Sorry, can't help for that	09:38
jast	post-receive is a hook that runs on the server after you have pushed something to it	09:38
	UniFreak: I don't think there's an option for that	09:38
	rominronin: what kind of fixing do you need?	09:38
	→ nafg joined	09:40
rominronin	jast, I set file permissions before add/commit/push my initial commit. When I pull later, the file owner/group perms are not what was committed	09:40
	sorry	09:40
	when I CLONE to a new environment on the same server they are not the same perms	09:41
	← jceb left	09:41
	→ SimonNa joined	09:41
	→ Anderson69s joined	09:44
	→ encod3 joined	09:44
	→ sbasso joined	09:44
	→ sbasso_ joined	09:46
ffledgling	What exactly is the git rev-parse command supposed to be used for? The description on the man page is confusing	09:46
	→ pantsman- joined	09:46
Seveas	rominronin: git doesn't care about file permissions other than the execute bit. What you're looking for is a post-checkout hook or potentially !xy	09:46
gitinfo	rominronin: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	09:46
	← sbasso left	09:49
	← luke_penn left	09:50
	← d3m0n left	09:50
	→ clmsy joined	09:51
	← Alienpruts left	09:51
	→ acetakwas joined	09:52
	→ Alienpruts joined	09:55
	→ dimi1947 joined	09:55
	→ jceb joined	09:57
	→ roxlu joined	09:58
	← dimi1947 left	09:59
	→ averell joined	09:59
	→ marcelo__ joined	10:00
	← marcelo_ left	10:00
	→ jost joined	10:00
	→ phantombeta joined	10:01
	← nbdy left	10:02
	→ rnsanchez joined	10:02
	← drager left	10:02
	→ luke_penn joined	10:04
rominronin	Seveas: I'm trying to create a working tree/staging environment of a drupal installation. the .git folder has ownership git:group	10:04
	I get errors when I git pull	10:05
	← mhg left	10:06
rominronin	pertaining to permissions	10:07
	Unable to append to .git/logs/refs/remotes/origin/initial: Keine Berechtigung Von /opt/git/test	10:07
	← DavidDudson left	10:08
	→ Sephyros joined	10:08
Sephyros	Hello	10:08
gitinfo	Sephyros: 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.	10:08
	→ MattMaker joined	10:10
rominronin	Seveas: ignore me, my remote was wrong :/	10:10
	→ dopesong joined	10:11
	← akiva left	10:12
Sephyros	I have a git repo with 150 commits up to 2015-01-01 and another repo with 100 commts before 2015-01-01... same project, same folder but for some reason someone removed the repo at 2015-01-01 and started a new repo... if i copy paste and retain newer files (on hooks for example) i get the full repo... but... the SVN repo doesnt have older files... and when i do rebase git-SVN says that is already updated... if i commit something the older files will be com	10:12
	mited? without troubles?	10:12
	→ aard_ joined	10:14
	← Nikhil_D left	10:14
	← MattMaker left	10:14
	→ Nikhil_D joined	10:14
	← zeroed left	10:16
	→ pluszak joined	10:17
	← jceb left	10:17
	→ astrofog joined	10:17
	→ jds joined	10:18
	← luke_penn left	10:18
	→ sazed joined	10:18
	→ otter768 joined	10:20
	→ zotherstupidguy joined	10:22
	→ localuser- joined	10:22
	← acetakwas left	10:24
	← dopesong left	10:24
	← otter768 left	10:25
	→ silentz0r joined	10:27
silentz0r	hello git peeps, what's a good alternative to SourceTree (git GUI) on Linux? I've been using SmartGit and I'm not really happy wit hit	10:27
	→ nfk\|laptop joined	10:28
	← jagob left	10:29
	→ elsevero joined	10:30
	→ mhg joined	10:32
	← Anderson69s left	10:33
	→ dopesong joined	10:34
_ikke_	The only thing I know by name is git cola, but have no experience with it	10:34
	→ harish_ joined	10:36
	← SimonNa left	10:36
	← JanC left	10:37
	→ daito joined	10:37
	→ jost_ joined	10:38
rominronin	ok, sensible question: I wish to initiate a git push in a bash script, the command asks for a password. How do I provide the password in the script - I want the script to run from start to finish without stopping	10:39
	← nfk\|laptop left	10:40
Stummi	rominronin, you don't. Use ssh-keys	10:40
	← daito left	10:41
	← dopesong left	10:42
	← troulouliou_div2 left	10:42
rominronin	Stummi: ty	10:42
	← jost left	10:42
Seveas	and if the transport is https: use credential helpers.	10:42
	← FeuerbachMilomir left	10:43
	→ Anderson69s joined	10:44
	→ lindenle joined	10:45
	→ acetakwas joined	10:46
pluszak	Hello folks, so my problem is like this. I have a project that was initiated with a copy of files by no history. I want to repair the history.	10:46
	Do I understand correctly that I should use git replace graft to create a new graft point?	10:46
	→ uglyandstupid joined	10:48
	← uglyandstupid left	10:48
	→ ohmy joined	10:49
ohmy	hello everybody	10:49
	← compac left	10:49
ohmy	i'm quite confused. suppose that i've just one branch in behalf of master and when i modify lets say a single file within my branch than i switch to my master branch git status shows the sadmac me file as being modified	10:50
	← lindenle left	10:50
	→ notebox joined	10:50
	← mikeybisbo left	10:50
CareBear\	ohmy : then you did not commit your change before switching branches	10:50
ohmy	CareBear\: hello, no, my feeling is that as far as there's no conflict we can switch between branches without problem	10:51
CareBear\	ohmy : that is correct, and everything that you have not committed is then kept in your worktree. the files in your worktree are not connected to branches	10:52
	→ JanC joined	10:52
ohmy	CareBear\: How to reproduce : Create a file in master, add/commit than switch to MyBranch modify the file (you can add it or not to the index) than switch to master (no warning is displayed), if i do cat README from within master i can see the change	10:52
	CareBear\: i've always thaught that they are connected to branches !	10:53
	CareBear\: this is why branches should have been designed non ?	10:53
CareBear\	ohmy : only things that have been committed are connected to branches	10:53
ohmy	CareBear\: :( ok	10:53
CareBear\	ohmy : uncommitted changes are just random files on your hardd disk	10:53
ohmy	CareBear\: thanks	10:54
	← mkoskar left	10:54
CareBear\	ohmy : commits are a central part of the git data model. I recommend reading the quick data model intro at http://peter.stuge.se/	10:54
	← neanderslob left	10:55
CareBear\	ohmy : until a change is committed it is not really part of the repository - only when the commit has been created does the change exist within the repo	10:55
	→ sazed_ joined	10:55
	→ pozitrono joined	10:55
CareBear\	ohmy : sorry, full link is http://peter.stuge.se/git-data-model	10:55
ohmy	CareBear\: honestly i ran into some troubles by hasard	10:56
	CareBear\: thank you so much	10:56
	← sazed left	10:57
	→ troulouliou_div2 joined	10:57
	← pantsman- left	10:57
	→ Meow-J joined	10:58
	← abc123 left	11:00
	← dcpc007 left	11:02
	→ abc123 joined	11:02
	← zmachine left	11:02
	→ zmachine joined	11:05
	← acetakwas left	11:05
	← nilg left	11:07
	← sazed_ left	11:08
	→ xaa joined	11:08
	← pozitrono left	11:10
	← sbasso_ left	11:10
	→ Flyers joined	11:10
	← ssarah left	11:15
	← Flyers left	11:15
	→ Flyers joined	11:15
pluszak	the git replace docs say I can replace one commit with another. But how can I replace root with a commit?	11:16
	→ codedmart joined	11:18
	→ Sendoushi joined	11:18
pluszak	I have a repo starting with something like "Version 2.5" which is indeed version 2.5.1 from another repo but with modifications, I want to include that 2.5.1 in history	11:18
	← alanwill left	11:19
	→ sazed_ joined	11:20
	← abc123 left	11:22
	→ abc123_ joined	11:22
	← raven-au left	11:23
	← githogori left	11:23
	mquin → evilmquin	11:24
	← reim left	11:25
	→ githogori joined	11:25
	→ mkoskar joined	11:25
	→ colli5ion joined	11:26
	→ raven-au joined	11:29
	→ tristanp joined	11:32
Sephyros	<silentz0r> giggle, gitg ...	11:32
	I have a git repo with 150 commits up to 2015-01-01 and another repo with 100 commts before 2015-01-01... same project, same folder but for some reason someone removed the repo at 2015-01-01 and started a new repo... if i copy paste and retain newer files (on hooks for example) i get the full repo... but... the SVN repo doesnt have older files... and when i do rebase git-SVN says that is already updated... if i commit something the older files will be co	11:33
	mmited? without troubles?	11:33
pluszak	okay, git replace --graft	11:33
	→ Khadafi joined	11:34
	← a3Dman left	11:35
	→ Kicer86 joined	11:35
	→ s8321414 joined	11:36
	→ a3Dman joined	11:36
	← a3Dman left	11:36
	→ a3Dman joined	11:36
	← githogori left	11:37
	← mahendra_ left	11:38
silentz0r	I need something way more capable than gitg for code review & file / hunk / line staging	11:38
	→ mellernoia joined	11:38
	← tristanp left	11:38
	→ Manikandan joined	11:39
	→ MattMaker joined	11:41
	← jost_ left	11:42
Seveas	silentz0r: git add -p	11:43
rominronin	hi, so I followed the instructions here and I'm still getting asked for password: https://help.github.com/articles/generating-ssh-keys/	11:43
	:(	11:43
	← LtHummus left	11:43
osse	rominronin: what does git remote -v say +	11:43
	← star_prone left	11:44
	→ star_prone joined	11:45
	→ sebbel joined	11:45
	→ githogori joined	11:46
	← MattMaker left	11:46
	← raven-au left	11:46
	→ dopesong joined	11:46
rominronin	osse remote -v says origin ssh://git@dev.identum.at/opt/git/test.git (fetch & pull) - I'm hosting a repo on the same server that I'm on, so that may have an impact ?	11:47
	umm, do i need to create an rsa key for user 'git'?	11:47
	is that the issue?	11:47
	→ acetakwas joined	11:48
	← sazed_ left	11:48
osse	how did you do Step 4 ?	11:48
	← acetakwas left	11:48
	→ bitkiller joined	11:48
	← UniFreak left	11:48
	→ sbasso joined	11:49
	→ acetakwas joined	11:49
	← acetakwas left	11:50
	← Sephyros left	11:50
rominronin	osse, step 4?	11:51
	I'm not using github	11:51
osse	that is why I am asking	11:51
rominronin	its a local repo,	11:51
osse	you need to do the equivalent thing for your server	11:51
rominronin	ah,	11:51
osse	basically add your pub file to /home/git/.ssh/authorized_keys	11:52
	← dopesong left	11:52
osse	or something along those lines	11:52
rominronin	doh!	11:52
	ty osse	11:53
	← mehola left	11:53
	→ abc123 joined	11:54
	← abc123_ left	11:55
	abc123 → abc123_	11:55
	→ InfoTest joined	11:55
	← Anderson69s left	11:55
	← marcelo__ left	11:58
	→ marcelofr joined	11:59
	→ ag4ve joined	11:59
	← settermjd left	11:59
	→ arup_r joined	11:59
	→ jost_ joined	12:00
	→ LtHummus joined	12:01
	← ffledgling left	12:02
	→ nilg joined	12:03
	← mhg left	12:03
	→ mhg joined	12:04
	→ mahendra_ joined	12:04
	← uranellus left	12:05
	→ Gfle joined	12:06
	→ abc123 joined	12:06
	← abc123_ left	12:07
	abc123 → abc123_	12:07
	← Gfle left	12:07
	→ ffledgling joined	12:08
	← arup_r left	12:08
	evilmquin → mquin	12:09
	→ arup_r joined	12:10
	→ mizu_no_oto joined	12:11
	→ nfk\|laptop joined	12:11
	→ jojovem joined	12:12
	← ayaz left	12:13
	← mhg left	12:14
	← cbreak left	12:15
	→ mhg joined	12:16
	→ rorro joined	12:17
	← nettoweb left	12:17
	→ pantsman- joined	12:19
	→ irqq joined	12:19
	← cagedwisdom left	12:20
	→ cbreak joined	12:20
	→ otter768 joined	12:21
	← rorro left	12:25
	→ rorro joined	12:26
	← irqq left	12:26
	← otter768 left	12:26
	→ shibly joined	12:27
	← shibly left	12:29
	← kurkale6ka left	12:30
	→ spykins joined	12:30
	← _Vi left	12:31
spykins	Hello everyone…. i am having this error on my system “fatal: failed to expand user dir in: '~./gitignore' “ .. can someone please tell me what this means?	12:31
	← nfk\|laptop left	12:31
osse	spykins: change ./ to /.	12:32
	~. means the home directory of the user named . which doesn't exist	12:32
spykins	i am trying to clone a repo and that’s what i get	12:32
osse	it's probably a typo in your .gitconfig	12:32
spykins	yes..	12:33
	how do i reconfigure it ?	12:33
	→ abc123 joined	12:33
spykins	i tried to add a folder to gitignore	12:33
	← Khadafi left	12:33
spykins	and i can’t use git anymore	12:33
	→ settermjd joined	12:33
spykins	find . -name .DS_Store -print0 \| xargs -0 git rm --ignore-unmatch	12:34
	git config --global core.excludesfile ~/.gitignore	12:34
	echo .DS_Store >> ~/.gitignore	12:34
	← Sendoushi left	12:34
spykins	i ran these codes but… changed the .DS_Store to .idea and i can’t use git anymore	12:34
canton7	no you didn't	12:34
	you ran git config --global core.excludesfile ~./gitignore	12:34
	→ nnyk_ joined	12:34
	← abc123_ left	12:34
	abc123 → abc123_	12:34
canton7	go and edit ~/.gitconfig, and change that ~./gitignore to ~/.gitignore	12:35
spykins	yes.. it is a typo	12:35
	how do i do that?	12:35
canton7	open a text editor, and open ~/.gitconfig in it	12:35
	you must know how to edit text files..	12:35
spykins	how do i get the ~/.gitconfig?	12:36
canton7	there's a file in your home directly called '.gitconfig'. edit it	12:36
	← mahendra_ left	12:36
canton7	*home directory	12:36
spykins	i see it	12:36
	can i open it in vim editor?	12:37
canton7	sur	12:37
	*sure	12:37
	use whatever text editor you like.	12:37
	... I assume you know how to use a text editor, otherwise why are you using git? :)	12:37
	→ Faylite joined	12:38
spykins	ok	12:38
	i think the file is hidded	12:38
	i am in my root dirctory and i types ls -la	12:38
canton7	"the file is hidded"?	12:38
	ffs. type 'vim ~/.gitconfig'	12:39
spykins	i see a .gitconfig	12:39
	thanks.. opened	12:39
	← mhg left	12:39
	→ mingwandroid joined	12:40
	← Sceorem left	12:41
	← iota_pi left	12:41
	→ mhg joined	12:41
spykins	please what do i change in the config?	12:42
canton7	<12:35> <canton7> go and edit ~/.gitconfig, and change that ~./gitignore to ~/.gitignore	12:42
spykins	ok	12:42
	you are very correct… that’s what i have	12:42
	→ leeN joined	12:43
spykins	Thank you so much…..	12:44
	I have been able to clone …..	12:44
	→ iota_pi joined	12:44
	→ Anderson69s joined	12:44
	← lmatteis left	12:44
	→ mhg_ joined	12:45
	→ lmatteis joined	12:46
	← mhg left	12:46
	← Alienpruts left	12:48
	→ Alienpruts joined	12:50
	→ King_Hual joined	12:51
	← King_Hual left	12:51
	→ King_Hual joined	12:51
	→ strozyka joined	12:53
	← King_Hual left	12:53
	→ King_Hual joined	12:53
	← King_Hual left	12:53
	→ King_Hual joined	12:53
	← Meow-J left	12:54
	→ localuser joined	12:54
	← paulweb515 left	12:55
	→ Sceorem joined	12:56
	→ Sephyros joined	12:57
	← abc123_ left	12:57
	← localuser- left	12:57
	← wxg left	12:57
	→ abc123 joined	12:58
	← fstd left	12:59
	→ fstd joined	12:59
	→ shiriru joined	12:59
	→ localuser- joined	13:00
	← metze_ left	13:00
	→ wethu joined	13:00
	← rorro left	13:01
	→ metze joined	13:01
	→ Anticom joined	13:02
	→ Karkus joined	13:03
	← localuser left	13:04
	← mhg_ left	13:04
	→ elastix joined	13:04
	→ reim joined	13:06
	← aard_ left	13:06
	→ roygbiv joined	13:06
	← mizu_no_oto left	13:06
	→ daito joined	13:08
	← settermjd left	13:10
	→ hanthings joined	13:10
	← abc123 left	13:11
Anticom	Hi all. I've got a repo for my project and it has a submodule which is from github. Now i've made changes to the parent repo aswell as to the submodule. I now have to push it to stash but obviously the submodule isn't pushed with all the sources etc. Problem now is, that i made some modifications to the submodule which i don't want / can't push to the original github repo. Is there any way to "move" the submodule's remote to some other repo on our stash instan	13:11
	ce?	13:11
	so i could push it to there and tell the parent repo that this is the one i actually want referenced	13:11
	→ abc123 joined	13:11
Anticom	Or is there an even more elegant / standard way to solve this problem?	13:12
	← Outsider__ left	13:12
	→ mahendra_ joined	13:13
	← daito left	13:13
	→ localuser joined	13:13
	→ GLOSS joined	13:14
	→ toogley joined	13:14
	← GLOSS left	13:14
	← abc123 left	13:15
	→ abc123_ joined	13:15
	→ lindenle joined	13:16
	← Alienpruts left	13:16
	→ fracting joined	13:16
	→ mizu_no_oto joined	13:18
	← localuser- left	13:18
	← astrofog left	13:19
	→ Alienpruts joined	13:20
	→ synthroid joined	13:21
	← strozyka left	13:22
	→ tarkus26172 joined	13:22
	← elastix left	13:23
	← lindenle left	13:23
cbreak	Anticom: fork the submodule, push there	13:23
	Anticom: change the URL of your submodule to point to the fork	13:23
	→ mezod joined	13:24
	→ SrPx_ joined	13:24
	→ SrPx joined	13:24
SrPx	I accidentally deleted a file that I shouldn't. How do I recover it as it is on the last commit?	13:24
	← SrPx_ left	13:25
_rgn	git checkout -- path/to/file	13:25
	← d0nn1e left	13:25
SrPx	With the space?	13:26
	thanks	13:26
	→ EduardoMartins joined	13:27
	→ d0nn1e joined	13:27
	→ lindenle joined	13:28
	← rnsanchez left	13:29
	[UPA]Stefan → Tronsha	13:30
	→ elastix joined	13:30
	→ MarkyC joined	13:31
	← Rynomster left	13:32
	← troulouliou_div2 left	13:33
	← elastix left	13:33
	← eijk_ left	13:35
	← MissionCritical left	13:35
	→ cena` joined	13:35
	→ dopesong joined	13:37
	← PCatinean left	13:37
	→ espindola joined	13:37
	← CussBot left	13:38
	→ rkmylo joined	13:38
	→ CussBot joined	13:38
	→ zipper joined	13:39
zipper	Hello, isn't emerge supposed to be emacs or something?	13:39
cbreak	no?	13:40
	← ohmy left	13:40
cbreak	emerge is some bsd package manager?	13:40
	→ raijin joined	13:40
	→ strozyka joined	13:40
zipper	No the diff tool	13:40
	→ SimonNa joined	13:41
osse	cbreak: gentoo	13:41
cbreak	right	13:41
	→ MattMaker joined	13:42
	← Manikandan left	13:42
osse	zipper: i think emerge is an emacs plugin	13:42
bremner	also	13:42
	git difftool knows how to use it, iirc	13:42
zipper	hmmmm I saw what I needed and it works differently. Doesn't really show a patch.	13:43
	← acolson left	13:43
	← skylite left	13:43
	← s8321414 left	13:44
	← mizu_no_oto left	13:45
	← EduardoMartins left	13:45
	→ elastix joined	13:46
	← elastix left	13:46
	← MattMaker left	13:46
qsuscs	https://github.com/google/git-appraise	13:46
	interesting.	13:46
	← wethu left	13:47
pluszak	I'm trying to fix history of a merge I've used git replace -e to add another parent to the commit, the tree looks right. How do I make it pernament now?	13:47
	git rebase seems to have conflicts	13:48
	I want to just have my replacements be perm	13:48
	→ MissionCritical joined	13:48
	→ dstarh joined	13:49
	← lindenle left	13:49
_ikke_	man git filter-branch should make it permanent	13:52
gitinfo	the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	13:52
	→ sgambino joined	13:52
	← Anderson69s left	13:53
	← espindola left	13:53
	→ lindenle joined	13:53
	→ spykins_ joined	13:54
	→ ash_workz joined	13:55
pluszak	rewriting 10k commit, that may take a while	13:56
	← mingwandroid left	13:56
	← spykins left	13:56
Anticom	cbreak: how can i fork from github to stash? :O My idea was similar. Just change the remote in the submodule to a newly created repo on stash and push there. then change ref in parent repo	13:56
	should work right?	13:56
cbreak	Anticom: git clone	13:56
Anticom	cbreak: thing is i did commit some changes in the submodule already	13:57
	→ nvahalik joined	13:57
	→ spykins joined	13:57
cbreak	you can change the submodule with a text editor in the .gitmodules file	13:57
	Anticom: doesn't matter	13:57
	Anticom: your submodule is a clone	13:57
	then commit that	13:58
	→ marscher joined	13:58
	→ Anderson69s joined	13:58
cbreak	then all users have to run git submodule sync	13:58
	← jeffreylevesque left	13:58
Anticom	no one else checked that one out yet	13:58
pluszak	_ikke_: but thank you very much, I run git filter-branch --tag-name-filter cat -- --all and we'll see	13:58
	→ PCatinean joined	13:58
Anticom	cbreak: just curious why my attempt is crap?	13:58
cbreak	Anticom: then only you have to sync	13:58
	what attempt?	13:58
	← spykins_ left	13:58
	→ achadwick joined	13:59
	→ auda joined	13:59
	→ Pseudocrat joined	14:00
	← auda left	14:00
	→ WayToDoor joined	14:00
	← raijin left	14:01
	→ rorro joined	14:01
	← arup_r left	14:01
	← lightstalker left	14:03
	← Alienpruts left	14:03
Anticom	cbreak: changing the remote of the submodule to a repo on our server where i can push it	14:05
	so it doesn't point to the original github repo anymore	14:05
	← yeshacker left	14:05
	→ sdothum joined	14:05
	← fscala left	14:06
	← jojovem left	14:06
	→ sazed joined	14:06
	→ uranellus joined	14:07
	← rominronin left	14:07
	→ mbrzuzy joined	14:08
	→ rpdprd1 joined	14:08
	← lindenle left	14:08
	→ fscala joined	14:08
cbreak	Anticom: you have to edit .gitmodules	14:08
	and then sync	14:08
	and then push	14:08
	as I said a few times	14:08
	→ relipse joined	14:08
	→ jojovem joined	14:09
	→ daito joined	14:09
	→ nfk\|laptop joined	14:09
	→ rominronin joined	14:09
	→ NashJrDev joined	14:09
	gitinfo set mode: +v	14:09
Anticom	cbreak: i just didn't get the git clone thing... sorry it's friday afternoon ;)	14:10
	→ krawchyk joined	14:10
	→ victorgama joined	14:10
	← rpdprd left	14:10
cbreak	Anticom: you already cloned, so you have your fork	14:10
	just put it somewhere where other people can get it from	14:11
NashJrDev	Question for you guys with a little more experience, as you pick up more languages in programming how easy is it to maintain your ability in other languages? (I know javascript & c# but want to expand and learn other languages but worry I'll forget the others)	14:11
Anticom	i just did `git remote set-url origin <new-url>` in the submodule, pushed it and then changed the url in .gitmodules	14:11
	← rpdprd1 left	14:12
	← MarkyC left	14:12
	← Sephyros left	14:12
	← jost_ left	14:12
	→ jost joined	14:13
pluszak	NashJrDev: so what if you forget?	14:13
	→ circ-user-LMoE9 joined	14:13
	→ Rhonda joined	14:13
	→ lindenle joined	14:14
	→ lightstalker joined	14:14
	← daito left	14:14
NashJrDev	pluszak, is it much faster relearning?	14:14
cbreak	Anticom: so, git submodule sync	14:14
NashJrDev	took me 6 months of 40 hour weeks to learn both to a decent ability	14:14
pluszak	NashJrDev: that's soooo #programming not here. But generally if you think you're a good programmer just because you know how to not shoot yourself in foot and every command in library....that's not what programming is about	14:15
NashJrDev	yea sorry I didn't know of a better channel to hit devs with more experience.	14:16
	← synthroid left	14:16
	→ synthroid joined	14:17
	← Rhonda left	14:17
NashJrDev	Do you know of good blogs / books to read for further self development as a programmer?	14:17
	→ DolphinDream joined	14:18
	→ rpdprd joined	14:18
	← MissionCritical left	14:19
	→ troulouliou_div2 joined	14:19
	→ rdnt joined	14:19
	← notebox left	14:20
	← TomyWork left	14:20
	→ Peuc joined	14:20
	← rdnt left	14:20
	→ MarkyC joined	14:21
	← msankhala left	14:21
	→ rwb joined	14:21
	← rwb left	14:21
	→ notebox joined	14:22
	→ arup_r joined	14:22
	→ otter768 joined	14:22
	→ msankhala joined	14:22
	→ jimi_ joined	14:22
	← sitaram left	14:22
	→ rwb joined	14:23
	→ TomyWork joined	14:24
	← a3Dman left	14:25
	→ jfft joined	14:26
	← otter768 left	14:26
	→ a3Dman joined	14:27
	← a3Dman left	14:27
	→ a3Dman joined	14:27
	← NashJrDev left	14:27
	→ emmajane joined	14:28
	→ sitaram joined	14:28
	← sitaram left	14:28
	→ sitaram joined	14:28
	← jfft left	14:29
	→ abc123 joined	14:29
	→ jfft joined	14:29
	→ MissionCritical joined	14:29
	→ Rhonda joined	14:30
	← abc123_ left	14:30
	abc123 → abc123_	14:30
	→ Peaker joined	14:32
	→ Psychiatrist joined	14:32
	← Rhonda left	14:33
	← xelxebar left	14:34
	← lindenle left	14:34
	← rwb left	14:34
	← rkmylo left	14:36
	→ Rhonda joined	14:36
	→ Rh0nda joined	14:36
	→ rwb joined	14:36
	← Peaker left	14:38
	→ chubbson joined	14:39
	← nickthetait left	14:39
	→ nickthetait joined	14:39
	→ iLembus joined	14:39
	→ lindenle joined	14:40
	← SrPx left	14:40
	→ SrPx joined	14:40
	gitinfo set mode: +v	14:42
	← nafg left	14:42
chubbson	what is the best approach, moving a file from one submodule to another, without loosing the history?	14:42
	→ AaronMT joined	14:43
	← emmajane left	14:43
	← AaronMT left	14:43
	→ AaronMT joined	14:44
	→ kpease joined	14:44
	→ JR33 joined	14:45
	← kpease left	14:45
	← sebbel left	14:45
	→ kpease joined	14:45
	→ cdg joined	14:46
cbreak	chubbson: there are no good ones	14:47
	want one of the bad ones?	14:47
chubbson	yeah ^^ actually im checking this one: http://blog.neutrino.es/2012/git-copy-a-file-or-directory-from-another-repository-preserving-history/	14:47
	← lb left	14:48
	→ skul joined	14:48
	→ emmajane joined	14:49
	← Rh0nda left	14:49
	← Rhonda left	14:49
cbreak	chubbson: filter-branch to delete all files apart from the one you want to keep	14:50
	then subtree merge that one	14:50
	← SrPx left	14:51
	→ Alienpruts joined	14:51
	→ Rhonda joined	14:51
	→ SrPx joined	14:51
	→ abc123 joined	14:52
	← abc123_ left	14:53
	abc123 → abc123_	14:53
	← Rhonda left	14:53
	→ netcarver joined	14:54
	→ Rhonda joined	14:55
	→ phaleth joined	14:58
	← Rhonda left	14:58
	→ subhojit777 joined	14:58
	← rscata left	14:59
	← lindenle left	14:59
	← fracting left	15:00
	← josuebrunel left	15:01
	← lmatteis left	15:01
	← MarkyC left	15:01
	← alexsystemf_- left	15:01
	→ josuebrunel joined	15:01
	← josuebrunel left	15:01
	→ josuebrunel_ joined	15:01
	→ Rhonda joined	15:02
	← iota_pi left	15:02
	→ lindenle joined	15:03
	→ josuebrunel joined	15:04
	← josuebrunel left	15:04
	← elsevero left	15:04
	→ iota_pi joined	15:04
	→ lmatteis joined	15:04
	← notebox left	15:04
	→ alexsystemf_- joined	15:04
	← phaleth left	15:06
	→ julius___ joined	15:09
	← julius___ left	15:09
	← jfft left	15:09
	→ rnsanchez joined	15:09
	→ ril_ joined	15:09
	→ julius joined	15:10
	→ ayaz joined	15:10
julius	hi	15:10
	← David1977 left	15:11
	→ jfft joined	15:11
chubbson	hmm kk, ill check that. never worked woth subtree before, just with submodule. does the concept of subtree exist in mercurial? (little more expirienced wit hq)	15:11
julius	i can ignore all files with *, then i can add directories that i want with "git add -f somedir" but how can i ignore a subdirectory of somedir?	15:11
	→ KnightsOfNi joined	15:12
	← _cyril__ left	15:12
chubbson	.plg # ignores all .plg files	15:12
	← SrPx left	15:13
chubbson	GeneratedArtifacts/ #should ignore the hole directory 'generatedartifacts'	15:13
	does this help?	15:13
julius	im working from the starting point to ingore anything, and then include just a few files	15:13
jast	julius: if you're using -f, ignore patterns no longer apply. the solution is to not use -f. or to 'git rm --cached -r subdir' after you've used it.	15:13
julius	just saving some configs from my home dir	15:13
	← ash_workz left	15:14
julius	what you said is true, but not the question	15:14
	→ ash_workz joined	15:14
jast	I can tell you how to ignore a subdir (pattern: /dir/subdir), but due to -f it won't have any effect in your scenario	15:14
	anyway, I have to go sit in a meeting now	15:14
	← sarri left	15:15
	→ raijin joined	15:16
julius	git rm --cached -fr .config/hexchat/scrollback/ <- that one seems to work, nice	15:16
chubbson	ok, next try. probably that could help: https://gist.github.com/chubbson/7f396ccd13c644ddf3ff	15:16
	→ sarri joined	15:17
	→ nettoweb joined	15:18
	← julius left	15:18
	→ Sucks joined	15:19
	→ happy-dude joined	15:20
	→ jellie joined	15:21
	→ IrishPrime joined	15:21
	← IrishPrime left	15:21
	→ skapunker joined	15:21
	← arup_r left	15:21
	← zipper left	15:22
	jellie → zipper	15:22
	← lindenle left	15:22
	→ ferr joined	15:23
	← nvahalik left	15:24
	→ kentzo joined	15:24
	→ jbudz joined	15:24
	→ luke_penn joined	15:25
	← nilg left	15:26
kentzo	Hi. I have cloned a repo with --no-single-branch and --depth 1. At some point, parent branch was rebased. How can I sync my local branch to the remote one (by loosing all the local changes) ?	15:26
	→ yoh_ joined	15:26
	→ mingwandroid joined	15:27
	← Anticom left	15:27
	→ vane- joined	15:27
	← SimonNa left	15:27
yoh_	Using git 2.1.4 on debian jessie . Upon git commit -m "message" -a there is a .git/COMMIT_EDITMSG left behind. This forbids using this repository in a 'shared' setting whenever umask is standard 022	15:28
	is this a known issue which may be was fixed later?	15:28
	→ lindenle joined	15:28
	→ Es0teric joined	15:28
yoh_	tried now on debian testing/sid with 2.6.2 -- the same issue!	15:29
osse	yoh_: it's not very common to share repos	15:29
grawity	how is it a 'shared' setting if the umask is 022?	15:29
	usually shared repos have core.sharedRepository set and Git takes care of umasks etc. to allow this	15:29
	← raijin left	15:29
yoh_	grawity: ;) good question BUT still should be legit I guess -- files would get committed to objects	15:29
	just the other memebers wouldn't be able to modify your files in place	15:30
grawity	well like I just said	15:30
	← Junior left	15:30
grawity	if it's shared, use core.sharedRepository, `git init --shared`, etc	15:30
osse	yoh_: you can use a post-commit hook to delete it	15:30
	← Anderson69s left	15:30
yoh_	yes -- git takes care about permissions etc for all the .git/objects etc	15:30
grawity	and Git will make sure the necessary files are group-writable or world-writable	15:30
	→ jellie joined	15:30
	← powered left	15:30
yoh_	so is that by design to leave that file behind for some reason even if commit action was quite "atomic"?	15:30
osse	yes	15:31
	well	15:31
yoh_	for what purpose?	15:31
osse	git commit --amend for example	15:31
kentzo	Can I force rev-parse to resolve name relative to remote?	15:31
	→ mrx-420 joined	15:31
yoh_	that one should take commit msg from the git HEAD not from some forgotten behind file (I hope that it does that I mean)	15:31
osse	hmm	15:32
	then maybe it has no purpose if the commit is successful	15:32
yoh_	yeap -- does take it from git history and not that file (as it should )	15:32
	jellie → urbanslug	15:32
osse	anyway, a post commit can take care of it	15:33
yoh_	checked by checking out another branch where last commit msg was different	15:33
	← zipper left	15:33
yoh_	well -- the question is why should I bother about some hooks at all?	15:33
	← CussBot left	15:33
yoh_	is it is a shared (and it is) and git does take care about all the permissions, but not of this file, feels like a bug	15:33
	← lolmac left	15:34
osse	the --shared stuff is mostly for bare repos	15:34
yoh_	"mostly" is a good spec ;)	15:34
	→ notebox joined	15:34
	← nfk\|laptop left	15:34
	→ CussBot joined	15:34
osse	i don't think shared repos like this are a common use case	15:34
	maybe it is	15:35
	→ Anderson69s joined	15:35
	→ localuser- joined	15:35
	→ hfp joined	15:36
	→ tristanp joined	15:37
	→ hfp_work joined	15:37
	→ charlieWONG joined	15:38
	→ howdoi joined	15:38
	→ CausaMortis-LT joined	15:39
	← codedmart left	15:39
	← localuser left	15:40
	→ codedmart joined	15:40
	← tristanp left	15:41
	→ MarkyC joined	15:41
	urbanslug → zipper	15:42
	← CausaMortis left	15:42
	→ MattMaker joined	15:42
	← roelmonnens left	15:42
	← lindenle left	15:43
	→ SrPx joined	15:43
	← CausaMortis-LT left	15:44
	→ eijk_ joined	15:44
	← MattMaker left	15:46
	→ nfk\|laptop joined	15:47
	← Alienpruts left	15:48
	→ lindenle joined	15:48
	→ nafg joined	15:48
	← netcarver left	15:49
	→ sparetire_ joined	15:50
	← mrx-420 left	15:50
	← spykins left	15:51
	emmajane → emmajane\|afk	15:51
	→ Ahmed90 joined	15:51
	→ killa_kyle joined	15:53
	emmajane\|afk → emmajane	15:54
	emmajane → emmajane\|afk	15:54
	→ spuz joined	15:54
spuz	hi what command should i use to find out whether or not the commits from a branch exist on the current branch?	15:55
	→ axtx joined	15:55
	← PCatinean left	15:57
	← notebox left	16:01
Sc0rpius	git branch --contains <commit>	16:01
	what would list your local branches that contains the specified commit	16:02
	more on the manual of git-branch	16:02
	← Sceorem left	16:03
	← SrPx left	16:03
	← rorro left	16:03
	← josuebrunel_ left	16:03
	→ kfpratt joined	16:03
	→ mellernoia-work joined	16:03
	→ josuebrunel joined	16:03
	← mellernoia left	16:04
	→ kilo_bravo joined	16:04
	→ cbonobo joined	16:04
	→ fatalhalt joined	16:04
	→ abc123 joined	16:04
	← abc123_ left	16:04
	abc123 → abc123_	16:04
	← wwwald left	16:05
	→ crayon joined	16:05
	→ SrPx joined	16:05
	← mellernoia-work left	16:05
	→ mellernoia joined	16:05
	← shiriru left	16:06
	← lindenle left	16:06
	← pantsman- left	16:06
	← LeBlaaanc left	16:06
	← SrPx left	16:06
	← SOLDIERz left	16:06
	→ _nadim joined	16:07
	← quackgyver left	16:07
	← da5id left	16:08
	→ nvahalik joined	16:08
	→ kadoban joined	16:08
zotherstupidguy	how to list tree of HEAD?	16:08
_ikke_	git ls-tree HEAD	16:08
	→ Alissa joined	16:08
	← nadim left	16:09
	→ SrPx joined	16:09
zotherstupidguy	will that list nested trees as well?	16:09
_ikke_	git ls-tree -r HEAD will	16:09
	→ daito joined	16:10
zotherstupidguy	_ikke_ any idea how to do that on github api?	16:10
_ikke_	nope	16:10
zotherstupidguy	_ikke_ thanks appreciate it	16:10
	← netj left	16:11
	→ netj joined	16:11
	← TomyWork left	16:11
	← clmsy left	16:12
	→ ewrqwe joined	16:13
	→ da5id joined	16:13
	gitinfo set mode: +v	16:13
	→ quackgyver joined	16:13
	→ clemf joined	16:13
	→ MechtiIde joined	16:13
	← SrPx left	16:14
	← daito left	16:14
	→ iamtakingiteasy joined	16:14
	← ayaz left	16:15
	→ lindenle joined	16:15
	ril_ → ril[away]	16:15
	ril[away] → ril_	16:16
	→ lucha joined	16:16
	→ aqxea joined	16:17
	← msankhala left	16:18
	→ SrPx joined	16:20
	← aqxea left	16:20
	→ notebox joined	16:20
	→ espindola joined	16:21
	← tarkus26172 left	16:21
	← leeN left	16:22
	← JR33 left	16:22
	← jfft left	16:22
	← cebor left	16:22
	← luke_penn left	16:23
	→ EricPoe joined	16:23
	→ otter768 joined	16:23
	← freimatz left	16:23
	← synthroid left	16:23
	→ cebor joined	16:23
	← _nadim left	16:23
	→ _nadim joined	16:23
	→ _Atom_ joined	16:23
	← SrPx left	16:24
	→ abc123 joined	16:24
	→ iLembus_ joined	16:25
	← abc123_ left	16:25
	abc123 → abc123_	16:25
	→ SrPx joined	16:25
	← sukima left	16:26
	← jnavila left	16:26
	← jojovem left	16:26
	→ synthroid joined	16:26
	→ Aboba joined	16:27
	→ jojovem joined	16:27
	← otter768 left	16:27
	← ewrqwe left	16:28
	← lindenle left	16:28
	← Hounddog left	16:28
	← iLembus left	16:29
	← EricPoe left	16:29
	→ msankhala joined	16:29
	→ IrishPrime joined	16:29
	→ thebwt joined	16:29
	← cena` left	16:30
	← synthroid left	16:31
	→ mhg_ joined	16:31
	→ lindenle joined	16:31
	→ arved joined	16:32
arved	what can i do if "git merge branch" does not create a new file from "branch"?	16:33
canton7	so 'branch' has the file, and the current branch does not?	16:33
_ikke_	find out if your expecations match	16:33
arved	canton7: yes	16:34
canton7	arved, did 'branch' add the file, or did your current branch delete the file?	16:34
arved	it added the file	16:34
canton7	is this repo public?	16:35
arved	unfortunately no ...	16:35
	← msankhala left	16:36
canton7	well, either something else is going on which you haven't mentioned, or something you've said isn't true :P	16:36
arved	the file is in a new directory with several others, but only two of the new files are there	16:37
	→ The_Phoenix joined	16:37
	← mahendra_ left	16:37
arved	how can i find out, what isn't true or what i have missed to mention?	16:37
	→ BillCriswell joined	16:37
_ikke_	arved: does git diff --name-status --diff-filter=A HEAD branch return?	16:38
	assuming you are now on the branch you want to merge into	16:38
	← notebox left	16:38
arved	_ikke_: it lists the file with "A"	16:38
	← dopesong left	16:39
	← Anderson69s left	16:39
arved	i tried it on a different machine and same result, so it is not the checkout that got corrupted	16:42
	→ localuser joined	16:42
	→ MattMaker joined	16:43
	← sbasso left	16:43
	→ Guest10 joined	16:43
	← lindenle left	16:44
	→ Gamecubic joined	16:44
	← mellernoia left	16:44
	← clemf left	16:45
_ikke_	arved: what about git ls-tree -r HEAD \| grep file	16:45
	or better	16:45
	git ls-tree HEAD path/to/file	16:46
	← Faylite left	16:46
	← localuser- left	16:46
	→ Faylite joined	16:47
	← ril_ left	16:47
arved	no output	16:47
	← jojovem left	16:47
	← MattMaker left	16:48
	→ synthroid joined	16:48
	→ jojovem joined	16:48
	→ lindenle joined	16:48
	← localuser left	16:49
	← lucha left	16:49
	← nfk\|laptop left	16:49
	→ cbonobo_ joined	16:50
	← cbonobo left	16:51
arved	could it be that git stops merging a new directory if there is a conflict?	16:51
	because for another file in the new directory it claims it was "deleted by us" though that is as far as i know wrong	16:52
	→ skylite joined	16:52
canton7	oh, so you're in the middle of a conflict right now?	16:52
	yeah, that's something that you forgot to mention, heh	16:53
arved	yes	16:53
canton7	so, what's the output of 'git status'?	16:53
	← synthroid left	16:53
arved	it is not showing the new file	16:54
	← Shentino left	16:55
arved	in the directory it shows one file as new, one as "deleted by us" and the others are missing	16:55
	→ m1dnight1 joined	16:56
	← cbonobo_ left	16:56
	← m1dnight_ left	16:56
	→ dipk joined	16:56
	m1dnight1 → m1dnight_	16:56
	← espindola left	16:56
canton7	the fact that there's a conflict which doesn't match your expectations implies to me that either you're not actually merging what you think you're merging, or you're not merging into what you think you're merging into	16:56
arved	hm, very philosophical :)	16:57
	→ mischat joined	16:57
	→ LeBlaaanc joined	16:57
	→ sangy joined	16:58
	← nvahalik left	16:58
arved	now how can i find out were my thoughts are wrong?	16:58
	← Darcidride left	16:59
canton7	I find a graphical history viewer like gitk or !lol very useful in visualising what you're merging	16:59
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	16:59
	→ abc123 joined	16:59
	← ferr left	16:59
	→ nvahalik joined	16:59
	← Es0teric left	17:00
	← Guest10 left	17:01
	← josuebrunel left	17:01
rory	oh my god my history is disgusting!	17:01
	→ Khadafi joined	17:02
rory	I was better off ignorant	17:02
	← abc123_ left	17:03
	← mhg_ left	17:03
	→ Shentino joined	17:03
arved	well it will be quite difficult to find something, there are several 100 commits in each branch some of them have been cherry-picked before	17:03
	← troulouliou_div2 left	17:03
	← abc123 left	17:03
	→ abc123_ joined	17:03
arved	maybe i will just try to readd the files in a separate commit	17:04
	← InfoTest left	17:05
	→ petersr joined	17:07
	← m1dnight_ left	17:07
	→ notebox joined	17:07
	← lindenle left	17:08
	← sangy left	17:08
	← King_Hual left	17:08
	→ dreiss joined	17:08
	← petersr left	17:08
	→ synthroid joined	17:10
	← albel727 left	17:10
	← synthroid left	17:11
	← CussBot left	17:11
	→ CussBot joined	17:11
	→ synthroid joined	17:11
	← notebox left	17:11
	→ troulouliou_div2 joined	17:12
	← troulouliou_div2 left	17:12
	→ CorySimmons joined	17:12
	→ madewokherd joined	17:13
	← silentz0r left	17:13
	→ lindenle joined	17:13
	emmajane\|afk → emmajane	17:13
	→ albel727 joined	17:13
	← charlieWONG left	17:13
	← mbrzuzy left	17:14
	→ MattMaker joined	17:14
	← ItSANgo_ left	17:14
	← rominronin left	17:14
	→ hans3000 joined	17:15
	→ durham joined	17:15
	← hans3000 left	17:15
	→ ferr joined	17:17
	← Khadafi left	17:18
	← WayToDoor left	17:18
	→ aard_ joined	17:20
	← emmajane left	17:22
	← chubbson left	17:22
	→ emmajane joined	17:22
	→ m0viefreak joined	17:26
	← Balliad left	17:27
	← kentzo left	17:28
	→ arup_r joined	17:28
	← subhojit777 left	17:29
	← Peuc left	17:30
	← ferr left	17:31
	← lindenle left	17:31
	→ m1dnight_ joined	17:32
	→ Peuc joined	17:32
	→ ril joined	17:32
	→ ferr joined	17:33
	→ raijin joined	17:33
	← abc123_ left	17:33
	→ abc123 joined	17:33
	← ril left	17:34
	→ yqt joined	17:34
	→ lindenle joined	17:35
	→ codeman joined	17:38
	→ Noldorin joined	17:38
	← gfixler left	17:38
	← ThomasLocke left	17:38
	← b100s left	17:39
ag4ve	is there a way to commit changes where lines don't match a regex?	17:40
	← Aboba left	17:40
ag4ve	basically i want to make a commit but i've added "warn" lines (because i'm still debugging) and don't want to include them	17:40
	← encod3 left	17:41
	← Noldorin left	17:42
ag4ve	i basically want a: grep -vE '^warn .*'	17:42
	→ thiago_ joined	17:42
kadoban	ag4ve: You know about 'git add -p' I assume? You can do it manually, though if there's a bunch of them it'll be tedious.	17:42
	→ subhojit777 joined	17:42
	← albel727 left	17:43
	→ pwnz0r joined	17:43
ag4ve	yeah, i've got a ton, so just doing a %s/^warn.\*//g and then undoing post commit would be easier	17:44
	← rubyonrailed left	17:44
	← nettoweb left	17:44
	→ Darcidride joined	17:44
ag4ve	so i was hoping git had some automagic way to exclude based on regex	17:44
	← SrPx left	17:44
	→ albel727 joined	17:45
	→ vF3hNGxc47h8 joined	17:45
	← hyperair left	17:45
	→ clemf joined	17:45
ag4ve	mmmm, :g/^word .\*/d in vim, but at any rate	17:45
	→ SrPx joined	17:47
	→ rubyonrailed joined	17:47
	← jimi_ left	17:47
	→ tang^ joined	17:49
	→ flaguy48 joined	17:49
	← ciampix left	17:50
	← lindenle left	17:50
	← chll left	17:50
	iLembus_ → iLembus	17:51
	← weox left	17:52
	→ faux___ joined	17:53
	→ JosephSilber joined	17:54
	← JosephSilber left	17:55
	→ JosephSilber joined	17:56
	→ lindenle joined	17:56
	← roygbiv left	17:57
	→ espindola joined	17:57
	← vF3hNGxc47h8 left	17:57
	→ nettoweb joined	17:57
	← ferr left	17:58
	← killa_kyle left	17:59
	← sazed left	17:59
	→ mehola joined	18:00
	→ samw joined	18:00
	← _joes___ left	18:01
	← espindola left	18:02
	← marscher left	18:03
	← Darcidride left	18:04
	← mehola left	18:06
	→ marscher joined	18:07
	→ Limes_ joined	18:07
	→ paulweb515 joined	18:07
	→ daito joined	18:11
	← cdg left	18:12
	← rubyonrailed left	18:13
	← lindenle left	18:14
	← daito left	18:15
	→ lindenle joined	18:16
	→ mbrzuzy joined	18:16
	→ killa_kyle joined	18:17
	← faux___ left	18:17
	← killa_kyle left	18:18
	→ Aboba joined	18:19
	→ faux___ joined	18:19
	→ frem joined	18:23
	→ otter768 joined	18:24
	← lindenle left	18:24
	→ bolin joined	18:25
	← yqt left	18:25
	→ mrx-420 joined	18:28
	← mrx-420 left	18:28
	← otter768 left	18:28
	→ durham_ joined	18:28
	→ lindenle joined	18:29
	← pwnz0r left	18:29
	→ pwnz0r joined	18:29
	← jbudz left	18:30
	← dreiss left	18:30
	→ jagob joined	18:31
	← tvw left	18:31
	→ mehola joined	18:31
	← durham left	18:31
	→ rubyonrailed joined	18:32
	← marscher left	18:32
	← star_prone left	18:33
	← pwnz0r left	18:34
	→ gopar joined	18:34
	← iota_pi left	18:35
	→ graSP joined	18:35
	← arup_r left	18:37
	← mehola left	18:37
	→ tristanp joined	18:38
	→ roygbiv joined	18:38
	← graSP left	18:38
	← faux___ left	18:39
	← The_Phoenix left	18:40
	→ mehola joined	18:40
	→ deepy joined	18:41
	← lindenle left	18:41
	← jrnieder left	18:42
	← doener left	18:42
	→ Mannequin joined	18:42
	→ jbudz joined	18:43
	← tristanp left	18:43
	← abc123 left	18:44
	→ abc123_ joined	18:44
	→ chucky_z joined	18:44
	→ faux___ joined	18:45
	→ Sasazuka joined	18:45
	← skapunker left	18:46
	→ danmulvey joined	18:46
	→ lindenle joined	18:48
	← PaulCapestany left	18:51
	← Shentino left	18:51
	← achadwick left	18:52
	→ Shentino joined	18:52
	← rnsanchez left	18:53
	→ PaulCapestany joined	18:54
	→ tvw joined	18:54
	→ yqt joined	18:55
	→ cdg joined	18:55
	→ doener joined	18:58
	← Sucks left	18:58
	← diogenese left	18:58
	→ killa_kyle joined	18:59
	→ skapunker joined	18:59
	← cdg left	19:00
	← killa_kyle left	19:00
	← mischat left	19:00
	← SrPx left	19:00
	→ jayeshsolanki joined	19:01
	← IrishPrime left	19:02
	→ SrPx joined	19:02
	← SrPx left	19:02
	→ ascarter joined	19:04
	← discord left	19:04
	→ abc123 joined	19:04
	→ mischat joined	19:05
	← abc123_ left	19:06
	abc123 → abc123_	19:06
	← fees left	19:06
	→ Sucks joined	19:07
	→ ferr joined	19:07
	← samw left	19:07
	→ discord joined	19:08
	→ tristanp joined	19:08
	→ samw joined	19:09
	← mbrzuzy left	19:13
	← tristanp left	19:13
	→ jimi_ joined	19:13
	→ jottr joined	19:14
	→ phrozensilver joined	19:14
	→ abc123 joined	19:14
	← jottr left	19:14
	← samw left	19:14
	← abc123_ left	19:14
	abc123 → abc123_	19:14
	← iLembus left	19:15
	→ jottr joined	19:15
	← lindenle left	19:15
	← jottr left	19:16
	← jimi_ left	19:16
	← ascarter left	19:16
	→ SrPx joined	19:18
	→ samw joined	19:19
	← nettoweb left	19:19
	→ lindenle joined	19:20
	← toogley left	19:20
	← paulweb515 left	19:20
	→ toogley joined	19:21
	→ mbrzuzy joined	19:22
	→ espindola joined	19:23
	→ pozitron joined	19:23
	← espindola left	19:23
	→ aranea joined	19:24
	← pozitron left	19:24
	→ oxsyn joined	19:24
	→ nkouevda joined	19:24
	→ jottr joined	19:25
	← mbrzuzy left	19:26
	→ d4rklit3 joined	19:27
	← mingwandroid left	19:28
	← raijin left	19:29
	→ tristanp joined	19:30
	← CorySimmons left	19:30
	← LeBlaaanc left	19:30
	→ editshare-ericf joined	19:30
	← vane- left	19:31
	→ notebox joined	19:31
	→ dreiss joined	19:31
	→ paul424 joined	19:32
	← bolin left	19:33
	← lindenle left	19:33
	→ nettoweb joined	19:33
	→ killa_kyle joined	19:35
DANtheBEASTman	I want to maintain my own little fork of something, I made a separate branch, committed my changes. when new updates are available, i should `git checkout master && git pull && git checkout mybranch && git rebase` ? or is there an better/easier way to do this?	19:36
	← jds left	19:36
	← faux___ left	19:38
	← fatalhalt left	19:39
	→ faux___ joined	19:40
Seveas	DANtheBEASTman: git fetch origin; git rebase origin/master	19:40
	you could even delete your local master branch if you don't care about it	19:40
	← d4rklit3 left	19:41
DANtheBEASTman	fwiw, in this case it's the oh-my-zsh library, my changes are just prompt colors, but i imagine it's a common enough scenario that i should probably learn how to do it properly..	19:41
	→ ciampix joined	19:42
	← killa_kyle left	19:42
DANtheBEASTman	i bit more googling is in order i suppose	19:42
	s/^i/a/	19:42
	← Sucks left	19:43
	→ mizu_no_oto joined	19:43
torbjorn	im trying to delete a remote branch, which seems to work, only to have it pop back in at next fetch/pull	19:44
	→ boombatower joined	19:44
torbjorn	if I try to git push origin --delete thatbranch , it says remote ref does not exist	19:45
	though git branch -r lists it	19:45
	← jottr left	19:45
torbjorn	and git branch -dr happily deletes it again	19:46
canton7	torbjorn, !repro please? pastebin a terminal session of 'git branch -r', you failing to delete it, etc	19:46
gitinfo	torbjorn: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	19:46
	← Aboba left	19:46
torbjorn	https://gist.github.com/anonymous/5a623cd514eecbef8d6f	19:48
	← faux___ left	19:48
	← clemf left	19:48
	→ rpg joined	19:48
canton7	including git push --delete?	19:48
	since that's what actually deletes a branch off a remote repo	19:48
	← durham_ left	19:48
canton7	'git branch -dr' just deletes the remote tracking branch	19:48
	→ killa_kyle joined	19:49
	← rpd left	19:49
torbjorn	ah the additional /origin's confused me	19:50
canton7	got it? ;)	19:50
	→ lindenle joined	19:50
canton7	learn about what a !remote_tracking_branch is, and how they work	19:50
gitinfo	Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'	19:50
canton7	they're kinda key to everything, but very few tutorials cover exactly what they are	19:51
	→ julius joined	19:51
	← julius left	19:51
	← nettoweb left	19:51
torbjorn	i see. how do they come into existance?	19:51
canton7	'git fetch' creates them	19:51
	← marcogmonteiro left	19:51
	← killa_kyle left	19:52
	→ killa_kyle joined	19:52
canton7	'git fetch' will look at the remote and go "ok, I see a branch called master. I'll download everything in that and mirror it to a local read-only branched called 'origin/master'". Likewise any other branches it finds on the remote	19:52
	→ tomog999 joined	19:53
	← nafg left	19:53
	→ jamesheston joined	19:53
	→ bollullera joined	19:53
	← mehola left	19:53
	→ abc123 joined	19:54
	← abc123_ left	19:54
	abc123 → abc123_	19:54
	→ nfk\|laptop joined	19:55
	→ bronson joined	19:55
	→ raijin joined	19:55
	← tomog999_ left	19:56
	← samw left	19:57
	← subhojit777 left	19:57
ojacobson	`git branch -r` reads _local_ information, `git fetch` updates that information. because of reasons, it doesn't delete any of the local information it fetches, by default.	19:59
	→ diogenese joined	19:59
	→ jottr joined	19:59
ojacobson	`git fetch --prune` will delete any "extra" local refs that no longer correspond to remote refs	20:00
	← nnyk_ left	20:00
	→ samw joined	20:01
	← samw left	20:01
	→ durham joined	20:03
	← abc123_ left	20:03
	→ abc123 joined	20:04
	← raijin left	20:06
	→ raijin joined	20:06
	→ jstimm joined	20:07
	thiago_ → thiago	20:08
	← howdoi left	20:08
	→ LeBlaaanc joined	20:08
	← reim left	20:09
	→ d4rklit3 joined	20:09
	← lindenle left	20:10
	→ settermjd joined	20:10
	→ reim joined	20:10
	→ samw joined	20:11
	→ daito joined	20:11
	← reim left	20:11
	← abc123 left	20:13
	→ abc123_ joined	20:13
	← MechtiIde left	20:14
	→ nettoweb joined	20:14
	← nettoweb left	20:16
	→ CheckDavid joined	20:16
	← jottr left	20:16
	← albel727 left	20:16
	← daito left	20:16
	→ nettoweb joined	20:17
	← _nadim left	20:18
	→ _nadim joined	20:18
	→ julius joined	20:18
julius	hi	20:18
	→ lindenle joined	20:18
julius	in a file that has differences, is the part below <<<<<<< HEAD the local one or the remote?	20:19
	→ rpg_ joined	20:19
	→ DavidDudson joined	20:19
	→ Sucks joined	20:20
relipse	so I had a 1.8gb repo, I followed the instructions using git filter branch rm BIGFILE and then did git push -f and now my repo is 3.5 gb	20:20
	→ mbrzuzy joined	20:21
	→ localuser- joined	20:21
thiago	which repo is "my repo" here?	20:21
grawity	the local one, or the remote one?	20:21
	Git does not throw away data instantly, only in batches	20:21
	and `git filter-branch` keeps backups in the local repo until you manually delete them	20:22
relipse	yeah i followed some directions to do a garbage clean up, but maybe it didnt' do anything	20:22
	← rpg left	20:23
thiago	delete the repo in the server, recreate and re-push	20:23
	→ opencard joined	20:23
Seveas	relipse: try !bfg. Easier to get right :)	20:23
gitinfo	relipse: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)	20:23
julius	brb	20:23
	→ weox joined	20:23
	← fscala left	20:23
	← samw left	20:24
	← DavidDudson left	20:24
	→ jottr joined	20:24
	→ otter768 joined	20:25
	← SrPx left	20:25
	→ DavidDudson joined	20:25
	→ macmod joined	20:25
	→ fscala joined	20:25
	→ _cyril__ joined	20:26
	→ abc123 joined	20:26
	← jojovem left	20:27
	← creppe left	20:27
	← abc123_ left	20:28
	← otter768 left	20:29
	← colli5ion left	20:29
	← mariuscc left	20:29
	→ nnyk_ joined	20:30
	← jamesheston left	20:30
	→ albel727 joined	20:30
	← abc123 left	20:31
	→ abc123_ joined	20:31
	→ Yeomra joined	20:31
	← notebox left	20:31
	→ pozitron joined	20:31
	← skcin7 left	20:32
	→ eb joined	20:32
	→ Balliad joined	20:33
	→ FireArrow133 joined	20:33
	zipper → Guest29036	20:34
	→ samw joined	20:34
	← Guest29036 left	20:34
	→ [cust] joined	20:35
	← jayeshsolanki left	20:35
	← samw left	20:40
	→ star_prone joined	20:41
	← mezod left	20:41
	→ mariuscc joined	20:41
	← BillCriswell left	20:45
	← star_prone left	20:45
	→ star_prone joined	20:48
	← star_prone left	20:48
	→ SrPx joined	20:49
	→ star_pro_ joined	20:49
	→ clemf joined	20:50
	← synthroid left	20:53
	← star_pro_ left	20:53
	← SrPx left	20:54
	→ King_Hual joined	20:54
	← roxlu left	20:54
	← King_Hual left	20:54
	→ King_Hual joined	20:55
	← King_Hual left	20:55
	→ King_Hual joined	20:55
	→ vdv joined	20:55
	→ samw joined	20:55
	→ paulweb515 joined	20:55
	← settermjd left	20:56
	← Balliad left	20:56
	← bronson left	21:00
	← PeterBooker left	21:00
	← wallyduchamp left	21:02
	← a3Dman left	21:02
	← macmod left	21:02
	→ daito joined	21:03
foul_owl	Hi folks. I used git diff @{u} to determine what the difference is between origin and my local copy. Now I have decided I want to just nuke my local changes and have my local copy match origin. How do I do that?	21:03
	For the branch I'm on only	21:03
	← vdv left	21:03
	→ jfran joined	21:04
_ikke_	git reset --keep @{u}	21:04
	← toogley left	21:04
	← eka left	21:04
	→ abc123 joined	21:04
	← jfran left	21:05
	→ toogley joined	21:05
	← Nugget left	21:05
	← circ-user-LMoE9 left	21:05
	→ a3Dman joined	21:05
	← dstarh left	21:06
	→ Nugget joined	21:06
	← abc123_ left	21:06
	abc123 → abc123_	21:06
foul_owl	So if I start making new changes and finally do a push	21:06
	Will that push the history of my "failed attempt" also?	21:06
	Or will it just nuke that history? (which is desired)	21:07
	← daito left	21:07
	→ daito joined	21:08
	← lindenle left	21:08
	← Jackneill left	21:08
	← ferr left	21:09
_ikke_	the latter	21:10
	git will only push reachable history	21:10
	That it, when this is the only branch that contains those changes	21:10
	→ bronson joined	21:10
	→ espindola joined	21:11
	→ oojacoboo joined	21:12
	→ circ-user-LMoE9 joined	21:12
foul_owl	So the reset nukes the history of those few commits I made?	21:12
	Thanks for the help!	21:12
	← daito left	21:13
	← localuser- left	21:14
	→ sangy joined	21:15
	← mariuscc left	21:15
	← jottr left	21:16
	← nettoweb left	21:16
	← Faylite left	21:17
	→ nettoweb joined	21:17
	→ gaen joined	21:20
	← aard_ left	21:20
	→ Aboba joined	21:20
	→ lindenle joined	21:21
	← espindola left	21:21
	→ hackel joined	21:22
	← Pseudocrat left	21:22
	← nettoweb left	21:24
	← d4rklit3 left	21:24
	← rwb left	21:24
	→ nettoweb joined	21:24
	→ d4rklit3 joined	21:26
	← Ahmed90 left	21:26
	← roygbiv left	21:26
	← marcelofr left	21:27
	→ iLembus joined	21:27
	← sgambino left	21:27
	← jas4711 left	21:29
	→ josuebrunel joined	21:30
	→ cdg joined	21:30
	→ jamesheston joined	21:30
	← jamesheston left	21:30
DolphinDream	can i reset the origin/branch to point o to an earlier commit (locally) without chaning aytyhing on the remote ?	21:31
	as if i have never pushed my latest changes	21:32
	(needed to test scripts)	21:32
	→ leeN joined	21:33
	← kadoban left	21:33
_ikke_	if you must, you can use man git update-ref	21:35
	→ abc123 joined	21:35
gitinfo	the git-update-ref manpage is available at http://jk.gs/git-update-ref.html	21:35
DolphinDream	thx _ikke_	21:35
	← tvw left	21:37
	→ neanderslob joined	21:38
	← abc123_ left	21:38
	abc123 → abc123_	21:38
	← rpg_ left	21:41
	→ rpg joined	21:41
	→ cagedwisdom joined	21:41
	← raijin left	21:42
	← Kicer86 left	21:42
	← zotherstupidguy left	21:43
	→ BlueProtoman joined	21:46
	← Flyers left	21:46
	← Mannequin left	21:46
	→ ncthom91 joined	21:47
	→ Flyers joined	21:47
	← lindenle left	21:47
	← Limes_ left	21:47
	→ rpg_ joined	21:47
	← rpg_ left	21:47
	→ riots joined	21:48
BlueProtoman	I recently nuked my hard drive and reinstalled Kubuntu 15.10 and Windows 8.1. I just migrated all of my code from my old installation to my new one...however, the permissions for each of the files in this one Git repo (and probably others, but haven't checked) have changed from 0644 to 0774, and "chmod -R 0644 ./*" won't revert them (it reports a success, but the mode doesn't really change). Is this a Git problem or a Linux problem?	21:48
	→ Limes_ joined	21:49
	← DolphinDream left	21:49
	→ lindenle joined	21:50
	← Limes_ left	21:50
	← rpg left	21:50
	→ Limes_ joined	21:51
	← Karkus left	21:52
	← paulweb515 left	21:52
	→ paulweb515 joined	21:52
	→ leb joined	21:53
	→ ItSANgo joined	21:53
	← lindenle left	21:54
	→ lindenle joined	21:54
	→ nilg joined	21:54
riots	lets say i do git clone https://github.com/desandro/masonry.git make my changes im ready to commit and push. But dont want to commit/push back to that repo. I want to push to my own repo. how would one go about that?	21:55
	→ Karkus joined	21:57
	← axtx left	21:57
	→ Wetmelon joined	21:57
	← mizu_no_oto left	21:57
	← Karkus left	21:57
	← phrozensilver left	21:57
	← abc123_ left	21:58
	← BlueProtoman left	21:58
	→ The_Phoenix joined	21:59
	→ abc123 joined	21:59
tobiasvl	riots: man git remote	21:59
gitinfo	riots: the git-remote manpage is available at http://jk.gs/git-remote.html	21:59
tobiasvl	riots: "git remote add" your repo, push to your new remote: man git push	22:00
gitinfo	riots: the git-push manpage is available at http://jk.gs/git-push.html	22:00
milki	is there a simple way to export a single object from a git repo	22:00
	← lindenle left	22:00
milki	i want to mirror a repo but it has corrupt objects. if i can put them in the target repo first, then the git push should be happy	22:00
	→ raijin joined	22:01
	→ lindenle joined	22:01
	→ Balliad joined	22:02
	→ maletor joined	22:02
	← Balliad left	22:02
	→ griotspeak joined	22:02
	→ Balliad joined	22:02
Seveas	milki: git cat-file blob sha1 > my.file	22:03
	and in the target repo git hash-object -w my.file	22:03
milki	it might not be a file. i want an arbitrary git object	22:03
	o	22:03
	right	22:04
	cat-file does the ascii object	22:04
	→ dobrev joined	22:04
milki	Seveas: good idea. /me tries	22:04
Seveas	arbitrary object I don't know. This one only works for blobs	22:04
milki	o	22:04
Seveas	for arbitrary objects, just copy the file from .git/objects/?	22:04
milki	i think it might work for commit objects too	22:04
	← The_Phoenix left	22:04
milki	Seveas: i have to find it first. if its in a pack, then i have to find the pack and unpack it	22:04
	← dobrev left	22:04
milki	>.>	22:04
Seveas	can't unpack a corrupt object	22:05
milki	its gonna fsck it?	22:05
	grr	22:05
Seveas	but you can just copy the pack	22:05
	gaen → gaen[away]	22:05
milki	the pack could be large	22:05
	-.-	22:05
Seveas	can you give some details about the corruption? (git fsck output)	22:05
milki	the date is invalid	22:05
	milki looks for paste	22:06
	→ The_Phoenix joined	22:06
milki	remote: error: object c1eddff4ee3f62b6039f1083651b9118883e7f07:invalid author/committer line - bad time zone	22:06
	remote: fatal: Error in object	22:06
Seveas	that's not corrupt	22:06
milki	o, good	22:06
	then its unpackable	22:06
Seveas	that's been broken when created. You'll need to rewrite history to get rid of that	22:07
	← samw left	22:07
milki	i dont plan to do that. im hoping i can just scp the single object	22:07
	so it doesnt get sent over git protocal and checked	22:07
Seveas	but then you still can't do anything with it, like creating more clones.	22:07
	→ Karkus joined	22:08
milki	clones dont seem to verify the objects	22:08
	← lindenle left	22:08
Seveas	how did that commit get created?	22:08
milki	its only on push	22:08
	probably a long time ago	22:08
	milki looks on github	22:08
	→ str__ joined	22:08
	→ lindenle joined	22:09
milki	https://github.com/boto/boto/commit/cb8aeec987ddcd5fecd206e38777b9a15cb0bcab	22:09
	← str__ left	22:09
milki	wait	22:09
	wrong commit	22:09
	-.-	22:09
	https://github.com/boto/boto/commit/c1eddff4ee3f62b6039f1083651b9118883e7f07	22:10
	https://github.com/boto/boto/commit/c1eddff4ee3f62b6039f1083651b9118883e7f07.patch	22:10
	Date: Thu, 1 Jan 1970 00:00:00 +0000	22:10
	→ samw joined	22:10
	→ _Vi joined	22:10
milki	timestamp is 1288373970 --700	22:10
Seveas	yeah, that's been created by something that's not git	22:11
milki	ah	22:11
Seveas	something buggy	22:11
	→ str__ joined	22:11
milki	so like one of those cross-dvcs tools	22:11
	← The_Phoenix left	22:11
Seveas	or eclipse	22:11
	→ HelloAtMega joined	22:11
milki	aha	22:11
Seveas	anyway, I really recommend biting the bullet and rewriting history.	22:12
	← _Atom_ left	22:12
	→ jfft joined	22:12
milki	this is a public repo -.-	22:12
	http://docs.pythonboto.org/en/latest/	22:12
	thats not gonna be possible	22:12
Seveas	even more reason to fix it.	22:12
milki	look not mine	22:13
	er	22:13
	like	22:13
str__	Hi!	22:13
gitinfo	str__: 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.	22:13
Seveas	boto3 doesn't have that commit so the problem will go away as boto3 takes over :)	22:13
milki	>.>	22:13
	<.<	22:13
	← MarkyC left	22:13
	← ItSANgo left	22:14
	← jfft left	22:15
	← samw left	22:15
	← lindenle left	22:16
	← noteness left	22:17
	→ ItSANgo joined	22:17
	← phantomcircuit left	22:17
	← paul424 left	22:17
	→ lindenle joined	22:18
	→ samw joined	22:20
	← quenode left	22:21
	← nnyk_ left	22:21
	← samw left	22:21
	→ noteness joined	22:22
	→ nour joined	22:23
	← darkschneider left	22:23
	← emmajane left	22:23
	→ darkschneider joined	22:23
	← gaen[away] left	22:24
	→ blackwind_123 joined	22:24
	→ abacuspowers joined	22:24
	→ otter768 joined	22:25
	← madewokherd left	22:26
	→ nour_ joined	22:26
	← nour_ left	22:26
	← bronson left	22:27
	→ gaen joined	22:27
	← lindenle left	22:28
	← gopar left	22:29
	→ rpd joined	22:30
	← otter768 left	22:30
	← skapunker left	22:30
	→ lindenle joined	22:30
	→ samw joined	22:30
milki	darn	22:30
	i imported the file	22:31
	→ rpg joined	22:31
milki	need to be explicit about the object type with cat-file and hash object	22:31
	but the push is still checking the object	22:31
	hmm	22:31
Seveas	that's actually not surprising	22:32
	← griotspeak left	22:32
	← strozyka left	22:32
milki	maybe i need to give it a reference	22:32
Seveas	push wants to send all objects corresponding to the commits it wants to send	22:32
	→ paul424 joined	22:32
Seveas	so try pushing up to the commit before the broken one	22:33
	and then in the mirror, fething from the upstream one	22:33
milki	remote: fatal: pack has 2258 unresolved deltas	22:34
	error: unpack failed: index-pack abnormal exit	22:34
	darn	22:34
	it tried to resolve the ref to the single commit object	22:34
	Seveas: hm, ok	22:34
	← bitkiller left	22:34
	→ tomek joined	22:36
	← ash_workz left	22:36
	← lindenle left	22:36
	→ jottr joined	22:37
	← _nadim left	22:38
	→ star_prone joined	22:38
	→ _nadim joined	22:38
	← star_prone left	22:38
	→ phrozensilver joined	22:39
	→ star_prone joined	22:39
	← star_prone left	22:39
	→ star_prone joined	22:40
	← star_prone left	22:40
	→ lindenle joined	22:40
	→ star_prone joined	22:40
	← star_prone left	22:41
	→ toothrot joined	22:41
	→ nadim joined	22:41
	← leb left	22:41
	→ skapunker joined	22:41
	← _nadim left	22:41
	→ star_prone joined	22:42
	← nkouevda left	22:42
	← star_prone left	22:42
	← jottr left	22:43
	→ star_prone joined	22:43
	← skapunker left	22:43
	← star_prone left	22:43
	→ skapunker joined	22:44
	← codedmart left	22:44
	→ _nadim joined	22:44
	→ star_prone joined	22:44
	← nadim left	22:44
	→ tvw joined	22:44
	← star_prone left	22:45
	← skapunker left	22:45
	← toogley left	22:45
	→ star_prone joined	22:45
	← star_prone left	22:46
	→ star_prone joined	22:46
	← star_prone left	22:46
milki	lolol	22:47
	ok	22:47
	→ star_prone joined	22:47
milki	so i imported enough objects for git fsck to be happy somehow	22:47
	→ skapunker joined	22:47
milki	and the push is working	22:47
	so wierd	22:47
	← star_prone left	22:47
	← Psychiatrist left	22:48
	→ star_prone joined	22:48
milki	we'll see if the resulting repo has a happy fsck too	22:48
	← star_prone left	22:49
	→ star_prone joined	22:49
milki	yup	22:49
	git fsck is happy	22:49
	← star_prone left	22:50
milki	so... if i just import those five and build a pack from it, maybe i can scp it	22:50
	→ star_prone joined	22:50
	← star_prone left	22:50
	→ star_prone joined	22:51
	← star_prone left	22:51
	→ star_prone joined	22:52
	← star_prone left	22:52
	← skapunker left	22:52
	→ star_prone joined	22:52
	← star_prone left	22:53
	→ star_prone joined	22:53
	← mbrzuzy left	22:53
	← iLembus left	22:53
milki	1 commit, 3 trees, 1 blob	22:54
	milki shrugs	22:54
	← rpg left	22:54
	← lindenle left	22:54
ojacobson	What are you even building	22:54
	← star_prone left	22:54
	→ star_prone joined	22:55
	← star_prone left	22:55
	← nfk\|laptop left	22:55
	← King_Hual left	22:55
	→ star_prone joined	22:56
	← nilg left	22:56
milki	ojacobson: just trying to git push --mirror a repo	22:56
	← star_prone left	22:56
	← jbudz left	22:56
	→ star_prone joined	22:56
	← Balliad left	23:01
	← star_prone left	23:01
	→ skapunker joined	23:01
	← _nadim left	23:04
	→ phaleth joined	23:04
	← _cyril__ left	23:05
	← riots left	23:05
	→ _nadim joined	23:05
	← josuebrunel left	23:06
	→ lindenle joined	23:06
	← killa_kyle left	23:07
	← grootseun left	23:07
	→ grootseun joined	23:08
	→ daito joined	23:09
	→ bodom joined	23:10
	← blackjid left	23:10
milki	hmm	23:10
	maybe now ...	23:10
	i might have to push the ancestors still	23:10
	count-objects confuses me	23:10
	→ blackjid joined	23:11
bodom	Hi there! I have a folder inside a git repo with a .git file on it. Does this file have a special meaning to git? I couldn't find any hint on google	23:11
milki	bodom: .git contains all the repo information	23:11
Nugget	the .git /directory/ does	23:11
milki	bodom: the directory containing the .git folder is a git repo	23:11
Nugget	is it really a file?	23:11
milki	it could be a gitlink	23:12
	→ star_prone joined	23:12
bodom	milki: that i know, but thi is a file	23:12
	← discord left	23:12
bodom	Nugget: yep, it is a file	23:12
	← star_prone left	23:12
	← raijin left	23:12
Nugget	does it actually contain any data? I don't think it's from .git in any event	23:13
	← daito left	23:13
	→ star_prone joined	23:13
Nugget	there's .gitignore files but not .git files	23:13
	→ SrPx joined	23:13
	← star_prone left	23:13
	→ elastix joined	23:13
	→ jbudz joined	23:13
bodom	Nugget: yes, it contains "gitdir: ../.git/modules/core"	23:13
	← elastix left	23:13
	→ raijin joined	23:14
	→ star_prone joined	23:14
	← DavidDudson left	23:14
Nugget	huh, that may be a thing	23:14
	https://groups.google.com/forum/#!msg/repo-discuss/1TJr_aHfGm0/032CzSW7E6EJ	23:14
	possibly relevant	23:14
	← star_prone left	23:14
	→ star_prone joined	23:14
jast	so that sounds like your folder is a submodule of the main repo	23:15
	!submodule	23:15
gitinfo	git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules	23:15
	← star_prone left	23:16
bodom	jast: you are right :)	23:16
	→ star_prone joined	23:16
	→ jbudz_ joined	23:16
jast	and this file is to let git know that your submodule is a repo, too, so you can view its history and stuff	23:16
bodom	milki, Nugget, jast: thank you :)	23:16
	← star_prone left	23:16
bodom	yep, mistery solved	23:17
jast	for various reasons, submodules store their metadata in .git/modules in the main repo, and this is a reference so it can find that while you're in the submodule	23:17
	→ Balliad joined	23:17
	→ star_prone joined	23:17
	← tvw left	23:17
	← star_prone left	23:17
	← dfaught left	23:17
	→ mac_ified joined	23:17
	← jbudz left	23:18
	→ star_prone joined	23:18
	← victorgama left	23:18
	← star_prone left	23:18
	→ star_prone joined	23:18
	→ skapunker_ joined	23:18
	← gaen left	23:19
	← star_prone left	23:19
	→ star_prone joined	23:19
	← skapunker left	23:19
	→ italoacasas joined	23:20
	← italoacasas left	23:21
	→ faux___ joined	23:22
	← awx_ left	23:22
	→ italoacasas joined	23:22
	← faux___ left	23:22
	← star_prone left	23:23
	→ faux___ joined	23:24
	← kpease left	23:24
	→ dregad joined	23:27
	→ bronson joined	23:27
	→ gaen joined	23:28
	← faux___ left	23:28
	→ winter__ joined	23:29
	← ShapeShifter499 left	23:29
	→ ferr joined	23:29
	← phaleth left	23:29
	→ madewokherd joined	23:31
	← Balliad left	23:32
	← Karkus left	23:32
	← bronson left	23:32
	→ gopar joined	23:33
	← SrPx left	23:35
	← editshare-ericf left	23:36
	← cagedwisdom left	23:38
	→ SrPx joined	23:38
	← mischat left	23:38
	→ mischat joined	23:38
	→ bronson joined	23:39
	← xaa left	23:39
	← samw left	23:39
	← a3Dman left	23:40
	← bronson left	23:40
	← nettoweb left	23:40
	→ samw joined	23:40
	→ bronson joined	23:40
	→ doge_ joined	23:41
	← abc123 left	23:43
	→ abc123_ joined	23:43
	→ a3Dman joined	23:44
	← mischat left	23:44
	← mek42 left	23:45
	→ mek42 joined	23:45
	← samw left	23:45
	← mek42 left	23:45
	← govg left	23:45
	← raijin left	23:48
	← spuz left	23:48
	← CheckDavid left	23:49
	→ raijin joined	23:49
	← doge_ left	23:50
	→ lldoge joined	23:50
	→ xaa joined	23:52
	← cdg left	23:54
	→ mizu_no_oto joined	23:56
	← codeman left	23:58

Logs Search ←Prev date Next date→

Channels Documentation