IRCloggy #git 2016-10-20

Provider of IRC logs since 2005.

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

	2016-10-20
	→ alex1a joined	00:00
	→ dsdeiz_ joined	00:04
	→ Dohplay joined	00:04
	← dsdeiz left	00:04
buddyq	osse, it's working... only kink is that git fetch to github from my hosts ask for a password. I thought the ssh key was to bypass that.	00:05
	← dreiss left	00:07
	→ jimi_ joined	00:08
	← boombatower left	00:08
	→ Coka joined	00:09
	→ mischat joined	00:09
	← Coka left	00:10
	→ nettoweb joined	00:11
	← hahuang65 left	00:12
	→ hahuang65 joined	00:12
	← alex1a left	00:13
	→ star_prone joined	00:13
	← mischat left	00:14
	→ peey joined	00:15
	← CussBot left	00:16
peey	I created a subdirectory within my git repo and did a git init in that directory and pushed the subdirectory to remote. I then pushed the changes to original repo to the remote, but when I try to clone it it gives me No submodule mapping found in .gitmodules for path 'new'. What should I do?	00:17
	← star_prone left	00:18
	→ unbalancedparen joined	00:18
	← dyek left	00:19
	→ Rodya_ joined	00:20
	← nettoweb left	00:22
	← crayon left	00:22
	→ alex1a joined	00:22
	→ denimsoft joined	00:24
	← barteks2x left	00:26
	← KnownSyntax left	00:27
	← nitric left	00:27
	→ CussBot joined	00:27
	→ KnownSyntax joined	00:28
	← LeBlaaanc left	00:31
	→ jstein_ joined	00:31
	jstein → Guest21501	00:31
	→ zivester joined	00:33
	jstein_ → jstein	00:33
	→ Derperperd joined	00:33
	← peey left	00:33
	→ nettoweb joined	00:34
	→ e14 joined	00:34
	← Guest21501 left	00:35
	← denimsoft left	00:38
	← nettoweb left	00:39
	→ kulelu88 joined	00:40
BPL	Any cmake contributor over here?	00:40
	← jstein left	00:40
	← hahuang65 left	00:40
	→ hahuang65 joined	00:41
	← dsantiago left	00:41
	→ lagothrix joined	00:43
	→ anonymuse joined	00:45
	← publio left	00:45
	← cagedwisdom left	00:47
	parsnip0 → parsnip	00:48
	→ thebope joined	00:48
	→ Goplat joined	00:51
	→ einnjo joined	00:53
	← thebope left	00:53
	→ evanwang joined	00:55
	← e14 left	00:56
	← _cyril_ left	00:57
	→ fstd_ joined	00:58
	← fstd left	00:58
	← axisys left	00:58
	← Gsham_ left	00:59
	fstd_ → fstd	00:59
	→ CussBot_ joined	00:59
	CussBot → Guest28095	00:59
	CussBot_ → CussBot	00:59
	← Guest28095 left	00:59
	← HoierM left	01:00
	← pks left	01:02
	→ pks joined	01:03
	← sunri5e left	01:03
	→ Jameser joined	01:04
	→ dreiss joined	01:05
	→ sunri5e joined	01:06
	→ ochorocho__ joined	01:07
	← einnjo left	01:08
	← parsnip left	01:09
	→ mischat joined	01:10
	← d^sh left	01:11
	← dreiss left	01:11
	→ d^sh joined	01:11
	← evanwang left	01:11
	← ochorocho__ left	01:12
	→ Motoko joined	01:12
	→ al-damiri joined	01:12
	→ krs93 joined	01:13
	← plos left	01:13
	← ResidentBiscuit left	01:14
	← hahuang65 left	01:14
	← skunkz left	01:14
	← mischat left	01:15
	← krs93 left	01:17
	→ krs93 joined	01:17
	← littleforest left	01:18
	← svm_invictvs left	01:20
	← CussBot left	01:20
	→ Dougie187 joined	01:21
	→ CussBot_ joined	01:21
	CussBot_ → CussBot	01:21
	→ plos joined	01:21
	← Sasazuka__ left	01:25
	→ parsnip joined	01:26
	→ axisys joined	01:26
	← CussBot left	01:26
	← plos left	01:26
	→ CussBot joined	01:26
	← Dougie187 left	01:28
	→ finalbeta joined	01:29
	← fxer left	01:33
	← tvw left	01:34
	→ plos joined	01:34
	← jimi_ left	01:39
	← Skryll left	01:39
	← plos left	01:39
	← harish_ left	01:39
	→ ResidentBiscuit joined	01:39
	← EvilPenguin left	01:42
	← brokensyntax left	01:44
	← ResidentBiscuit left	01:46
	→ brokensyntax joined	01:47
	← drbean left	01:47
	← drmt left	01:49
	→ thebope joined	01:49
	→ drbean joined	01:50
	← buddyq left	01:50
	← modlin left	01:52
	← aspiers left	01:53
	→ Vampire0_ joined	01:53
	→ liuzhen joined	01:54
	← thebope left	01:54
	← Jameser left	01:55
	→ Limes_ joined	01:55
	← BPL left	01:55
	→ BPL joined	01:56
	← Vampire0 left	01:57
	← BPL left	01:57
	← pks left	02:00
	→ pks joined	02:02
	← Rodya_ left	02:02
	← sunri5e left	02:02
	← kyan left	02:03
	→ sunri5e joined	02:04
	→ Jameser joined	02:06
	→ aspiers joined	02:06
	← msonntag left	02:06
	→ Wulf joined	02:07
	→ msonntag joined	02:07
	→ plos joined	02:10
	→ star_prone joined	02:13
	→ jstimm joined	02:13
	← Limes_ left	02:14
	→ kyan joined	02:15
	← star_prone left	02:17
	← flavius left	02:18
	→ Rodya_ joined	02:20
	→ svm_invictvs joined	02:22
	← Rodya_ left	02:23
	→ Rodya_ joined	02:24
	← hexagoxel left	02:24
	← xshuiniu left	02:24
	← alex1a left	02:24
	← Jameser left	02:24
	→ safe joined	02:25
	← SwiftMatt left	02:25
	← plos left	02:26
	→ hexagoxel joined	02:26
	← shakalaka left	02:26
	← fahadash left	02:26
	← yohnnyjoe left	02:26
	← svm_invictvs left	02:27
	→ shakalaka joined	02:28
	← a3Dman left	02:28
	← Anja left	02:30
	→ Dougie187 joined	02:33
	→ a3Dman_ joined	02:38
	→ Gsham joined	02:39
	← Gsham left	02:39
	← krs93 left	02:40
	← Dougie187 left	02:40
	→ Gsham joined	02:40
	← whitby left	02:40
	→ evanwang joined	02:42
	← Motoko left	02:42
	→ Anja joined	02:43
	← dsdeiz_ left	02:43
	→ dsdeiz joined	02:43
	→ fedepad joined	02:43
	← govg left	02:44
	→ xall joined	02:44
	← chachasmooth left	02:45
	→ dsantiago joined	02:46
	← fedepad left	02:48
	→ howdoi joined	02:48
	→ chachasmooth joined	02:49
	← sangy left	02:49
	→ lagothri1 joined	02:50
	→ thebope joined	02:50
	← Gsham left	02:52
	→ chartractegg joined	02:52
	→ Gsham joined	02:53
	← lagothrix left	02:53
	← neunon left	02:55
	← thebope left	02:55
	← brokensyntax left	02:55
	→ Wulf4 joined	02:56
	→ brokensyntax joined	02:56
	← unbalancedparen left	02:57
	→ littleforest joined	02:57
	→ mangolisk joined	02:59
	← Wulf left	02:59
	Wulf4 → Wulf	02:59
	← Gsham left	03:00
	← hashpuppy left	03:01
	→ xshuiniu joined	03:01
	→ ResidentBiscuit joined	03:02
	← blackwind_123 left	03:02
	→ harish_ joined	03:02
	← dsantiago left	03:03
	→ aavrug joined	03:03
	→ blackwind_123 joined	03:03
	← xall left	03:04
	← dviola left	03:04
	→ e14 joined	03:06
	← brokensyntax left	03:06
	→ brokensyntax joined	03:07
	← anonymuse left	03:08
	← e14 left	03:08
	→ e14 joined	03:09
	→ chartrac_ joined	03:09
	← chartractegg left	03:10
	→ mischat joined	03:12
	→ gasull joined	03:14
	→ Vortex35 joined	03:14
	→ nettoweb joined	03:14
	← gasull left	03:14
	→ buddyq joined	03:15
	← nettoweb left	03:15
	← Vortex34 left	03:16
	← mischat left	03:17
	→ Andrew_K joined	03:18
	→ justrohu joined	03:20
	→ chartractegg joined	03:21
	← chartrac_ left	03:21
	→ govg joined	03:23
	→ fahadash joined	03:24
	← skyfaller left	03:25
	→ alex1a joined	03:26
	← mountpoint left	03:27
	→ rchavik joined	03:28
	→ AndreSomers joined	03:28
	← littleforest left	03:28
	← e14 left	03:29
	→ boombatower joined	03:31
	← al-damiri left	03:32
	→ neunon joined	03:36
	← brokensyntax left	03:38
	→ krs93 joined	03:40
	→ brokensyntax joined	03:41
	← durham left	03:41
	← PioneerAxon left	03:41
	→ PioneerAxon joined	03:42
	→ demo joined	03:42
	→ xall joined	03:43
	← tax left	03:45
	← arescorpio left	03:45
parsnip	demo: hi	03:47
	→ thebope joined	03:51
	← safe left	03:51
	→ dreiss joined	03:52
	→ mehola joined	03:54
	→ a_thakur joined	03:54
	← thebope left	03:55
	← govg left	03:55
	→ mizu_no_oto joined	03:57
	← kyan left	03:58
	← kulelu88 left	04:00
	← ResidentBiscuit left	04:01
	→ Motoko joined	04:03
	← tjone270 left	04:03
	← Rodya_ left	04:06
	→ shaggycat joined	04:07
	→ peterR`` joined	04:08
	→ Rodya_ joined	04:10
	← lindenle left	04:10
	→ LeBlaaanc joined	04:11
	→ thiago joined	04:12
	← LeBlaaanc left	04:12
	→ mischat joined	04:13
	← demo left	04:14
	← Rodya_ left	04:14
	← mischat left	04:17
	→ Rodya_ joined	04:20
	← chartractegg left	04:21
	← foist left	04:23
	→ svm_invictvs joined	04:24
	← zivester left	04:24
	← liuzhen left	04:25
	→ cagedwisdom joined	04:25
	→ eshlox joined	04:25
	→ littleforest joined	04:25
	← SpeakerToMeat left	04:27
	→ chartractegg joined	04:28
	← dreiss left	04:30
	← Anja left	04:31
	→ Anja joined	04:31
	← xameada left	04:32
	← chartractegg left	04:34
	← Cabanossi left	04:35
	→ Cabanossi joined	04:37
	← rafalcpp_ left	04:39
	→ ToBeCloud joined	04:41
	gitinfo set mode: +v	04:41
	→ mycelium joined	04:43
	← aidalgol left	04:44
	← svm_invictvs left	04:44
	→ daey_ joined	04:45
	← romerocesar left	04:46
	← daey left	04:48
	daey_ → daey	04:48
	→ brillenfux joined	04:51
	→ thebope joined	04:52
	→ phanimahesh joined	04:52
	→ xameada joined	04:52
	→ dsantiago joined	04:54
	← parsnip left	04:54
	← Ryanar left	04:55
	← thebope left	04:56
	← Rodya_ left	04:57
	← dermoth left	05:00
	→ dermoth joined	05:00
	→ ayogi joined	05:01
	← mizu_no_oto left	05:01
	← msonntag left	05:01
	→ sea-gull joined	05:01
	→ GT4066 joined	05:01
	→ govg joined	05:02
	← frobnic left	05:02
	→ msonntag joined	05:02
	→ frobnic joined	05:04
	← shaggycat left	05:05
	→ romerocesar joined	05:05
	← sdothum left	05:06
	→ bmahe joined	05:09
	→ svm_invictvs joined	05:10
	→ lindenle joined	05:11
	→ anotheryou_ joined	05:13
	→ shaggycat joined	05:13
	→ mischat joined	05:14
	← lindenle left	05:15
	→ hahuang65 joined	05:17
	← anotheryou_ left	05:18
	← mischat left	05:19
	→ dan2k3k4 joined	05:22
	← mycelium left	05:26
	← fahadash left	05:26
	← CEnnis91 left	05:28
	→ _geoff joined	05:31
	← Karunamon left	05:32
	← boombatower left	05:32
	→ Karunamon joined	05:32
	→ parsnip joined	05:34
	→ BanaShip3hs joined	05:36
	← BanaShip3hs left	05:37
	← Anja left	05:39
	← romerocesar left	05:39
	← Karunamon left	05:40
	→ Karunamon joined	05:41
	← bongjovi left	05:44
	→ zeroed joined	05:45
	← Karunamon left	05:46
	→ spb joined	05:46
	→ diogenese joined	05:46
	→ Karunamon joined	05:46
	→ robogoat joined	05:46
	← diogenese left	05:47
	← brokensyntax left	05:47
	← _geoff left	05:48
	← bluezone left	05:48
	← theskillwithin left	05:49
	→ brokensyntax joined	05:49
	→ qt-x joined	05:49
	→ mure joined	05:49
	← brokensyntax left	05:50
	→ dreiss joined	05:50
	→ brokensyntax joined	05:50
	← mure left	05:50
	→ Murii joined	05:51
	→ ThomasLocke joined	05:52
	← Karunamon left	05:52
	→ me_and joined	05:52
	→ thebope joined	05:53
	→ diogenese joined	05:54
	→ kaldoran joined	05:54
	→ liuzhen joined	05:55
	← Dohplay left	05:55
	→ Anja joined	05:55
	→ Raging_Hog joined	05:57
	← thebope left	05:57
	→ jaguarmagenta joined	06:00
	→ LeBlaaanc joined	06:01
	→ LucaTM joined	06:03
	← jaguarmagenta left	06:03
	← LeBlaaanc left	06:03
	→ Repox joined	06:04
	→ Karunamon joined	06:04
	← nidr0x left	06:04
	→ cdown joined	06:04
	→ jaguarmagenta joined	06:04
	→ subhojit777 joined	06:04
	← jaguarmagenta left	06:05
	→ jaguarmagenta joined	06:05
	→ ahmedelgabri joined	06:08
	→ lb1c joined	06:08
	← jaguarmagenta left	06:09
	→ jaguarma_ joined	06:09
	← ahmedelgabri left	06:09
	→ cdown_ joined	06:09
	→ fedepad joined	06:09
	→ ahmedelgabri joined	06:09
	→ rendar joined	06:10
	← jaguarma_ left	06:10
	→ Rhonda joined	06:10
	← liuzhen left	06:10
	← harish_ left	06:10
	← qt-x left	06:11
	→ rscata joined	06:11
	← cdown left	06:12
	cdown_ → cdown	06:12
	→ chele joined	06:12
	← gniourf left	06:13
	→ qt-x joined	06:13
	← raspado left	06:14
	→ gniourf joined	06:14
	→ liuzhen joined	06:14
	→ raspado joined	06:14
	→ mischat joined	06:15
	→ roelmonnens joined	06:18
	← raspado left	06:19
	→ aidalgol joined	06:20
	→ jnavila joined	06:21
	→ JeroenT joined	06:22
	← cdown left	06:24
	← mischat left	06:24
	← littleforest left	06:25
	→ cdown joined	06:26
	← cdown left	06:26
	← b100s left	06:26
	→ cdown joined	06:28
	← buddyq left	06:29
	← ahmedelgabri left	06:30
	→ zulutango joined	06:32
	→ freimatz joined	06:32
	← CheckDavid left	06:33
pitastrudl	hello	06:33
	← govg left	06:33
pitastrudl	should i have my gitignore file synced in the repo?	06:33
	← madewokherd left	06:34
	← drbean left	06:34
	→ bocaneri joined	06:38
	← cagedwisdom left	06:38
kadoban	pitastrudl: Usually, yeah.	06:38
	← Wulf left	06:38
	→ Wulf joined	06:38
	→ bruce_lee joined	06:39
	← bruce_lee left	06:39
	→ bruce_lee joined	06:39
pitastrudl	i was wondering how LF and CLRF work, i get the warning "LF will be replaced by CRLF in git "	06:39
	like will windows/unix care or will it become unreadable by either	06:39
	→ cyan__ joined	06:39
	← bocaneri left	06:40
	← bmahe left	06:41
	→ bocaneri joined	06:41
	→ bmahe joined	06:42
	→ star_prone joined	06:42
	→ gtristan joined	06:43
	← djb-irc left	06:44
	← tyreld left	06:45
	← star_prone left	06:45
	→ star_prone joined	06:45
	← hahuang65 left	06:45
	→ ISmithers1 joined	06:46
	← ISmithers left	06:46
	← brokensyntax left	06:46
	→ cdown_ joined	06:46
	→ elect joined	06:47
	→ brokensyntax joined	06:47
	← cdown left	06:48
	→ qpdb joined	06:50
	→ corsibu joined	06:50
	← ToBeCloud left	06:50
	→ cagedwisdom joined	06:51
	→ cdown joined	06:51
	← cdown_ left	06:51
	→ fees joined	06:52
	→ cdown_ joined	06:53
	→ thebope joined	06:53
	← cdown left	06:56
	cdown_ → cdown	06:56
	→ overlord_tm joined	06:57
	→ OCram85 joined	06:57
	← thebope left	06:58
	← johnny56 left	06:58
	← xall left	06:58
	← ISmithers1 left	06:58
	← sea-gull left	06:58
	← todd_dsm left	07:00
	→ JeroenT_ joined	07:01
	← JeroenT left	07:03
	→ xall joined	07:03
	← alphor left	07:04
	← albel727 left	07:04
	→ shirty joined	07:06
	→ TomyWork joined	07:07
	→ alphor joined	07:07
	→ WayToDoor joined	07:07
	← hariel left	07:07
	→ Jameser joined	07:08
	→ lordjancso joined	07:09
	← liuzhen left	07:09
	← dreiss left	07:10
	→ liuzhen joined	07:10
	→ drbean joined	07:11
	→ eduardas_m joined	07:12
	→ harish_ joined	07:12
	← bmahe left	07:14
	→ cdown_ joined	07:15
	→ vuoto joined	07:16
	← cdown left	07:18
	→ cdown joined	07:20
	← cdown_ left	07:21
_ikke_	pitastrudl: Depends on the program	07:22
	pitastrudl: On linux, crlf might show up as two new lines	07:22
	lf might not show as new line in windows at all (in notepad for example)	07:23
	← qpdb left	07:23
pitastrudl	i see	07:23
	← Motoko left	07:24
pitastrudl	will have to find a way on how to go about it i guess	07:24
	im getting that warning when im trying to sync the gitignore file	07:24
	i edited it in vim, on git bash in windows	07:24
osse	pitastrudl: what does 'file .gitignore' say ?	07:24
	matthiaskrgr_ → matthiaskrgr	07:25
pitastrudl	ASCII text	07:25
osse	that's it?	07:25
pitastrudl	thats it	07:25
	→ Haliucinas joined	07:25
osse	hmm, open it in vim. what's does ':set ff?' say?	07:26
pitastrudl	osse do i know u from somewhere, i feel like i've seen u on another irc channel	07:26
	fileformat=unix	07:26
osse	pitastrudl: what does 'git show HEAD:.gitignore \| file -' say?	07:27
	→ ahmedelgabri joined	07:27
pitastrudl	fatal: Path '.gitignore' exists on disk, but not in 'HEAD'.	07:27
	/dev/stdin: no read permission	07:27
	← jnewt left	07:27
pitastrudl	huh	07:27
	→ Balliad joined	07:28
	→ elastix joined	07:28
osse	oh it's a new file?	07:29
	i'd commit it and then re-run that command	07:29
	← cdown left	07:29
pitastrudl	ok	07:29
osse	I have a feeling some of git's warning messages say "foo will be replaced by bar" when it should've been the other way around.	07:29
pitastrudl	git show HEAD:.gitignore \| file -	07:30
	/dev/stdin: ASCII text	07:30
osse	or maybe repo settings mean it should be crlf and git is confused	07:30
	ok, good.	07:30
pitastrudl	why does it matter if its in ascii?	07:30
osse	now remove the file. then git checkout HEAD -- .gitignore	07:30
	→ cdown joined	07:30
osse	It doesn't. in this case file will print either "ASCII text" or "ASCII text with CRLF terminators".	07:31
	→ systemovich joined	07:31
	→ jnewt joined	07:31
pitastrudl	oh wait	07:31
	remove it from where?	07:31
osse	disk	07:31
	rm .gitignore	07:31
	← cdown left	07:31
osse	so that git recreates it	07:31
	← krs93 left	07:31
pitastrudl	oh, forgot to do that before i used "git checkout HEAD -- .gitignore"	07:31
	so i should git reset?	07:31
osse	it's fine	07:31
	rm and do it again	07:32
	→ eka joined	07:32
	→ buddyq joined	07:32
	→ cdown joined	07:32
	← mangolisk left	07:33
pitastrudl	ok i deleted the gitignore, and now?	07:33
	how do i pull it back?	07:33
osse	git checkout HEAD -- .gitignore	07:33
pitastrudl	ohh	07:34
	what did that line do?	07:34
	→ johnny56 joined	07:34
osse	as you put it, it "pulled it back"	07:34
pitastrudl	well now it's ".gitignore: ASCII text, with CRLF line terminators"	07:34
	so that's good i guess	07:34
osse	aka. get it from HEAD and put in disk	07:34
pitastrudl	cool	07:34
osse	everything is good i think	07:35
	\o/	07:35
pitastrudl	wooo	07:35
	:D	07:35
	thank you	07:35
	← grift left	07:35
osse	now gimme a karambit	07:36
pitastrudl	nuuuuuuh	07:36
	muh pixels	07:36
	← buddyq left	07:37
	→ encod3 joined	07:37
	→ maret joined	07:37
	← star_prone left	07:38
	→ grift joined	07:38
	→ cizra joined	07:39
	← Wulf left	07:41
	→ GavinMagnus joined	07:42
cizra	Hello! I used git filter-branch --subdirectory-filter to split out a subdirectory into a new repo. However, after cloning the filtered repo to a new one, it's still big. I used the one-liner solution (answer #2) from http://stackoverflow.com/questions/10622179/how-to-find-identify-large-files-commits-in-git-history to find large objects -- indeed, I do have binary junk in the history. How do I 1) figure out	07:43
	how my repo references it (these objects are not visible in "git log") and 2) get rid of them?	07:44
	← encod3 left	07:45
	← OCram85 left	07:45
	→ encod3 joined	07:46
	← moop left	07:47
	→ King_Hual joined	07:47
	→ moop joined	07:48
	→ Alienpruts joined	07:49
	→ qpdb joined	07:50
	→ Endarked joined	07:50
	→ grayjoc joined	07:50
	→ brk_ joined	07:51
	← _ADN_ left	07:52
	→ flaviodesousa joined	07:53
	← dan2k3k4 left	07:53
	← ahmedelgabri left	07:54
	← phanimahesh left	07:54
	→ thebope joined	07:54
	→ ahmedelgabri joined	07:54
	← ahmedelgabri left	07:55
	→ djb-irc joined	07:55
	→ anuxivm joined	07:56
	← brokensyntax left	07:56
	→ hfr joined	07:57
	← xall left	07:57
	→ brokensyntax joined	07:57
	→ davimore_ joined	07:58
	→ rominronin joined	07:58
	← anuxivm left	07:58
	→ aswen joined	07:58
	← thebope left	07:59
	→ Pieplay joined	07:59
	→ kurkale6ka joined	07:59
	→ acetakwas joined	07:59
	→ davimore__ joined	07:59
	← davimore left	08:01
	→ jknetl joined	08:02
	→ luke_penn joined	08:02
	← rominronin left	08:02
	← davimore_ left	08:03
	→ rominronin joined	08:03
	← djb-irc left	08:03
	→ ahmedelgabri joined	08:06
	← hfr left	08:06
	← Goplat left	08:06
	→ tlaxkit joined	08:07
	← lus left	08:07
	← JeroenT_ left	08:08
	→ Limes_ joined	08:08
	← Ravana left	08:09
	→ jfr joined	08:10
	→ mikecmpbll joined	08:10
	→ mischat joined	08:10
	← corsibu left	08:11
	→ corsibu joined	08:11
	→ nd joined	08:12
	→ dan2k3k4 joined	08:12
	→ _ADN_ joined	08:13
	→ JeroenT joined	08:13
	← qws-user-1229 left	08:13
	← JeroenT left	08:14
	→ JeroenT joined	08:14
	→ ki0 joined	08:14
	→ govg joined	08:15
	→ qws-user-1228 joined	08:15
	← mischat left	08:15
	→ djb-irc joined	08:15
	← nd_ left	08:16
	← corsibu left	08:16
	← a_thakur left	08:18
	← cdown left	08:19
	← Murii left	08:20
	→ cdown joined	08:20
	← jnewt left	08:20
	→ halbomin joined	08:20
	→ star_prone joined	08:22
	← JeroenT left	08:24
	→ JeroenT joined	08:24
	→ sveinse joined	08:24
	→ lss8 joined	08:25
sveinse	Mercurial has a function to show incoming commits upstream without fetching/pulling (hg incoming). Is there an git equivalent of that?	08:25
kadoban	sveinse: Not without fetching, no	08:26
	← freimatz left	08:26
	→ corsibu joined	08:26
kadoban	You could check that what you have is not the same as the remote, but that's all you can really see without fetching.	08:26
	← vuoto left	08:27
	→ barteks2x joined	08:27
	← ayjay_t left	08:27
	→ ayjay_t joined	08:27
	→ marcogmonteiro joined	08:28
sveinse	all right. this is on a bare mirror, can I then clone the mirror, fetch from (the first) origin and diff them somehow to show what has changed?	08:29
	← elastix left	08:29
	← WayToDoor left	08:29
	→ tvw joined	08:29
kadoban	sveinse: I don't understand I don't think. You should be able to just fetch and then check what's different if you like? Must be missing something.	08:30
	← acetakwas left	08:32
	← brokensyntax left	08:32
sveinse	kadoban: We have a local bare mirror in house of an upstream repo, because we make medical validated SW and it must be controlled. So before I pull in an update from upstream, I need to know in advance what has changed (in any branch) before I can get the authorization to fetch the update.	08:32
	→ buddyq joined	08:33
	→ Serpent7776 joined	08:34
	→ \du joined	08:34
	← \du left	08:34
	→ \du joined	08:34
kadoban	You can't even fetch without authorization of some kind? That sounds rather terrible. So you can do anything except mess with your "local bare mirror", I assume, right?	08:34
	→ brokensyntax joined	08:35
sveinse	I can do anything on my own computer to fetch and manipulate whatever I'd like	08:35
	I just need to come up with some way of evaluating what changes there are between our mirror and the upstream repo	08:36
kadoban	sveinse: Then just clone one of them, and add the other as a remote. Then fetch. Then you can compare branches fine	08:36
	← Muzer left	08:37
	→ cdown_ joined	08:37
kadoban	!lol should work fine, or gitk --all, both good first glances.	08:37
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	08:37
sveinse	kadoban: right. Thanks	08:38
	← buddyq left	08:38
	← JeroenT left	08:39
	→ JeroenT joined	08:39
kadoban	Any logs or diffs really are possible, you just need to use the right refs origin/whatever otherremote/whatever, etc.	08:39
	→ Wulf joined	08:39
	← liuzhen left	08:39
	← cdown left	08:40
	→ a_thakur joined	08:41
	→ chll_ joined	08:42
	← cdown_ left	08:44
	→ b100s joined	08:45
	← govg left	08:46
	→ liuzhen joined	08:47
	→ phanimahesh joined	08:47
	→ serycjon joined	08:47
	→ Muzer joined	08:49
	→ acetakwas joined	08:49
	← b100s left	08:50
	→ troulouliou_div2 joined	08:50
osse	fetching is quite harmless, and you have to do that at some point anyway	08:50
	→ xall joined	08:51
	→ skunkz joined	08:51
osse	ohh	08:53
	you need auth to just download stuff without using them ? :O	08:54
	→ thebope joined	08:55
	← qpdb left	08:56
	→ albel727 joined	08:57
	← JeroenT left	08:57
	→ JeroenT joined	08:57
	← Learath2 left	08:58
	→ mischat joined	08:59
	← thebope left	08:59
	→ JeroenT_ joined	09:01
	← liuzhen left	09:03
	← omegak left	09:04
	← brk_ left	09:04
	← JeroenT left	09:05
	→ sagerdearia joined	09:05
	← netj left	09:06
	→ liuzhen joined	09:06
	→ netj joined	09:06
	→ nettoweb joined	09:07
	← rkazak left	09:07
_ikke_	Note that fetches do not update the local branches (hg fetch == git pull)	09:08
	→ jbitdrop joined	09:08
_ikke_	So the changes you fetch are isolated from the local branches	09:08
	→ jgrasser joined	09:08
	→ kajnc joined	09:09
	← JeroenT_ left	09:09
	→ omegak joined	09:09
	→ ochorocho__ joined	09:10
	→ brk_ joined	09:11
	← liuzhen left	09:11
	← ochorocho__ left	09:14
	→ JeroenT joined	09:15
	→ lindenle joined	09:15
	→ liuzhen joined	09:16
	← kajnc left	09:16
	→ kajnc joined	09:16
	← Jameser left	09:17
	→ achadwick joined	09:18
	← albel727 left	09:19
	→ alcohol joined	09:19
	← kajnc left	09:19
	← lindenle left	09:19
	→ govg joined	09:20
	→ qpdb joined	09:23
	← timothy left	09:27
	→ drizztbsd joined	09:27
	drizztbsd → timothy	09:27
	→ skyfaller joined	09:28
	→ courrier joined	09:30
	→ afuentes joined	09:32
	→ ahr3n joined	09:32
	← dan2k3k4 left	09:32
	← skyfaller left	09:32
	← timothy left	09:33
	→ drizztbsd joined	09:33
	→ nowhereman joined	09:33
	drizztbsd → timothy	09:33
	← timothy left	09:35
	→ buddyq joined	09:35
	→ drizztbsd joined	09:35
	drizztbsd → timothy	09:35
	← qpdb left	09:35
	← nd left	09:40
	← GT4066 left	09:40
	← aidalgol left	09:40
	→ jstimm_ joined	09:40
	← buddyq left	09:40
	← jstimm left	09:41
	← shaggycat left	09:43
	→ TheHackOps joined	09:44
	← liuzhen left	09:44
TheHackOps	gpg: skipped "XXXXXXXXXXXX": secret key not available	09:44
	Anyone ever fixed this pain in the butt	09:44
	→ shaggycat joined	09:45
	← systemovich left	09:46
	→ nd joined	09:47
	← timothy left	09:48
	→ drizztbsd joined	09:48
	→ systemovich joined	09:48
	drizztbsd → timothy	09:48
	← troulouliou_div2 left	09:48
	← timothy left	09:50
	→ drizztbsd joined	09:50
	→ nikivi joined	09:51
	→ PCatinean joined	09:51
	drizztbsd → timothy	09:51
tobiasvl	TheHackOps: is your secret key available?	09:51
	what are you trying to do, signing a commit?	09:52
	← timothy left	09:52
	→ drizztbsd joined	09:52
	drizztbsd → timothy	09:52
TheHackOps	tobiasvl, yep	09:52
	ok	09:52
	whoops	09:52
	wrong window	09:53
	tobiasvl, Yes I have generated it with gpg2 --key-gen and verified it exists	09:53
	gitinfo set mode: +v	09:54
TheHackOps	kewl	09:54
	Anyway back to the point, been googleing lots and everyone just says the same things, I have tried setting it all up using git configure	09:54
	Seems to give the same error, am i missing something?	09:54
tobiasvl	TheHackOps: what have you configured?	09:55
	should be enough to set user.signingkey	09:55
	← ahr3n left	09:55
tobiasvl	also make sure $GNUPGHOME is set	09:55
	→ liuzhen joined	09:55
TheHackOps	AH	09:55
	Maybe i missed that last one	09:55
	→ thebope joined	09:56
	← star_prone left	09:56
	→ star_prone joined	09:57
	← harish_ left	09:57
	← Endarked left	09:59
	← thebope left	10:00
	→ makinen joined	10:00
	← brk_ left	10:01
makinen	git commit is going to add some files I don't want to be added. How do I prevent it?	10:01
	I probably added them by accident in first the place	10:02
	← corsibu left	10:02
	→ qpdb joined	10:02
	→ corsibu joined	10:03
	← eduardas_m left	10:03
JuliusN	makinen: do you want to unstage staged files before committing?	10:03
	← ShapeShifter499 left	10:03
JuliusN	git reset filename	10:04
grawity	and later, add them to .gitignore and commit that	10:04
JuliusN	git reset without filename unstages all changes	10:04
	← Alienpruts left	10:05
makinen	yea probably they're some temporary files by emacs	10:05
selckin	'git status' outputs tells you how	10:05
makinen	I want to leave the files in the file system as they were	10:07
	← corsibu left	10:07
makinen	but I don't want them to be committed or pushed to the origin	10:07
	I'm not sure if git reset is what I want to do	10:08
selckin	it is	10:08
	← nikivi left	10:09
	← JeroenT left	10:09
makinen	ah yes it was, thx :)	10:09
JuliusN	i have an another issue. yesterday i merged my branch with origin/master and resolved all conflicts, but today when i try to merge again i get (seemingly) the same conflicts. i was wondering if i may have made some common newbie mistake?	10:10
	← mischat left	10:10
JuliusN	yesterday i created a new branch before committing the merge	10:11
	this is the branch in which i'm currently trying to pull from master	10:11
	→ Macaveli joined	10:12
	→ rnsanchez joined	10:13
	→ brk_ joined	10:13
	→ BadSnappa joined	10:14
	→ Jameser joined	10:15
	← govg left	10:15
	← mehola left	10:19
	→ jeanres joined	10:19
	← jeanres left	10:19
	→ jeanre joined	10:20
jeanre	hi all, we merged a branch and reverted it, now we cannot merge it again, it says there are no changes	10:20
	but when I go into the branch I want to merge into master	10:20
	the changes are there	10:20
	I just can't do git merge [Branch]	10:20
	← netj left	10:21
	→ netj joined	10:21
	→ jnewt joined	10:21
	← tlaxkit left	10:22
	→ tlaxkit joined	10:22
	← cagedwisdom left	10:27
_ikke_	jeanre: a revert does not undo the merge, only the changes in that merge	10:28
	jeanre: from git points of view, everyting from that branch has already been merged (only later reverted again)	10:29
	→ alhariel joined	10:29
_ikke_	jeanre: Easiest is to revert the revert again	10:29
jeanre	yeah	10:29
	→ ShekharReddy joined	10:29
jeanre	did that	10:29
	but its messy	10:29
	← Jameser left	10:32
	← gniourf left	10:32
	→ dan2k3k4 joined	10:32
	→ corsibu joined	10:33
	→ freimatz joined	10:36
	← Derperperd left	10:36
	→ anotheryou_ joined	10:39
	→ ferr joined	10:40
	→ JeroenT joined	10:41
	→ nilg joined	10:41
	→ Guest26 joined	10:42
	→ Ryanar joined	10:44
tobiasvl	jeanre: !faulty_merge	10:45
gitinfo	jeanre: If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt	10:45
tobiasvl	maybe we should have a rerere trigger	10:45
	← maret left	10:45
	gitinfo set mode: +v	10:45
	→ jimi_ joined	10:45
tobiasvl	JuliusN: but you might want man git rerere	10:46
gitinfo	JuliusN: the git-rerere manpage is available at http://jk.gs/git-rerere.html	10:46
	→ gniourf joined	10:46
	← zulutango left	10:47
JuliusN	my coworker suggested rebase	10:47
	← jeanre left	10:47
	→ NitroLux joined	10:47
dmc	second time hearing about rerere in two days.. better see wth it is	10:47
	oic	10:47
	← rominronin left	10:48
	→ rominronin joined	10:48
	→ Alienpruts joined	10:48
tobiasvl	JuliusN: sure, you can rebase, that's an alternative to merging	10:49
	← rominronin left	10:49
	→ rominron_ joined	10:49
	← evanwang left	10:49
	→ jeanres joined	10:49
tobiasvl	re-reading your initial question I agree with your coworker, looks like you want to rebase	10:49
	→ ieee joined	10:50
JuliusN	thanks	10:51
	also he suggested that we should keep something he called 'research master', a branch that we should merge with origin/master regularly, and derive all our feature branches from the research branch	10:53
	← makinen left	10:53
tobiasvl	sure, that's not an uncommon workflow – although usually this is called a "dev" branch, in case you run into it in online literature	10:54
	!workflow	10:54
gitinfo	Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	10:54
	→ thebope joined	10:57
	→ soerenb_ joined	10:59
	← sorenb left	10:59
	← grift left	10:59
	→ grift joined	10:59
	← thebope left	11:01
	← CussBot left	11:04
	→ xkr47 joined	11:05
	→ CussBot joined	11:05
	← liuzhen left	11:05
	→ Jameser joined	11:06
	→ roelmonn_ joined	11:08
	→ irco joined	11:08
	← soerenb_ left	11:08
	→ soerenb_ joined	11:09
	← roelmonn_ left	11:09
	→ roelmonn_ joined	11:09
	→ mischat joined	11:11
	→ rafalcpp joined	11:11
	→ ochorocho__ joined	11:11
	← roelmonnens left	11:12
	← ahmedelgabri left	11:12
	← JeroenT left	11:13
	→ mischat_ joined	11:13
	← Jameser left	11:14
	→ Jameser joined	11:15
	← ochorocho__ left	11:15
	← mischat left	11:16
	← stfn left	11:16
	→ Vinnie_win_o joined	11:17
	← Vinnie_win left	11:18
	← soerenb_ left	11:18
	→ soerenb_ joined	11:19
	→ ocbtec joined	11:19
	→ JeroenT joined	11:21
	← Shentino left	11:22
	← ojdo left	11:23
	← rominron_ left	11:24
	→ rominronin joined	11:25
	→ SpeakerToMeat joined	11:25
	← grayjoc left	11:25
	→ fuchstronaut joined	11:25
	→ mizu_no_oto joined	11:27
	← Macaveli left	11:29
	→ skyfaller joined	11:29
	← Alienpruts left	11:29
	← skunkz left	11:29
	→ stfn joined	11:29
	→ skunkz joined	11:30
	← rominronin left	11:30
	← fuchstronaut left	11:30
	→ ojdo joined	11:30
	← Guest35924 left	11:30
	→ fuchstronaut joined	11:30
	→ Alienpruts joined	11:31
	→ umpc joined	11:31
	→ Macaveli joined	11:32
	qpdb → Guest65292	11:32
	← Guest65292 left	11:32
	→ qpdb joined	11:32
	← skyfaller left	11:34
	→ nuck joined	11:36
	nuck → Guest67391	11:37
	→ buddyq joined	11:38
	← mischat_ left	11:38
	→ rominronin joined	11:38
	← buddyq left	11:42
	→ liuzhen joined	11:43
	← Jameser left	11:43
	← Haliucinas left	11:44
	← liuzhen left	11:45
	← johnmilton left	11:45
	← corsibu left	11:46
	← brokensyntax left	11:47
	→ corsibu joined	11:47
	→ Gonzo89 joined	11:48
	← jimi_ left	11:48
	→ brokensyntax joined	11:48
	← brk_ left	11:48
	← rendar left	11:50
	← corsibu left	11:51
	→ aupo joined	11:52
	→ brk_ joined	11:52
aupo	Hey, I have a question on the inner workings of git URLs if anyone could enlighten me.	11:53
	What does git do with this URL exactly: "git+ssh://git@git.rd.company.com:repo/package.git#branch"	11:53
	Most specifically the ":repo/package..." part, how is that interpreted and or how should it be interpreted?	11:53
canton7	"git+ssh://" isn't a valid git url, afaik	11:54
	':repo/package.git' is a file path, relative to 'git's home directory, to the repository to interact with	11:54
aupo	Oh yeah, shit, I copied that from a very old file	11:54
canton7	but the '#branch' stuff is non-standard as well	11:54
aupo	"ssh://git@git.rd.company.com:repo/package.git" this is what I should be asking, of course	11:55
canton7	that's also invalid	11:55
	ssh:// urls interpret the stuff after ':' as a port	11:56
	see 'git urls' in man git clone	11:56
gitinfo	the git-clone manpage is available at http://jk.gs/git-clone.html	11:56
	→ corsibu joined	11:56
aupo	This one works, though... Althought with npm, so I guess I'm actually barking at the wrong tree here.	11:56
canton7	'git@git.rd.company.com:repo/package.git' would be valid, as would 'ssh://git@git.rd.company.com/~/repo/package.git' and 'ssh://git@git.rd.company.com:22/~/repo/package.git'	11:56
	← nowhereman left	11:57
aupo	Sorry to bother you folks, I guess I'll go bark at #node.js next :)	11:57
	← rchavik left	11:57
canton7	it would be really weird if npm had different url syntax to git :	11:57
aupo	It most definitely seems to have.	11:57
	→ thebope joined	11:57
canton7	https://docs.npmjs.com/files/package.json#git-urls-as-dependencies yeah, utterly different	11:58
aupo	Myup..	11:58
	Guess I'll go read the source code to see, what they actually do with that.	11:59
	← dsdeiz left	12:01
	← aupo left	12:02
	← thebope left	12:02
	← Andrew_K left	12:03
	← pks left	12:04
	→ synthroid joined	12:04
	→ rendar joined	12:04
	→ johnmilton joined	12:06
	→ BPL joined	12:07
BPL	Is it possible to know what are the branches of a certain commit hash?	12:07
	→ Endarked joined	12:07
	← xameada left	12:08
_ikke_	git branch --contains <hash>	12:08
	→ Seban joined	12:08
	→ anonymuse joined	12:09
	← TheHackOps left	12:10
	← Eryn_1983_FL left	12:11
	← Seban left	12:13
	→ Shentino joined	12:13
	← Endarked left	12:14
	→ clmsy joined	12:14
	→ ExoUNX joined	12:14
	→ fxer joined	12:15
	→ Seban joined	12:16
	→ t4nk712 joined	12:16
	→ Eryn_1983_FL joined	12:17
	← mizu_no_oto left	12:18
	→ skyfaller joined	12:20
	← anonymuse left	12:20
	← gtristan left	12:23
	← Macaveli left	12:24
	→ re1_ joined	12:25
	→ WayToDoor joined	12:26
	→ Macaveli joined	12:26
	← Macaveli left	12:26
	← re1 left	12:28
	← brokensyntax left	12:28
	→ brokensyntax joined	12:29
	← aavrug left	12:30
	→ grayjoc joined	12:31
	← AndrewAlexMac left	12:31
	→ modlin joined	12:31
	→ mizu_no_oto joined	12:34
	← frobnic left	12:34
	← t4nk712 left	12:35
	← oxsyn left	12:36
	→ dsdeiz joined	12:36
	→ frobnic joined	12:37
	→ davimore_ joined	12:38
	→ Gamecubic joined	12:38
	→ tjone270 joined	12:38
	→ f3r70rr35f joined	12:39
	→ buddyq joined	12:39
	→ mischat joined	12:39
	→ cjbrambo joined	12:40
	← mizu_no_oto left	12:40
	← traxo-xx- left	12:40
chele	I am reading the manual of gitolite and I see that you can specify a permissions rule for a specific ref relatively to refs/heads giving just the name of it ,e.g master, hotfix-bug111 which would mean refs/master or any branch. you can also specify a rule with an absolute path relative to refs/ e.g. by saying refs/admin/secret-path. what does this mean that the admin/secret-path branch is created under refs/ folder and not under refs/he	12:41
	ads ?	12:41
	← rnsanchez left	12:41
	→ AndrewAlexMac joined	12:41
	→ ahmedelgabri joined	12:41
	← davimore__ left	12:41
	← Shakeel_ left	12:41
	← ShekharReddy left	12:42
osse	chele: it means that git does not consider it a branch. you won't see it's log when you do git log --branches. it doesn't appear in 'git branch' etc.	12:43
	→ ij joined	12:43
	← PioneerAxon left	12:43
	← buddyq left	12:44
	← justrohu left	12:44
	← mischat left	12:44
	→ PioneerAxon joined	12:44
	→ traxo-xx joined	12:44
chele	so there's is something else to handle such creation of 'it'. And what's this 'it'?	12:45
ij	Can I do the show/log --format=medium + something else, without repeating the whole thing by hand?	12:45
chele	osse maybe you can point out to an example ...	12:45
osse	chele: refs that are in refs/heads are called branches. refs that are in refs/tags are called tags. other refs are just called refs.	12:47
	→ JamesBaxter joined	12:47
osse	not sure what the question is	12:47
chele	how do you create a ref?	12:48
osse	chele: if you're badass: echo somesha1value > .git/refs/admin/secret-path	12:49
	chele: normal people use git update-ref	12:49
	← halbomin left	12:50
	← WayToDoor left	12:50
	→ shinnya joined	12:52
	← sagerdearia left	12:52
	→ xameada joined	12:54
	← fxer left	12:54
	→ gho5t joined	12:55
osse	chele: e.g. git filter-branch uses git update-ref when it creates the backups in refs/original	12:55
	→ concerti joined	12:57
	→ eindoofus joined	12:58
	→ jimi_ joined	12:59
	→ thebope joined	12:59
ij	Is git log just a commit range generator that "maps" the range over to git show?	13:00
	→ joki joined	13:00
	← roelmonn_ left	13:00
	→ roelmonnens joined	13:01
	→ nowhereman joined	13:01
	← tlaxkit left	13:01
	← thiago left	13:01
	→ tlaxkit joined	13:01
	← Lor_ left	13:02
_ikke_	I don't think that's an accurate description	13:03
	git show can show all sorts of objects	13:03
	← thebope left	13:04
chele	osse so you could have a ref to a refs/private-area/awesome-hacks/ (for instance) where you do dirty stuff and when finished your offer to some integration guy to take it from there and merge to master branch and thus avoiding the creation of a specific repo, right?	13:05
	→ anonymuse joined	13:05
osse	chele: yes	13:05
	chele: that said, I'd rather create my own repo to avoid that :p	13:05
chele	is not best practice or?	13:06
osse	just seems messy to me	13:06
	← Repox left	13:06
	← modlin left	13:07
chele	osse well haven't found a way to do it w/o installing say standalone gitlab.	13:07
	cause forking is not in git	13:07
	→ harish_ joined	13:07
	→ cdg joined	13:08
	→ sorenb_ joined	13:09
	← soerenb_ left	13:09
	← anonymuse left	13:09
	→ LBV_User joined	13:10
chele	osse that or you could still create branches prefixing your username (uniq. dev id) and so this integration guy can merge from it..	13:11
osse	chele: if you don't have a fancy github/gitlab-like thingy then maybe this is easier.	13:11
chele	osse no I don't	13:12
osse	I think gitolite can do it as well (ie. easy creation of forks) but I don't know holw	13:12
chele	hm	13:12
	← Noldorin left	13:12
chele	yes i was exploring the configuration of gitolite and noticed the permission rules allow that.	13:13
canton7	gitolite can do that, yep	13:13
Eryn_1983_FL	hi guys so i wrote a script to do my pushing and pull for releases in puppet repo	13:13
	← ayogi left	13:13
Eryn_1983_FL	can you check it out real quick? if i am doing it right	13:14
	fyi this is in my repo /home/THRACE/erin/puppet/manifests/release.txt	13:14
	http://sprunge.us/JMFC	13:14
	← star_prone left	13:15
	← joki left	13:15
	← acetakwas left	13:15
	→ govg joined	13:16
	→ Gsham joined	13:16
	→ acetakwas joined	13:17
	→ Noldorin joined	13:17
	→ lindenle joined	13:18
	→ Haliucinas joined	13:18
	← Haliucinas left	13:18
	→ anotheryou__ joined	13:19
	→ CEnnis91 joined	13:19
	→ troulouliou_div2 joined	13:20
	→ joki joined	13:20
	← Seban left	13:21
	← lindenle left	13:22
	→ mischat joined	13:23
	← anotheryou_ left	13:23
	← subhojit777 left	13:23
	→ sagerdearia joined	13:25
	← armin left	13:25
	→ armin joined	13:26
selckin	thats gonna fuck so much up if any of them fail	13:27
	→ ayogi joined	13:27
	→ Seban joined	13:29
	← Raging_Hog left	13:30
	← serycjon left	13:31
	← overlord_tm left	13:31
	← frobnic left	13:32
	← courrier left	13:32
chele	osse would you state some reasons behind forking own repo vs having personal branching architecture?	13:34
	→ star_prone joined	13:34
	→ frobnic joined	13:34
	← troulouliou_div2 left	13:35
	← nettoweb left	13:35
	→ buddyq joined	13:36
osse	chele: my main reasons are that you can force-push as much as you like and that you don't pullute other people's repos	13:37
	when they run 'git branch -a' or -r they'll see your crap	13:37
	→ nettoweb joined	13:37
	← corsibu left	13:37
	→ Dougie187 joined	13:38
	→ corsibu joined	13:38
	→ arooni joined	13:40
	← jstimm_ left	13:41
	→ griffindy joined	13:41
	← ayogi left	13:41
BPL	_ikke_: Tyvm, it works, i guess git branch --contains hash will return the local ones only, isn't?	13:42
	← Gsham left	13:42
	→ Darcidride joined	13:42
	← qpdb left	13:43
	← corsibu left	13:43
	→ navidr joined	13:44
	← grayjoc left	13:44
_ikke_	yes, use -a to also include remote tracking branches	13:44
	→ malcon joined	13:44
	← frobnic left	13:45
	→ frobnic_ joined	13:45
	← joki left	13:45
	← re1_ left	13:45
	← saml left	13:46
	→ anotheryou joined	13:46
	→ cso joined	13:47
	→ DeltaHeavy joined	13:47
	← star_prone left	13:47
	← frobnic_ left	13:48
	→ frobnic joined	13:48
	→ saml joined	13:48
	← anotheryou__ left	13:49
	→ yqt joined	13:49
	→ grayjoc joined	13:50
	→ joki joined	13:50
	→ troulouliou_div2 joined	13:50
	→ kajnc joined	13:50
	← cso left	13:51
	→ mischat_ joined	13:52
	→ sdothum joined	13:52
	← nettoweb left	13:53
	→ ash_workz joined	13:53
	← kajnc left	13:54
	← mischat left	13:54
	← mischat_ left	13:54
	→ kajnc joined	13:54
	→ mischat joined	13:55
	→ nettoweb joined	13:55
	← nettoweb left	13:55
	→ boombatower joined	13:55
	→ liuzhen joined	13:55
	← jknetl left	13:56
	→ mischat_ joined	13:57
	← mischat_ left	13:57
	→ frobnic_ joined	13:57
	← frobnic left	13:57
	→ mischat_ joined	13:57
	→ jeffreylevesque joined	13:57
	→ anonymuse joined	13:58
	→ Gsham joined	13:58
	← \du left	13:59
	← mischat left	13:59
	← VladGh left	13:59
	→ zivester joined	14:00
	→ raphink joined	14:00
	→ VladGh joined	14:01
	← barteks2x left	14:02
	→ star_prone joined	14:02
	→ Xethron joined	14:02
	→ fahadash joined	14:03
	← sorenb_ left	14:03
	← NitroLux left	14:03
	→ sorenb_ joined	14:04
	← tlaxkit left	14:04
	← Ryanar left	14:04
	→ Gsham_ joined	14:04
	→ b_jonas joined	14:04
	← Gsham left	14:04
	→ sangy joined	14:05
b_jonas	Hi. git help rev-parse documents all the magical syntax I can use in git when it expects an object, right?	14:05
	But I hear there's also some magical syntax for when git wants filenames. Where is that documented?	14:06
Eryn_1983_FL	selckin: yeah.. trying to figure out what to do about that	14:07
	→ davimore__ joined	14:08
	→ ResidentBiscuit joined	14:08
	→ AaronMT joined	14:08
	→ davimore joined	14:10
	← davimore_ left	14:11
Eryn_1983_FL	selckin: so what do you suggest i do if i cant do a script?	14:11
	← kajnc left	14:11
	← PioneerAxon left	14:11
	→ PioneerAxon joined	14:11
selckin	at least push only at the end	14:11
	← brillenfux left	14:12
	← davimore__ left	14:13
	→ modlin joined	14:13
Eryn_1983_FL	ok	14:14
	→ matsaman joined	14:14
	→ LocusAsaf joined	14:15
	← joki left	14:15
buddyq	so, I just did a git push origin origin/my_branch and it said: * [new branch] origin/Buddys_branch -> origin/Buddys_branch. But the branch already existed	14:16
LocusAsaf	Let's say I have Two branches that I consider trunks, qa & dev which most people will branch from for normal development. Is it possible to detect with 100% certainty which trunk the branch is from?	14:16
buddyq	Then it says: Your branch is ahead of 'origin/Buddys_branch' by 2 commits.	14:17
	← JeroenT left	14:17
	→ patarr joined	14:18
	→ thiago joined	14:18
	→ mangolisk joined	14:18
	→ thebloggu joined	14:18
	← qt-x left	14:18
	→ nikivi joined	14:19
	→ joki joined	14:20
osse	buddyq: u don fukt up.	14:22
	just kidding	14:22
	buddyq: you probably have made branch called 'origin/Buddys_branch'. that's quite different from a branch called 'Buddys_branch' located at 'origin'	14:23
buddyq	nah, I resolved it actually. Looks I got the ssh key thing worked out.	14:23
	ah!	14:23
	really??	14:23
	maybe thats what happened...	14:23
	→ fb\| joined	14:23
phanimahesh	yep. * [new branch] origin/Buddys_branch -> origin/Buddys_branch was a hint	14:23
osse	buddyq: do git for-each-ref \| grep Buddys	14:23
	← synthroid left	14:23
buddyq	How should I push my local brnach to github?	14:23
^7heo	Is my submodule directory (.git/module/<module>/) supposed to contain the files that are checked in my submodule?	14:23
_ikke_	buddyq: git push origin <branch>	14:24
LocusAsaf	anyone know the answer to my question, or is it not possible?	14:24
buddyq	i get 3 results	14:24
^7heo	or is it only supposed to contain what would normally be the .git folder of that submodule?	14:24
_ikke_	^7heo: It's supposed to contain the contents of the .git folder for thos submodules	14:24
	right	14:24
buddyq	i did git push origin origin/Buddys_branch. Is that wrong?	14:24
	→ phaleth joined	14:24
^7heo	How the fuck did my index content end up there then?!	14:24
	=/	14:24
	for some reason	14:24
	the index points there...	14:24
osse	buddyq: yes. git push origin Buddys_branch	14:25
buddyq	They all look correct. I have refs/remotes/origin/Buddys_branch, refs/remotes/host/Buddys_branch, refs/remotes/Buddys_branch	14:25
	ok	14:25
phanimahesh	LocusAsaf: git only works with commit graphs. You can look at the history and make an educated guess, but that's all.	14:25
	commits aren't coupled to branches, so you can never be certain on what branch a commit was made.	14:26
	→ kajnc joined	14:26
buddyq	ah okay. cool.... working now	14:26
	← ferr left	14:26
LocusAsaf	phanimahesh: Well I'm not focusing on the commits, I just want to branch to branch	14:26
	→ ferr joined	14:26
LocusAsaf	want to know*	14:26
phanimahesh	LocusAsaf: A branch is just a text file in .git/refs with the id of commit.	14:27
	So if commits don't track something, branches don't, either.	14:27
	← thiago left	14:27
	← rominronin left	14:27
	→ rominronin joined	14:28
	→ thiago joined	14:28
LocusAsaf	speaking in terms of the graph, is it possible to follow the path along until I find a branch that == $SOME_TRUNK ?	14:28
	← rominronin left	14:28
	→ rominron_ joined	14:28
LocusAsaf	programmatically of course	14:29
phanimahesh	the graph is of commits, each pointing to their previous commit (or commits, in case of merges)	14:29
^7heo	_ikke_: ok, for the reference, my worktree in the .git/module/<module>/config was pointing at .git/module/<module>/ rather than at ./<module>	14:29
	_ikke_: that's how things fucked up.	14:29
phanimahesh	you can follow it, but why would you want to do it?	14:30
osse	LocusAsaf: to do what?	14:30
	← anonymuse left	14:30
	→ anonymuse joined	14:30
LocusAsaf	phanimahesh: so if I keep following the previous commit and check the branch for each one I would eventually hit another branch, a trunk in my example git process?	14:31
	← Seban left	14:31
	← gesker left	14:31
	→ nettoweb joined	14:31
	→ Endarked joined	14:31
_ikke_	in git, we don't really use the word trunk	14:31
LocusAsaf	osse: I want to determine which trunk a feature was branched from	14:31
	← patarr left	14:31
_ikke_	It's all branches	14:31
^7heo	_ikke_: depends, if it's in German.	14:32
LocusAsaf	_ikke_: can't I use the word if that's how I defined my git process for development	14:32
	→ plasticboy joined	14:32
phanimahesh	LocusAsaf: you first have to start at your "trunk" branch, follow back and mark commits as belonging to "trunk". Then trace feature branches backwards till you cross a commit in "trunk".	14:32
_ikke_	LocusAsaf: Not if it's confusing to other what you mean	14:32
perlpilot	LocusAsaf: sounds like you want `git merge-base`	14:32
^7heo	_ikke_: i.e. trunken	14:32
	→ Bysmyyr joined	14:32
osse	LocusAsaf: find the earliest commit on that branch not on any of the trunks: (git rev-list --reverse branch --not trunk1 trunk2 ), then find which trunk its parent belongs to (git branch --contains foo~1)	14:33
	→ eivarv joined	14:34
	← zacts left	14:34
phanimahesh	Or, you can do as osse suggests.	14:34
osse	foo = first line of output of the rev-list commadn	14:34
LocusAsaf	_ikke_: I'll run my scenario again in case you missed it, sorry for any confusion. We use branches qa & dev and treat them as trunks. Both branches current commit corresponds to a deployed version of the code. All features are branched off one of the "trunks". WHat I was asking is a programatic method to determine which trunk a feature was branched from	14:34
Bysmyyr	hi, I have strange question. If I have file from somewhere git history(only that file). Then I have full git repo. Can I find which commit made that file look like that what I have now. in other words, can I find a last commit of loose file	14:35
LocusAsaf	osse: I'll give that a try	14:35
osse	Bysmyyr: that's so easy it's not even funny.	14:35
	→ zacts joined	14:35
	← timothy left	14:35
	← mischat_ left	14:36
osse	Bysmyyr: git hash-object -- file	14:36
	→ Bloomberg joined	14:36
osse	Bysmyyr: now you know the SHA1 of its blob. now recurse through history to find a commit that has that blob	14:36
	← Bloomberg left	14:36
	→ JeroenT joined	14:36
	→ Bloomberg joined	14:37
Bloomberg	Hello Room!!	14:37
gitinfo	Bloomberg: 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.	14:37
	→ mischat joined	14:37
	← liuzhen left	14:37
Bloomberg	http://imgur.com/a/PYMhB	14:38
	← a_thakur left	14:38
Bloomberg	someopne know what means that symbol in my git?	14:38
	← jwest left	14:38
Bloomberg	doesn't working the autodeploy setting	14:38
osse	Bysmyyr: hmm, something like. blob=$(git hash-object file); git rev-list --all \| while read hash; do if git ls-tree -r $hash \| grep -q "blob $blob"; then echo "OMG $hash contains file!! \o/"; fi; done	14:38
	← Endarked left	14:39
_ikke_	Bloomberg: It's part of you shell prompt, no clue what it means (your font does not support the characters)	14:39
	→ Darcidride_ joined	14:39
osse	Bysmyyr: this assumes there is a commit in which the file is IDENTICAL. otherwise you'd have to diff and do some heuristics	14:39
Bysmyyr	osse: ok, thats good, thanks	14:39
Bloomberg	I have several sites in my server, there are setting with autodeploy, but just this site doesn't works the autodeploy and show this symbol	14:40
	→ synthroid joined	14:41
	← brokensyntax left	14:41
	→ converge joined	14:41
	← fuchstronaut left	14:41
	→ brokensyntax joined	14:41
	→ vuoto joined	14:42
	← Darcidride left	14:42
	→ thebope joined	14:43
	→ Endarked joined	14:43
	← phanimahesh left	14:43
	→ shgysk8zer0 joined	14:44
	→ dreiss joined	14:44
	← zump left	14:44
	→ mrwat joined	14:45
	← joki left	14:45
	→ mischat_ joined	14:45
	→ davimore_ joined	14:46
	← ahmedelgabri left	14:46
	← mischat left	14:48
	← davimore left	14:49
	← dodobrain left	14:49
	→ CheckDavid joined	14:50
	← rominron_ left	14:50
	← grayjoc left	14:50
	→ IrishPrime joined	14:50
	← IrishPrime left	14:50
	→ rominronin joined	14:50
	→ IrishPrime joined	14:51
	→ iuk joined	14:52
	→ joki joined	14:52
	→ raspado joined	14:52
	→ isysd joined	14:52
	→ e14 joined	14:53
	→ overlord_tm joined	14:53
	← ELFrederich left	14:53
LocusAsaf	osse: for the contains command, is my answer always going to be the last line of output?	14:53
iuk	Hi! Assuming that the commit history is linear, how to find the nth successor of a commit? Is there a notation analogous to ^ but working in the opposite direction?	14:54
	→ ahmedelgabri joined	14:54
canton7	iuk, no	14:54
	git doesn't track the child of a commit	14:55
osse	LocusAsaf: I don't know.	14:55
	→ ShekharReddy joined	14:55
	← rominronin left	14:55
_ikke_	A commit can have an infinite number of children	14:55
iuk	_ikke_: I’m OK iterating over all of them.	14:56
_ikke_	which will be created after that commit	14:56
LocusAsaf	osse: following your instructions the contains command seems to print out several branches, not just one which is why I asked	14:56
matsaman	ain't that the truth	14:56
osse	LocusAsaf: a commit can "belong" to several branches	14:56
_ikke_	iuk: It's basically iterating over all commits and check the parents	14:56
iuk	_ikke_: I just thought there was a shortcut for that.	14:57
	→ re1 joined	14:57
_ikke_	nop	14:57
	iuk: One assumption can be all commits that have a date later then the commit, but that assumption is easily broken	14:57
	→ tlaxkit joined	14:58
	→ iamthad joined	14:58
	→ ochorocho__ joined	14:58
iuk	_ikke_: I’m not looking for a general solution. I have a repo with linear history.	14:58
	← jeanres left	14:58
perlpilot	iuk: if the history is linear, why do you want iterate in reverse?	14:59
	→ jstimm_ joined	14:59
	← JeroenT left	14:59
iuk	perlpilot: It’s a pretty lengthy history. I know the hash of the commit I’m interested in, and I want to know what was right after it.	14:59
	← star_prone left	15:00
	← chele left	15:00
iuk	Perhaps it’s possible to make `git log` scroll down to a particular commit?	15:00
	← rscata left	15:01
	→ Guest6802 joined	15:01
iuk	I guess I should just dump the whole log into a text file and search.	15:01
	← cdg left	15:01
perlpilot	/SHA1-of-commit-I-want :-)	15:01
iuk	perlpilot: Yeah)	15:01
	perlpilot: Right! Right!	15:02
	perlpilot: Now I get it. Thanks!	15:02
perlpilot	sure	15:02
	→ JeroenT joined	15:02
	← Gsham_ left	15:02
	← ochorocho__ left	15:02
	← jimi_ left	15:03
	→ leeN joined	15:03
	← jstimm_ left	15:03
	← re1 left	15:03
LocusAsaf	osse: okay, I think perhaps I unintentionally left out some important information from my scenario. So as I said the two features are qa & dev. The piece I forgot was that dev is branched from qa so dev knows about commits in qa as well. Therefore when I followed your instructions and followed a feature of qa up and asked it what branches know about the qa, basically it hit qa, dev & features of both. Anecdotally it seems like the right ans	15:03
	wer is the last branch output but i"m not sure	15:03
	→ re1 joined	15:03
	→ gtristan joined	15:04
	← overlord_tm left	15:04
	← roelmonnens left	15:04
	→ Renard_Chase joined	15:04
	← Bloomberg left	15:05
	← systemovich left	15:05
	← JeroenT left	15:06
	→ dviola joined	15:06
Renard_Chase	Is there a command that reverts all changes I that I commited today?	15:06
LocusAsaf	according to git-branch documentation the default sort order is "Sort order defaults to sorting based on the full refname (including refs/... prefix)" but I'm not certain what that means	15:06
matsaman	Renard_Chase: git reset --hard shasumtocommityouwant	15:06
	→ subhojit777 joined	15:06
	→ jwest joined	15:06
	← Shentino left	15:07
	→ aarobc joined	15:07
	→ jimi_ joined	15:07
	← govg left	15:07
Renard_Chase	matsaman : Thank you	15:08
	← Renard_Chase left	15:09
	← Guest26 left	15:09
	← ThomasLocke left	15:09
	← iuk left	15:09
	→ SrPx_ joined	15:09
	→ jeanres joined	15:10
	← SrPx_ left	15:10
	→ stomplee joined	15:10
	→ patarr joined	15:14
	← thiago left	15:14
	→ barteks2x joined	15:14
	← ShekharReddy left	15:15
	→ danslo joined	15:15
	← Guest6802 left	15:16
	← raphink left	15:16
	← brk_ left	15:16
	← JamesBaxter left	15:16
	← nilg left	15:17
	← joki left	15:19
	→ al-damiri joined	15:20
	← zeroed left	15:20
	→ Gsham joined	15:20
	→ Jameser joined	15:23
	← rbern left	15:23
	← e14 left	15:24
	→ timothy joined	15:24
	Vinnie_win_o → Vinnie_win	15:25
	← nikivi left	15:25
	← aarobc left	15:26
	← patarr left	15:26
	← Balliad left	15:27
	→ crose joined	15:28
	← shirty left	15:29
	← ahmedelgabri left	15:29
	← kajnc left	15:29
	→ ahmedelgabri joined	15:30
	← diogenese left	15:31
	→ e14 joined	15:31
	← matsaman left	15:31
	→ matsaman joined	15:31
	→ diogenese joined	15:32
	← eivarv left	15:32
	→ JamesBaxter joined	15:32
	→ fuchstronaut joined	15:32
	← fuchstronaut left	15:32
	→ fuchstronaut joined	15:32
	← anonymuse left	15:33
	→ bernardio joined	15:33
	→ rbern joined	15:33
	← Xethron left	15:33
	← PCatinean left	15:34
	← shgysk8zer0 left	15:34
	→ maret joined	15:35
	← flaviodesousa left	15:35
	→ lindenle joined	15:36
	← clmsy left	15:36
	→ Derperperd joined	15:37
	← synthroid left	15:37
	khisanth__ → Khisanth	15:37
	← LBV_User left	15:38
	→ eivarv joined	15:38
	→ Ryanar joined	15:39
	← vuoto left	15:41
	→ sdlnv_ joined	15:41
	→ kajnc joined	15:42
	← danslo left	15:42
	← lordjancso left	15:42
	→ star_prone joined	15:43
	→ kpease joined	15:44
	← isysd left	15:45
	← sdlnv_ left	15:45
	→ rnsanchez joined	15:46
	← Alienpruts left	15:47
	← star_prone left	15:47
	→ danlovesppipes joined	15:48
	→ danimal2 joined	15:50
danimal2	hi guys, question..if i do a git pull from a repo on github, then run composer update, will that update all code so any changes i might have made own my own, would be overwritten? i have not forked the repo or do PR's etc..	15:51
	→ oskarkv joined	15:51
	→ rominronin joined	15:51
	→ patarr joined	15:52
	← afuentes left	15:52
	← danlovesppipes left	15:52
danimal2	essentially there is some key code i want added in, that the author wont merge...and i want to keep my repo up to date with my changes and the author changes...except for my tweaks.	15:52
	→ qpdb joined	15:53
	→ alex1a_ joined	15:53
	← Gsham left	15:53
	← alex1a left	15:54
	→ Learath2 joined	15:54
	← brokensyntax left	15:55
	→ littleforest joined	15:55
	→ synthroid joined	15:55
	→ afuentes joined	15:55
	→ synthroi_ joined	15:56
	→ re1_ joined	15:57
	→ shiriru joined	15:57
	← re1 left	15:57
	→ Gsham joined	15:58
	→ einnjo joined	15:58
	← jnavila left	15:58
	→ brokensyntax joined	15:59
	← synthroid left	16:00
	→ pumafied joined	16:00
osse	pull performs a merge	16:00
	between whatever you pull and HEAD	16:01
	← Remram left	16:01
	→ ygeLN joined	16:02
danimal2	right, thanks osse. so best practice would be fork the repo..commit my changes, likely 1 time changes..then how does my fork stay up to date with the author's commits on github?	16:02
	← rbern left	16:02
osse	danimal2: you pull from the original and push to your fork	16:02
	→ chamunks joined	16:02
osse	if it's just one commit you need as a patch to make things work I suggest pull --rebase	16:02
	that way your patch is always on top	16:03
	← Darcidride_ left	16:03
	→ xavca joined	16:03
danimal2	oh i get it..makes sense. thanks for that rebase tip.ill try that.	16:03
	osse++	16:03
osse	!karma	16:03
gitinfo	This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.	16:03
osse	.karma osse	16:03
gitinfo	the Genuine Real Life Karma™ REST API results are back! o‍sse: 250 (3 in past 30 days) (6 given out)	16:03
osse	awwww yisss	16:03
	→ Remram joined	16:04
	← Gonzo89 left	16:04
osse	oh, it doesn't count nick++ ?	16:04
danimal2	not sure..im not an irc guru either	16:04
	i was trying to give you good karma	16:04
	→ EvilPenguin joined	16:04
	→ Erati joined	16:05
	← nettoweb left	16:05
	← xavca left	16:05
osse	jast: plz fix	16:05
	i need my karma	16:05
danimal2	thank you osse	16:06
	lol!	16:06
osse	that should do it	16:06
	→ ochorocho__ joined	16:06
	← subhojit777 left	16:06
Zarthus	Does anyone know of a good resource for a 5-10 minute introduction to git. Something that doesn't explain it entirely, but does give them an introduction. Something like "homework you should look at before I tell you how to use it". I don't expect to advance beyond pull/push.	16:06
	→ albel727 joined	16:06
	← mangolisk left	16:07
Zarthus	A video might be ideal, but I don't really care in what format it is in.,	16:07
osse	Zarthus: any prior knowledge with VCSes?	16:07
Zarthus	None, they're complete novices.	16:07
	→ subhojit777 joined	16:07
Zarthus	I plan to explain it to them in person, but won't see them until next week.	16:07
danimal2	Zarthus, im sure there's bazillions on YT..just my .02	16:07
	→ mischat joined	16:08
	→ madewokherd joined	16:08
Zarthus	I looked at the GitHub youtube account and it's boring as hell.	16:08
osse	!videos	16:08
gitinfo	[!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	16:08
	→ jknetl joined	16:08
	→ uofxj joined	16:08
Zarthus	I bet the Linus Torvalds one is going to be fun	16:08
osse	the first few minutes of the Jessica Kerr one are good imho	16:08
	the whole is longer than 10 minutes though	16:08
Zarthus	I don't really mind.	16:09
	← Jameser left	16:09
danimal2	Zatrthus,what helped me alot as a newb was Sourcetree if they are working on windows.	16:09
Zarthus	I'm recommending they install Github For Desktop/SmartGit/Sourcetree, but that's kinda offtopic here.	16:09
	← tlaxkit left	16:10
	← shakalaka left	16:10
	← mischat_ left	16:10
	→ Guest26 joined	16:11
osse	I don't have much experience with any of those, but I do recommend that you stay as far away from tortoisegit as possible	16:11
	← uofxj left	16:11
	→ _cyril_ joined	16:11
Zarthus	yep, I had horrible experiences with that.	16:11
	SmartGit was how I got introduced to git, it's pretty neat -- until I broke things and someone else had to fix things.	16:12
	← aswen left	16:12
Zarthus	I love how Jessica Kerr is shitting on subversion	16:12
danimal2	yeah Tortoisegit i remember hosed me more than once...years ago when i fooled with it.	16:12
	→ shakalaka joined	16:13
	→ grayjoc joined	16:13
Zarthus	I fear this video might still be a bit too technical.	16:13
	→ miklcct joined	16:14
osse	Zarthus: btw, she's given this talk in a more refiner manner later. but i like the whiteboard etc. it makes stuff more intuitive. I've personally had much success in writing "HEAD" and "master" on a couple of stickies to explain stuff	16:14
	← mischat left	16:15
	← fedepad left	16:15
	← jeanres left	16:15
	→ mischat joined	16:15
Zarthus	They're telling us to start a 6 man project without any explanation of version control. And I'm not looking forward to using dropbox on a 6 man project.	16:15
osse	Zarthus: the one by scott chacon is really good too.	16:15
_ikke_	Zarthus: Same when I went to school. Discovered version control ourselves	16:16
	← dreiss left	16:16
	→ jeanres joined	16:16
Zarthus	_ikke_: in week 6 of the first year? :P	16:16
	← eshlox left	16:16
_ikke_	Zarthus: probably	16:16
Zarthus	Did you use any resources to teach them/yourself?	16:16
_ikke_	Started with SVN at the time, but for git, !books has good resources	16:17
gitinfo	[!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	16:17
_ikke_	and questions on stackoverflow	16:17
danimal2	Zarthus, i dont work as part of a team,just solo dev with my own repos..what made it clear for me is just make ur changes, test, when all good, Commit, then push to your remote repo if necessary.	16:17
_ikke_	!parable is good if you want to explain or learn the principles of version control	16:18
gitinfo	'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html	16:18
	← albel727 left	16:19
	→ albel727 joined	16:19
	→ davimore__ joined	16:19
	← LocusAsaf left	16:19
	← dan2k3k4 left	16:19
	← EvilPenguin left	16:20
	← shiriru left	16:20
danimal2	nice link, thank you _ikke_	16:20
	← cyan__ left	16:20
	← Guest26 left	16:21
	← svm_invictvs left	16:21
	← JamesBaxter left	16:21
	→ Guest26 joined	16:21
Zarthus	I've dumped some resources in our distributed dropbox. Hopefully they take the time to read/watch some of it	16:22
	thanks!	16:22
	← davimore_ left	16:22
	← Gsham left	16:22
	→ Shentino joined	16:22
	→ EvilPenguin joined	16:22
_ikke_	yw	16:23
	→ nitric joined	16:24
	← skunkz left	16:24
	← Serpent7776 left	16:25
	→ _geoff joined	16:25
Exagone313	Hi, I'd like to fork and maintain a project that uses git, but I'm not very familiar with. I wrote this scheme of local repo I could use http://dpaste.com/0VMN2QJ Is it bad? I don't know yet how would I succeed to do that but I'll search. Thanks for your help.	16:25
	← rominronin left	16:25
	← Derperperd left	16:28
	→ alfism joined	16:28
	→ eshlox joined	16:28
	→ cdg joined	16:29
	← blackwind_123 left	16:29
	← kurkale6ka left	16:30
	→ jstimm joined	16:31
	→ Gsham joined	16:32
	→ JamesBaxter joined	16:32
	→ LionsMane joined	16:32
	← mikecmpbll left	16:33
	← Pieplay left	16:33
	→ [Brain] joined	16:33
	← patarr left	16:33
	← encod3 left	16:34
	→ hahuang65 joined	16:34
	→ mischat_ joined	16:34
	→ blackwind_123 joined	16:34
	→ pks joined	16:35
	→ Derperperd joined	16:35
	← fahadash left	16:36
	← Derperperd left	16:37
	← mischat left	16:37
	→ robotroll joined	16:37
	→ a_thakur joined	16:37
	← brokensyntax left	16:38
	→ synthroid joined	16:38
	→ manuel joined	16:38
	→ svm_invictvs joined	16:38
	→ LeBlaaanc joined	16:40
	→ mischat joined	16:40
	← hahuang65 left	16:40
	← synthroi_ left	16:41
	← mischat left	16:41
	← LeBlaaanc left	16:41
	→ mischat joined	16:42
	← Gsham left	16:42
	→ _August_ joined	16:42
	→ nilg joined	16:42
	→ brokensyntax joined	16:42
	← mischat_ left	16:43
	→ hahuang65 joined	16:43
	← _cyril_ left	16:45
_August_	I have a branch that im trying to merge the changes to another branch but im wondering how can I merge the change into another branch under a single commit instead of all the commits from the branch im merging from. So how can I take 5 commits and combine them into a single commit?	16:46
osse	merge --squash	16:46
	← brokensyntax left	16:46
	→ brokensyntax joined	16:47
_August_	so git merge --squash "merge title" ?	16:47
	→ anonymuse joined	16:47
_August_	osse ^^	16:47
	→ kulelu88 joined	16:48
osse	where did you get that from?	16:48
	write the merge liek you would otherwise, but add --squash to it	16:48
_August_	ohh ok	16:48
	→ durham joined	16:48
	→ overlord_tm joined	16:49
	← anonymuse left	16:51
	→ mischat_ joined	16:51
	→ _cyril_ joined	16:52
	→ LeBlaaanc joined	16:52
	→ skunkz joined	16:52
	→ Skryll joined	16:53
	← achadwick left	16:53
	← shakalaka left	16:54
	← gniourf left	16:54
	→ flavius joined	16:54
	→ shakalaka joined	16:54
	← DeltaHeavy left	16:54
	← mischat left	16:55
	→ SteffanW joined	16:56
	← buddyq left	16:58
	→ cyan__ joined	16:58
	→ yohnnyjoe joined	16:59
	→ foist joined	16:59
_August_	osse: Why when i try to push the merge it keeps saying everything up to date and doesnt push?	16:59
	→ notebox joined	16:59
_August_	i pull everything to make sure it was current	16:59
	→ SamuelAlderson joined	17:00
_August_	wait... when i squash everything do i have to recommit them?	17:01
	→ X-Kent joined	17:01
	→ roelmonnens joined	17:01
	← synthroid left	17:01
	← jstimm left	17:02
X-Kent	hi, I have checked out, master, then did "git checkout remotes/origin/name_of_branch". Now I am in "detached" state and it didn't seem to update anything, how do I switch a remote branch ?	17:02
osse	_August_: yes, you have to run git commit after	17:02
	X-Kent: !detached	17:02
gitinfo	X-Kent: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	17:02
_August_	Got it, thanks	17:02
X-Kent	!reattach	17:03
gitinfo	Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue	17:03
	← SamuelAlderson left	17:03
osse	X-Kent: if you only wanted to checkout the remote branch to look at it, test it, compile it, whatever, then being detached is completely fine	17:03
	← jeffreylevesque left	17:03
	← Guest26 left	17:03
osse	if you want to work on it, do the checkout -b thing	17:03
X-Kent	osse, nope, I did my code on the master and now I need to deliver it to another branch, I can't figure out how to get anything pointing to that remote branch so I can merge and commit	17:04
	osse, I tried checking out master again and then branching but it became detached	17:05
	→ Gsham joined	17:05
	← elect left	17:05
osse	X-Kent: to update a remote branch you push	17:05
X-Kent	osse, yea I mean commit and then push, but I can't get a working copy that has that branch as a remote	17:06
	← albel727 left	17:06
	→ albel727 joined	17:06
osse	then you did something wrong	17:06
	!repro	17:06
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see	17:06
	← Gsham left	17:06
X-Kent	is there a way to just checkout that new branch ?	17:07
	→ tyreld joined	17:07
osse	which new branch?	17:07
	the remote one? no.	17:07
	← notebox left	17:07
	← albel727 left	17:07
	→ dendazen joined	17:08
X-Kent	osse, when I do "branch -a" in my master I see it as "remote/originin/branch_name"	17:08
	→ albel727 joined	17:08
	← albel727 left	17:08
	→ albel727 joined	17:08
X-Kent	and git shows that my current is "remotes/origin/HEAD"	17:08
	how do I switch it to "remote/origin/branch_name" ?	17:09
osse	what happened when you tried to do what you were recommended ?	17:09
X-Kent	I tried "git branch remote/origin/branch_name", now it says it's detached and I can't pull/push	17:09
osse	you need to create a LOCAL branch named 'branch_name'	17:10
	→ thiago joined	17:10
osse	which git checkout -b branch_name will do if you have checked out remotes/blablba previously	17:10
X-Kent	I didn't checked out remotes/blala, always worked on master	17:11
	→ mikecmpbll joined	17:11
	← robotroll left	17:11
osse	the first thing you said when you join was that you did	17:11
X-Kent	so, in my master I do "get checkout -b branch_name" and then pull ?	17:11
	→ CalimeroTeknik joined	17:12
osse	X-Kent: "I have checked out, master, then did "git checkout remotes/origin/name_of_branch". Now I am in "detached" state"	17:13
	is this still true?	17:13
X-Kent	osse, I already deleted that and checkout again clean master	17:13
osse	git checkout -b branch_name origin/branch_name	17:13
	→ anonymuse joined	17:14
X-Kent	just a sec	17:14
	→ lus joined	17:14
	← _ADN_ left	17:15
	→ durham_ joined	17:16
	← troulouliou_div2 left	17:16
	← brokensyntax left	17:16
	→ brokensyntax joined	17:17
	← durham_ left	17:17
X-Kent	osse, it says "Branch branch_name set up to track remote branch branch_name from origin." and "Switched to a new branch 'branch_name'"	17:17
	← a_thakur left	17:17
osse	fantastic	17:17
X-Kent	osse, I can now pull ?	17:17
osse	now you have a local branch you can work in, and if you run 'git push' stuff gets push to the remote equivalent	17:17
	→ durham_ joined	17:17
osse	X-Kent: yes	17:17
X-Kent	osse, that's perfect, thank you !	17:17
	→ Alienpruts joined	17:17
X-Kent	osse, git is really hard when you are used to svn	17:18
	← LeBlaaanc left	17:18
	← durham left	17:19
osse	X-Kent: since you've already done work in master you can copy that over to this branch by using cherry-pick	17:19
	← kajnc left	17:19
	→ synthroid joined	17:19
X-Kent	osse, I will just run "meld" and merge it there manually :-)	17:19
	→ dreiss joined	17:20
	→ joki joined	17:20
	← pks left	17:21
b_jonas	If I run (git diff --cached -- foo) then the foo is relative to the working directory, but in (git diff --cached -- :/foo) the foo is relative to the repository root.	17:21
	Where is that syntax documented in the git manpages?	17:21
	← maret left	17:21
b_jonas	I know that git help rev-parse documents all the syntax for arguments that denote objects, but this is a filename argument.	17:21
	I'd like to know what all the syntax for filename arguments is.	17:22
	→ pks joined	17:22
	← dsantiago left	17:22
	← cyan__ left	17:22
	→ rominronin joined	17:22
	← converge left	17:23
osse	b_jonas: man gitglossary, under 'pathspec'	17:23
gitinfo	b_jonas: the gitglossary manpage is available at http://jk.gs/gitglossary.html	17:23
osse	(don't blame me. I didn't put it there)	17:23
	→ buddyq joined	17:24
	→ raphink joined	17:24
	← EvilPenguin left	17:24
b_jonas	osse: thank you, that's where it is!	17:24
	← marcogmonteiro left	17:24
b_jonas	I'll have to read that carefully	17:24
	← wget left	17:24
b_jonas	I must admit, I don't really like this magic syntax, because :/ means something completely different as a revision argument	17:24
osse	b_jonas: very. it's nearly incomprehensible :p	17:24
	→ wget joined	17:25
	← wget left	17:25
	→ wget joined	17:25
b_jonas	so without the -- it gets utterly ambiguous	17:25
	→ cdown joined	17:25
	→ EvilPenguin joined	17:26
	← buddyq left	17:26
	← jimi_ left	17:26
	← shakalaka left	17:27
	→ buddyq joined	17:27
	→ chrisgeorge joined	17:28
	← albel727 left	17:28
	→ shakalaka joined	17:28
	→ albel727 joined	17:28
	← chll_ left	17:29
	← e14 left	17:29
	→ stuh84 joined	17:30
	→ e14 joined	17:30
	← durham_ left	17:30
	← guampa left	17:31
	→ durham_ joined	17:31
	← durham_ left	17:31
	→ durham_ joined	17:32
	→ LocusAsaf joined	17:32
	→ Guest6802 joined	17:32
LocusAsaf	osse: just wanted to let you know that I worked out a reasonable way to solve my problem. I'm walking down the output of revlist until I hit the first commit hash that equals the hash of my trunk heads.	17:33
	← ferr left	17:34
	← kireevco_ left	17:34
	→ encod3 joined	17:34
	← X-Kent left	17:35
	← Remram left	17:35
LocusAsaf	also, I appreciate the help before	17:35
	→ davimore joined	17:35
	← JamesBaxter left	17:35
	→ kireevco_ joined	17:35
	← xall left	17:35
	→ tang^ joined	17:36
	→ iosnerd joined	17:36
	← davimore__ left	17:36
	← Guest6802 left	17:36
	→ maxxe joined	17:36
	← kireevco_ left	17:37
	→ JamesBaxter joined	17:37
	→ kireevco joined	17:37
	→ cagedwisdom joined	17:37
	→ Remram joined	17:38
	← encod3 left	17:38
	← EvilPenguin left	17:39
	← diogenese left	17:39
	→ a_thakur joined	17:40
	← jeanres left	17:40
	→ kajnc joined	17:40
	→ duderonomy joined	17:40
	← subhojit777 left	17:40
	→ diogenese joined	17:40
	duderonomy → Guest60828	17:40
ronny	hi	17:41
	is there a poreclain command that tells me of a git repo is shallow?	17:41
	→ patarr joined	17:41
	→ guampa joined	17:42
cbreak	ronny: does git config count? :)	17:43
	← alex1a_ left	17:43
	→ nettoweb joined	17:44
	← raphink left	17:44
	← iosnerd left	17:44
	→ PCatinean joined	17:44
	→ iosnerd joined	17:44
cbreak	hmm... I guess you can just look at .git/shallow	17:45
	← raspado left	17:45
	→ raspado_ joined	17:45
	← a_thakur left	17:45
ronny	cbreak: i want to provide an option to user to deide what to do in shallow clones (i.e. fail auto-unshallow or warn that data is incorrect)	17:45
	→ WakiMiko joined	17:45
	← roelmonnens left	17:45
	← nettoweb left	17:46
	← anonymuse left	17:47
	→ anonymuse joined	17:47
	← umpc left	17:48
	← bernardio left	17:48
	← joki left	17:48
	← nilg left	17:49
	→ EvilPenguin joined	17:50
	← shakalaka left	17:50
	← mischat_ left	17:51
	→ Sasazuka joined	17:51
	→ shakalaka joined	17:51
	← saml left	17:52
	→ pothepanda joined	17:52
	→ a_thakur joined	17:53
	← freimatz left	17:53
	→ davimore_ joined	17:54
	← thiago left	17:54
	→ jimi_ joined	17:54
	← PCatinean left	17:54
	→ dsantiago joined	17:54
	→ PCatinean joined	17:56
	→ dsantiag_ joined	17:56
	← dsantiago left	17:56
	← rominronin left	17:57
	→ thiago joined	17:57
	← albel727 left	17:57
	← davimore left	17:57
	← khfeng left	17:57
	→ albel727 joined	17:57
	← einnjo left	17:59
	← Guest60828 left	18:00
	← fuchstronaut left	18:00
	→ duderono_ joined	18:00
	→ nettoweb joined	18:01
	← navidr left	18:01
	← ki0 left	18:03
	→ mountpoint joined	18:03
	→ converge joined	18:05
	← ojdo left	18:05
	→ hahuang61 joined	18:07
	← albel727 left	18:07
	← hahuang65 left	18:07
	→ albel727 joined	18:07
	→ saml joined	18:08
	→ khfeng joined	18:09
	→ hypercube32 joined	18:10
	← BSAlb left	18:11
	← grayjoc left	18:11
	→ BSaboia joined	18:11
	→ artisanIndia joined	18:12
artisanIndia	I have committed some files and then made changes in all of them and then I added some of them into gitignore, now if I do a git reset --soft will that discard the changes as well ?	18:13
osse	LocusAsaf: Sounds reasonable	18:13
	← jimi_ left	18:14
	→ fuchstronaut joined	18:14
	← kajnc left	18:14
	→ WayToDoor joined	18:14
	→ mibr0 joined	18:17
artisanIndia	how do I ignore permission changes from the push ?	18:18
	→ eyou joined	18:18
	→ fedepad joined	18:18
	← fuchstronaut left	18:19
	← a_thakur left	18:19
	← lindenle left	18:20
	→ einnjo joined	18:21
	← bocaneri left	18:22
	→ vannorden joined	18:22
	→ btyne79 joined	18:22
	← CheckDavid left	18:23
	← cagedwisdom left	18:24
	→ Darren_ joined	18:24
	← albel727 left	18:24
	→ albel727 joined	18:24
	→ jstimm joined	18:24
canton7	artisanIndia, git doesn't track permissions (except the execute bit)	18:26
	→ fahadash joined	18:26
	→ vuoto joined	18:26
artisanIndia	ok	18:26
Exagone313	Hi, I'd like to fork and maintain a "mod" of a game, that has a repo on Github. They have multiple branches and I want to clone/pull their branch master (this is not a problem), let's say into the branch "original" (not master). Then, if what I get is compilable, I want to merge with my changes in the local branch named "dev". When I get something compilable in dev, I want to merge into my local "master". At any time, I want to push my branches dev and	18:27
	master (if possible, not original branch) into another distant repo. Also, the original repo uses two submodules, and I'd like to keep them in my other branches dev and master, and if it's possible, to not clone them too many times (I think it can track it is the same commit for submodules, so it would keep the submodule directories when changing the current working branch). Is there something wrong in my idea? Can you help me with that? Thanks for your	18:27
	help.	18:27
	← ygeLN left	18:27
	→ hariel joined	18:28
moritz	Exagone313: which part do you need help with?	18:28
	→ monomon[m] joined	18:29
	→ sea-gull joined	18:29
	→ ygeLN joined	18:29
	→ ToBeFree joined	18:30
	← alhariel left	18:31
Exagone313	basically what I currently know and use is clone/pull/add/commit/push. I can read more docs about it (also about merging branches) on my side. What I don't know is if I can pull into original the code I fork, work on dev, and push dev/master into another repo of mine (not on github)	18:31
	← duderono_ left	18:31
ronny	cbreak: checking jsut for the file was perfect, thanks	18:31
	← ronny left	18:32
	← texasmynsted left	18:32
	← vannorden left	18:32
	← jknetl left	18:34
	→ emptynine joined	18:34
	→ texasmynsted joined	18:34
	← sveinse left	18:35
	← dreiss left	18:35
moritz	Exagone313: you can add the original repo as a remote, let's say with name upstream	18:35
	Exagone313: then you can git fetch upstream; git merge upstream/master	18:35
	→ cagedwisdom joined	18:36
	→ cyan__ joined	18:36
	← eyou left	18:37
	→ overo joined	18:38
_August_	why would i get a not something we can merge	18:39
	error?	18:39
	← stuh84 left	18:39
	← cdg left	18:40
	→ Groscheri joined	18:40
overo	hi! Brief question: I'm in branch MyFeatureA. If I 'git add' new updated files for a work-in-progress feature, then I 'git commit' them and then I 'git checkout -b MyFeatureA-experiment', have I committed the new updated files to my new (local) branch MyFeatureA-experiment?	18:40
	← mountpoint left	18:40
	← vuoto left	18:40
lungaro	minor confusion w/ git config. Is there a wayto use --list w/ a pattern prefix or section?	18:41
	← albel727 left	18:41
	→ albel727 joined	18:41
Exagone313	so, something like `git remote add -t master upstream url` then when I'm in branch original, `git fetch upstream; git merge upstream/master`. What do I do to set origin only for my dev and master to be able to push? Does original have to be pushed too?	18:41
overo	or should I had 'git checkout -b newbranch' just before 'git commit' ?	18:41
Exagone313	moritz:	18:41
	→ nikivi joined	18:41
	→ alex1a joined	18:41
_August_	nvm i got it	18:42
Exagone313	I think it's dumb, just have to push everything to my own distant repo	18:46
	→ QwertyDragon joined	18:46
	→ mountpoint joined	18:47
	← mountpoint left	18:47
	athaller → athaller_	18:48
	athaller_ → athaller__	18:48
	athaller__ → athaller____	18:48
	athaller____ → athaller	18:48
	← e14 left	18:49
	→ mountpoint joined	18:49
	← mountpoint left	18:49
	→ abec0 joined	18:52
	→ mountpoint joined	18:52
	← mountpoint left	18:52
	→ Repox joined	18:53
	→ e14 joined	18:53
	→ rominronin joined	18:54
	→ mountpoint joined	18:55
	← thiago left	18:56
	→ crayon joined	18:57
	← crayon left	18:57
	→ ronny joined	18:58
ronny	hi	18:58
	another question, whats the most reliable poreclain command to figure the current branch?	18:58
	← howdoi left	18:59
	← diogenese left	18:59
	→ mablae joined	19:00
	→ Rodya_ joined	19:00
	← Repox left	19:01
	← khfeng left	19:01
	→ mischat joined	19:01
moritz	git branch, git status	19:03
	← eivarv left	19:03
	← acetakwas left	19:04
	← jstimm left	19:04
	← davimore_ left	19:05
moritz	if you meant plumbing, git rev-parse --symbolic-full-name --abbrev-ref HEAD	19:06
	→ khfeng joined	19:06
	→ eivarv joined	19:07
	← TomyWork left	19:07
	← modlin left	19:08
Seveas	ronny: and if scripting: do make sure you handle detached heads (== no current branch) properly :)	19:09
	→ maret joined	19:10
	← johnnyfive left	19:11
	← converge left	19:11
	→ diogenese joined	19:11
	→ Overand joined	19:11
	→ nilg joined	19:12
Overand	Is there a reasonable way for me to get "git" to default to a particular remote, i.e. "git clone SomeNonsense" doing "git clone https://github.com/Overand/SomeNonsense" ? (Or allowing 'git clone Overand/SomeNonsense' ?)	19:12
	← ocbtec left	19:12
Overand	or am I just better off writing a little alias "ghub" that does e.g. "git clone https://github.com/$@	19:13
	→ Joel joined	19:13
Joel	I have two copies of a repository, are there any gui (I know, I know) tools, which will walk them, and graph out the commit history, showing where they intersect and don't?	19:13
Overand	Ouch! That sounds like a fun problem.	19:14
	I'm curious what the answers will be	19:14
	← _August_ left	19:14
	→ aarobc joined	19:14
	← alex1a left	19:14
	→ johnnyfive joined	19:15
kadoban	Joel: Fetch one into the other and use 'gitk --all' ?	19:15
	→ kajnc joined	19:15
	→ fuchstronaut joined	19:15
	→ star_prone joined	19:15
kadoban	Overand: I have an SSH alias for github, so I just do 'git clone github:kadoban/whatever' for example.	19:15
	You can also have rewrite rules on URLs in git, you'd have to look in the config for the syntax though, I don't remember it.	19:16
	← sangy left	19:16
	← PCatinean left	19:17
	← khfeng left	19:17
	→ dreiss joined	19:17
	→ m0viefreak joined	19:19
	← eivarv left	19:19
	→ isysd joined	19:20
	→ _ADN_ joined	19:20
	← star_prone left	19:20
	← fuchstronaut left	19:20
	← johnmilton left	19:21
	← thebloggu left	19:22
	→ nidr0x joined	19:22
	← Endarked left	19:22
	→ [ADN] joined	19:22
	← phaleth left	19:25
	→ Endarked joined	19:25
	← _ADN_ left	19:25
	→ menip joined	19:25
	← rominronin left	19:28
	← Skryll left	19:29
	→ le_melomane joined	19:30
	← skyfaller left	19:31
	← kajnc left	19:31
	← mablae left	19:31
	← artisanIndia left	19:32
	← maret left	19:32
	→ crayon joined	19:32
	← crayon left	19:32
	→ crayon joined	19:32
	← Endarked left	19:34
	→ duderonomy joined	19:35
	← dreiss left	19:35
	duderonomy → Guest32156	19:35
	→ zeroed joined	19:36
	← zeroed left	19:36
	→ zeroed joined	19:36
	← LocusAsaf left	19:38
	→ Haliucinas joined	19:38
	← Haliucinas left	19:38
_ikke_	Joel: Easiest is to let git do the work	19:38
	either add one as a remote to the other, and fetch from it, or create a new repository and fetch both in there	19:38
	→ johnmilton joined	19:39
	← menip left	19:39
	← Electrometro left	19:41
	← patarr left	19:42
	→ elastix joined	19:44
	← nikivi left	19:44
	→ davimore joined	19:45
	→ nikivi joined	19:46
Joel	_ikke_, I'm trying to figure out why I'm getting unexpected behavior	19:46
	→ dreiss joined	19:46
	→ eivarv joined	19:46
	← nikivi left	19:48
overo	hey all, I committed a feature to the wrong branch. Is there a way to move the commit onto the right branch?	19:48
^7heo	not "move" per se no	19:48
overo	oh I see	19:49
^7heo	I mean, depends if you pushed	19:49
overo	I could 1. checkout on the commit 2. push it to the right branch too 3. revert the commit from the wrong branch, maybe?	19:49
^7heo	nah wait	19:49
overo	k	19:49
^7heo	go on the branch where you want the commit	19:49
overo	k	19:49
^7heo	cherry-pick it	19:50
	→ modlin joined	19:50
overo	git cherry-pick ? Do I need any other parameter?	19:50
	← ahmedelgabri left	19:50
	→ Guest26_ joined	19:51
^7heo	the sha of the commit	19:51
	← Guest26_ left	19:51
^7heo	like	19:51
	git log -n1 --online branch-where-the-commit-is	19:51
	will show you the sha	19:51
	or the shorthand	19:51
overo	oh by the way, it's still in local repo	19:51
	do I need --online anyway?	19:52
^7heo	no	19:52
overo	I now have the sha	19:52
^7heo	if it's just in local it's gonna be very easy	19:52
	so	19:53
	go to the branch where you want it	19:53
overo	ok	19:53
	I am on it	19:53
^7heo	git cherry-pick $sha	19:53
	then you have the branch as you want, right?	19:54
overo	uhm, it doesn't autocomplete the sha, is that a bad sign?	19:54
^7heo	(and we'll clean the other branch right after)	19:54
	depends on your shell	19:54
overo	autocompletion shows branches by name	19:54
	I'm on bash	19:54
^7heo	I never use bash	19:54
	I dunno	19:54
	try	19:54
	at worse, the cherry pick will complain and abort	19:54
overo	error: could not apply 306fe52...	19:55
	indeed :D	19:55
^7heo	damn	19:55
	okay	19:55
overo	oh my	19:55
^7heo	I'm sorry I do other things	19:55
overo	now I have the commit in the right branch too, though :D	19:55
^7heo	ok?	19:55
	do a `git status` to check all is in order	19:55
	→ khfeng joined	19:56
overo	there are two changes to be committed (green) and one unmerged path (red)	19:56
	but the new file is being recognized (the one I committed to the wrong branch)	19:56
	recognized as waiting to be committed, and I'm on the right branch now, I mean	19:56
	can I 'git commit -m "stuff"'?	19:57
	→ converge joined	19:57
	← finalbeta left	19:57
^7heo	overo: sorry I'm really in a rush	19:58
overo	okok	19:58
	→ finalbeta joined	19:58
overo	it seems it works though	19:58
	tyvm	19:58
^7heo	overo: I gave you the complex instructions, you might have been ok with a merge or rebase	19:58
	cherry-pick isn't the easiest	19:58
	← cdown left	19:58
^7heo	but	19:58
	you want to resolve the delta	19:58
overo	git-scm.com good for learning?	19:58
^7heo	and call `git cherry-pick --continue`	19:58
	yeah I thnink	19:58
overo	uhmkay, I'll note that down	19:58
	"resolve the delta, ..."	19:59
	→ cdg joined	19:59
osse	!eek	19:59
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	19:59
osse	overo: run 'git diff	19:59
	some parts of the file have <<<< ===== >>>> in them	19:59
	fix it so it's how it's supposed to be	19:59
	→ chrisgeorge_ joined	19:59
	← crose left	20:00
	← chrisgeorge_ left	20:00
overo	osse: I've committed featureB to branchA, instead of branchB and I wanted to "move" the commit from branchA to branchB	20:00
	→ patarr joined	20:00
	← Alienpruts left	20:00
	← Guest32156 left	20:01
overo	and it worked as suggested by ^7heo !!!	20:02
^7heo	overo: btw	20:03
overo	I mean, I don't know if the commit have been moved around, but now the branchA has only featureA, and the branchB has only featureB !	20:03
^7heo	when you want to remove the commit from the other branch	20:03
	if it's on the tip of the branch	20:03
	← chrisgeorge left	20:03
^7heo	git reset --hard HEAD~	20:03
	if it has commits on top	20:03
	→ cdown joined	20:03
^7heo	git rebase -i $SHA~	20:03
	→ _August_ joined	20:03
overo	HEAD~ is the parent of current HEAD?	20:03
^7heo	then edit the file and 'drop' the commit you don't want	20:03
	overo: yes	20:03
	→ EvilPeng1 joined	20:04
	→ jknetl joined	20:04
	→ TomyLobo joined	20:04
ronny	Seveas: bascially i want to know the branch im on, and its ok to assume master in case of detached	20:04
	← Ryanar left	20:04
Seveas	ronny: git symbolic-ref HEAD 2>/dev/null \|\| echo 'master'	20:06
	← EvilPenguin left	20:06
	← rendar left	20:06
fb\|		20:06
	← overo left	20:07
	← [Brain] left	20:08
	← IrishPrime left	20:08
	← cdown left	20:10
	→ jstimm joined	20:10
	← ExoUNX left	20:12
	← catsup left	20:13
	→ Ryanar joined	20:14
	← shaggycat left	20:15
	→ nikivi joined	20:16
	← nilez left	20:16
	→ fuchstronaut joined	20:16
	← danimal2 left	20:17
	← thiefg left	20:18
	← aarobc left	20:19
	→ nilez joined	20:19
	← Groscheri left	20:19
	← SteffanW left	20:21
	← styx_ left	20:21
	→ Groscheri joined	20:23
	→ dsteplight__ joined	20:24
	→ rominronin joined	20:25
	← dsdeiz left	20:26
	← rnsanchez left	20:27
	← modlin left	20:27
	← nilez left	20:27
	→ nilez joined	20:27
	→ Balliad joined	20:27
	→ dbkaplun joined	20:28
dbkaplun	i have a long list of files that were once checked in but are now removed/renamed. how do i find what commit removed/renamed them?	20:28
	→ star_prone joined	20:28
	→ davimore_ joined	20:29
	← pumafied left	20:29
_ikke_	git log --diff-filter=D --all <file>	20:30
	← nikivi left	20:30
	← elastix left	20:30
	← khfeng left	20:30
	→ iosnerd_ joined	20:31
	← davimore left	20:32
	← iosnerd left	20:33
	→ hashpuppy joined	20:33
	← jjasinski left	20:33
	← yohnnyjoe left	20:35
	→ khfeng joined	20:36
	→ thiago joined	20:36
	← patarr left	20:37
	← le_melomane left	20:37
	→ garzer joined	20:38
	← fuchstronaut left	20:39
	→ aarobc joined	20:39
	→ gesker joined	20:40
	← khfeng left	20:40
	← heroux left	20:41
	← oskarkv left	20:42
	→ heroux joined	20:44
	← Ryanar left	20:44
	→ ahr3n joined	20:44
	← scottbuckel left	20:44
	← Rodya_ left	20:45
	← nilez left	20:45
	→ nilez joined	20:46
	→ Rodya_ joined	20:46
	→ patarr joined	20:47
	← zeroed left	20:47
	← Karazhan left	20:47
	→ Karazhan joined	20:47
	→ davimore__ joined	20:48
	→ aafu joined	20:49
dbkaplun	thanks	20:49
	→ EricPoe joined	20:49
	→ khfeng joined	20:50
	← Rodya_ left	20:50
	← nidr0x left	20:50
	gitinfo set mode: +v	20:50
	← davimore_ left	20:50
	← ieee left	20:51
	→ aidalgol joined	20:51
jast	osse: ++ is counted	20:52
	← synthroid left	20:53
	→ andlabs joined	20:53
andlabs	Hi. A few weeks ago my coworker changed some lines in a file, and those changed lines don't show up in my local branch. But git doesn't think they changed, so pushing my own changes - even to that file - don't overwrite those older changes, and a fresh clone reveals the correct lines. What's going on?	20:54
	→ dodobrain joined	20:54
moritz	andlabs: maybe your coworker didn't push his changes? or to a different branch?	20:55
andlabs	...and suddenly they show up NOW	20:58
	I have no idea; sorry for the noise	20:58
	← overlord_tm left	20:59
	← rominronin left	20:59
	← moritz left	21:00
	→ LeBlaaanc joined	21:00
	← ilbot3 left	21:00
	← CussBot left	21:01
	→ overlord_tm joined	21:02
	← eindoofus left	21:03
	← JamesBaxter left	21:03
	← f3r70rr35f left	21:03
	← garzer left	21:04
	→ moritz joined	21:04
	← aarobc left	21:04
	→ elijah joined	21:05
	← nilez left	21:05
	→ nilez joined	21:05
	← Balliad left	21:05
	→ dsdeiz joined	21:06
	← sea-gull left	21:07
	← e14 left	21:08
	← EvilPeng1 left	21:10
	→ CussBot joined	21:10
	← MrWoohoo left	21:10
	→ EvilPeng1 joined	21:10
	→ ilbot3 joined	21:10
	← cyan__ left	21:11
	← khfeng left	21:11
	← nowhereman left	21:11
	← jknetl left	21:15
	← overlord_tm left	21:15
	← mrwat left	21:15
	→ khfeng joined	21:15
	→ overlord_tm joined	21:16
	← eivarv left	21:16
	← anonymuse left	21:16
	→ anonymuse joined	21:16
	← aafu left	21:16
	← overlord_tm left	21:17
	→ overlord_tm joined	21:17
	← ayjay_t left	21:18
	← overlord_tm left	21:18
	→ garzer joined	21:18
	→ ayjay_t joined	21:18
	→ overlord_tm joined	21:19
	→ yohnnyjoe joined	21:19
	← peterR`` left	21:20
	← anonymuse left	21:21
	← mibr0 left	21:22
	← netj left	21:22
	→ netj joined	21:23
	→ peterR`` joined	21:24
	→ ffffffff11111111 joined	21:24
	→ nwkj86 joined	21:25
	← LeBlaaanc left	21:25
	← ash_workz left	21:26
	← Karazhan left	21:26
	→ Karazhan joined	21:26
	→ HoierM joined	21:27
	← dendazen left	21:27
	← mischat left	21:28
	→ mischat joined	21:29
	← AaronMT left	21:29
	← mischat left	21:29
	← GavinMagnus left	21:29
	→ mischat joined	21:30
	gitinfo set mode: +v	21:30
	← mischat left	21:30
	← andlabs left	21:30
ffffffff11111111	hi, could you make "make test" honor NO_PERL ? TIA	21:30
	← Darren_ left	21:31
	→ EvilPenguin joined	21:32
	← irco left	21:33
	→ l4v2 joined	21:34
	← EvilPeng1 left	21:34
	← Erati left	21:34
	→ anuxivm joined	21:35
	→ e14 joined	21:37
	← overlord_tm left	21:40
_ikke_	ffffffff11111111: The !mailing_list is a better revenue for such requests	21:41
gitinfo	ffffffff11111111: The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	21:41
	← _August_ left	21:41
_ikke_	s/revenue/venue/	21:41
	← manuel left	21:41
	← hahuang61 left	21:42
	→ manuel joined	21:42
	← fees left	21:42
Seveas	ffffffff11111111: no, it cannot.	21:43
	core test functionality relies on perl	21:43
	← raspado_ left	21:45
	← griffindy left	21:45
	← eshlox left	21:46
ffffffff11111111	_ikke_, thank you for info ; I'm patching the test suite ... Seveas, thats not true ; I'm at t5150-request-pull.sh already - it took me a few hours so far and 16 simple patches - "sed" and "tr"; "tac", "xxd" and "dd" on a single occasion each	21:46
	→ nezZario joined	21:46
	← gho5t left	21:47
ffffffff11111111	I can easily use a few lines of c code utils or "awk" in all cases	21:47
	→ raspado joined	21:47
	→ NeverDie joined	21:47
nezZario	Hello gentlemen.. I am wondering, I set my push.default option to 'current'... Why is it still telling me 'There is no tracking information for the current branch...' ? I thought the point of push.default current was that it always pushed/pulled from a branch with the same name on the remote.	21:47
	→ xall joined	21:48
nezZario	That is, if i'm on a branch called 'develop' then I should 'git pull' from the origin/develop and 'git push' to the origin/develop	21:48
	← iosnerd_ left	21:49
dmc	shouldn't this include git:// https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols	21:49
	← EvilPenguin left	21:50
Seveas	ffffffff11111111: do note that perl is used for constructs where writing portable sed equivalents is not possible (e.g. the ones in test-lib-functions.sh)	21:50
	→ misterpink joined	21:50
	→ iosnerd joined	21:50
Seveas	and tac and xxd are not available everywhere and/or portable	21:51
	→ raijin joined	21:51
nezZario	Are we talking about the best portable scripting language? Because there really isn't one.	21:52
_ikke_	nezZario: We aren't	21:52
	← littleforest left	21:53
nezZario	i think perl is probably the most widely distributed language that actually has a tit of power	21:53
Seveas	nezZario: no, just why some parts of the testsuite rely on perl for portability reasons	21:53
nezZario	anyone know what's up with the push.default question? i'm just tired of having to --set-upstream-to=....	21:53
ffffffff11111111	Seveas, the test suite itself uses "tr" and "sed" - adding "perl" is kind of pointless to me. Using "perl" for the sake of it is kind of sad :). See, "nul_to_q ()" @ "test-lib-functions.sh" uses "perl", a few lines later "q_to_cr ()" uses "tr" - inconsistent in my POV. Anyway, I'll listen to the mailing list advice. 10x for your time	21:53
nezZario	my git workflow is simple. i want to push/pull one branch at a time with the exact same name on origin	21:53
Seveas	ffffffff11111111: that's not using it for the sake of it. That one specifically is impossible to do with sed, as not all sed's handle NULL bytes properly	21:54
	same with handling cr and lf	21:54
ffffffff11111111	Seveas, I see your point. I'll try and make a consisten patch. Thank you.	21:54
	*consistent	21:55
	← NeverDie left	21:55
Seveas	ffffffff11111111: apparently you don't as you still think it's possible :)	21:55
	If it were, we would have gotten rid of perl in the testsuite a long time ago	21:55
_ikke_	There are smart people working on git	21:55
	right	21:55
Seveas	nezZario: current means 'current branch, if and only if it's actually configured with an upstream'	21:56
	← star_prone left	21:56
_ikke_	Seveas: That's not clear from the docs at least	21:56
	← EricPoe left	21:56
	→ rominronin joined	21:56
Seveas	it's also wrong. I keep mixing up current and upstream. Sigh :)	21:57
	→ elsevero joined	21:58
_ikke_	nezZario: It works for me	21:59
	→ Electrometro joined	21:59
_ikke_	nezZario: https://gist.github.com/Ikke/2efc37dd77af47939e0af5a445fa47c9	22:00
	← madewokherd left	22:00
	← ResidentBiscuit left	22:00
	← WayToDoor left	22:00
	← peeps[lappy] left	22:00
	← thebope left	22:01
	→ EvilPenguin joined	22:01
	→ thebope joined	22:01
	→ nowhereman joined	22:02
_ikke_	g2g	22:02
	→ f3r70rr35f joined	22:03
	← fedepad left	22:04
Seveas	ffffffff11111111: https://github.com/git/git/commit/f8fc0ee314d0e0c993d2edac8848a4cfe72c771f	22:04
	← e14 left	22:04
	→ nikivi joined	22:04
	← yohnnyjoe left	22:05
	← thebope left	22:05
	→ ISmithers joined	22:06
	← Dougie187 left	22:07
	← tlab left	22:07
	← patarr left	22:08
	← Groscheri left	22:09
ffffffff11111111	_ikke_, I have no doubt there are smart people working on git. Then again, the people who don't make mistakes don't exist yet IMHO as well as the ones who wrote the perfect code that can not be improved. Seveas, I need to complete my patch in order to observe my ignorance. Thank you both for your time. Back to the coding table.	22:09
mikecmpbll	what'd be the best way to get the tag before last?	22:10
	← ffffffff11111111 left	22:10
	→ e14 joined	22:11
	← _cyril_ left	22:11
Seveas	depends on your definition of 'before' and 'last'	22:12
	for before: temporally, topologically, or sorted as version numbers.	22:12
	← LionsMane left	22:12
Seveas	For last: most recent in time, closest reachable from HEAD or maybe something else	22:12
mikecmpbll	good point. temporally or topologically	22:13
	← kulelu88 left	22:13
mikecmpbll	the same way that git describe --tags get's the 'latest'	22:14
	"the most recent tag that is reachable from a commit."	22:15
	→ LandonJH joined	22:15
Seveas	topologically, with actually some changes in more recent gits	22:15
	← jstimm left	22:15
Seveas	giving side branches less of a priority	22:15
	→ jstimm joined	22:15
Seveas	dodgy hack actually using git-describe: git describe $(git describe \| sed -e 's/-[0-9]\+-g[0-9a-f]\+$//')^ \| sed -e 's/-[0-9]\+-g[0-9a-f]\+$//'	22:17
mikecmpbll	cor blimey	22:18
	← converge left	22:18
Seveas	much less dodgy (yay manpages): git describe --abbrev=0 $(git describe --abbrev=0)^	22:18
	← ochorocho__ left	22:18
	→ wgrant joined	22:18
	← afuentes left	22:19
	→ safe joined	22:19
mikecmpbll	Seveas : <33	22:20
	duh, why didn't i think of that.	22:20
	← Wulf left	22:20
	← nikivi left	22:21
	→ chris_ joined	22:21
	→ Wulf joined	22:22
	→ Darren_ joined	22:22
	← LandonJH left	22:22
	← chris_ left	22:23
	→ patarr joined	22:23
	← cagedwisdom left	22:23
	← EvilPenguin left	22:24
	→ kulelu88 joined	22:26
	→ courrier joined	22:27
	← patarr left	22:27
	→ anotheryou_ joined	22:30
	→ cdown_ joined	22:30
	← garzer left	22:30
	→ mischat joined	22:30
	← einnjo left	22:31
	← rominronin left	22:32
	→ codfection joined	22:33
	← kulelu88 left	22:33
	← anotheryou left	22:34
	← courrier left	22:34
	← LucaTM left	22:34
	← codfection left	22:35
	← anuxivm left	22:35
	← khfeng left	22:36
	← mischat left	22:36
	→ codfection joined	22:36
	→ EricPoe joined	22:36
	→ Lor_ joined	22:37
	← HoierM left	22:37
	← yqt left	22:37
	→ mizu_no_oto joined	22:38
	← f3r70rr35f left	22:38
	← codfection left	22:39
	→ cagedwisdom joined	22:39
	→ khfeng joined	22:39
	→ garzer joined	22:39
	← boombatower left	22:40
	→ codfection joined	22:40
	→ madewokherd joined	22:41
codfection	1	22:41
	→ cdown__ joined	22:41
	← malcon left	22:42
	→ t-mart joined	22:42
	← nettoweb left	22:43
	← shinnya left	22:44
	→ f3r70rr35f joined	22:44
	← cdown_ left	22:44
	→ nettoweb joined	22:45
Seveas	1	22:45
	→ theskillwithin joined	22:45
	→ kulelu88 joined	22:46
	← khfeng left	22:46
	→ Rodya_ joined	22:47
	← mizu_no_oto left	22:48
	→ yqt joined	22:48
	← f3r70rr35f left	22:49
	← xall left	22:49
	→ andlabs joined	22:49
qsx	2	22:50
	→ cdown_ joined	22:50
	→ catsup joined	22:51
	← codfection left	22:51
	→ xall joined	22:52
	→ cdown____ joined	22:52
	← Rodya_ left	22:52
	→ codfection joined	22:52
	← cdown__ left	22:53
	← jstimm left	22:53
	← Limes_ left	22:53
	← nettoweb left	22:53
Seveas	3	22:54
ojacobson	π	22:54
Seveas	fail	22:54
	← cdown_ left	22:54
	→ star_prone joined	22:57
	→ pumafied joined	22:57
	← King_Hual left	22:57
	→ peeps[lappy] joined	22:58
	← pumafied left	22:58
	← heroux left	22:59
	← mikecmpbll left	23:00
	→ heroux joined	23:00
	→ metrixx_ joined	23:01
	metrixx → Guest93927	23:01
	← star_prone left	23:01
	← dsdeiz left	23:01
	→ thebope joined	23:02
	← leeN left	23:03
	← cdown____ left	23:04
	← dodobrain left	23:04
	← dsteplight__ left	23:04
	← Guest93927 left	23:05
	← thiago left	23:06
	← thebope left	23:06
	← theskillwithin left	23:06
	→ theskillwithin joined	23:07
	→ _cyril_ joined	23:08
	← CEnnis91 left	23:08
	← finalbeta left	23:09
	→ ki0 joined	23:11
	→ f3r70rr35f joined	23:12
	← _cyril_ left	23:12
	Eugene kicked Seveas (5)	23:14
	→ reim joined	23:14
	← stomplee left	23:14
	← ahr3n left	23:14
	Eugene changed the topic to: Welcome to #git, the place for git help and public-access television programming \| Please take the git survey: https://jk.gs/gsurv \| Public logs at http://jk.gs/glog \| First visit? Read: http://jk.gs/git \| Current stable version: 2.10.1 \| Getting "cannot send to channel"? /msg gitinfo .voice \| git-bisect: No, not like that. Grow up.	23:14
	Eugene set mode: -o	23:14
	← garzer left	23:16
	← f3r70rr35f left	23:17
	← themill left	23:17
	→ heroux_ joined	23:18
	← heroux left	23:18
	heroux_ → heroux	23:18
	← matsaman left	23:18
qsx	5	23:19
	→ themill joined	23:20
	← Mixologic_ left	23:21
	→ arescorpio joined	23:22
	→ Derperperd joined	23:22
bremner	suckup	23:24
	→ f3r70rr35f joined	23:25
	→ dsdeiz joined	23:25
	← BPL left	23:26
	← Shentino left	23:26
	→ Mixologic_ joined	23:28
	→ Jameser joined	23:28
	→ littleforest joined	23:29
	→ rominronin joined	23:29
	← Wulf left	23:29
	→ duderonomy joined	23:29
	duderonomy → Guest75697	23:30
	→ HoierM joined	23:30
nezZario	Then what in the world did I do ?	23:31
	Why does everytime I go to push it makes me --set-upstream-to=	23:31
	→ LeBlaaanc joined	23:31
	→ mischat joined	23:32
	← LeBlaaanc left	23:33
	→ Dohplay joined	23:35
	← Jameser left	23:36
	← mischat left	23:36
	→ hahuang61 joined	23:36
	← Remram left	23:37
	← mountpoint left	23:39
	→ mancha joined	23:39
	← iosnerd left	23:39
milki	you probaly dont have a goodd default	23:39
	← Guest75697 left	23:39
	← QwertyDragon left	23:39
milki	git config push.default	23:39
	→ Remram joined	23:39
mancha	hi folks. does "git reset --hard HEAD^" nuke any trace of the last commit? in case it contains sensitive info.	23:40
	→ cdown_ joined	23:40
mancha	and if not, how to purge all traces (in objects etc) of the last commit.	23:40
	← cagedwisdom left	23:40
milki	mancha: !sensitive can help you	23:40
gitinfo	mancha: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	23:40
	→ duderono_ joined	23:41
milki	mancha: if you havent pushed to a public repo yet, what you did is probably sufficient to ensure you dont push your sensitive commit	23:41
	mancha: you can folow up with the cleanup steps in the article	23:41
	← hahuang61 left	23:42
mancha	i've not pushed. i did re-commit which created a file with the same name (without the sensitive info)	23:42
	→ dodobrain joined	23:42
	← manuel left	23:42
mancha	those instructions you link seem to rely on the path of the file to do its cleaning. but filename is re-used. :/	23:42
	is there an wasy way to troll the caches and objects and show them in human form so i can see if the sensitive data is anywhere locally?	23:44
	→ snowkidind joined	23:45
	← nickthetait left	23:45
	← yqt left	23:45
	← duderono_ left	23:46
	→ duderono_ joined	23:46
mancha	oh yeh, i see it there. i found it with reflog. so i guess i need to do some cleaning but not sure how.	23:47
	→ Rodya_ joined	23:48
	← ki0 left	23:48
	← jbitdrop left	23:50
	← solrize left	23:50
milki	mancha: basically you need to remove references to anything that points to the original file before you can force a garbage collection	23:50
	mancha: you already removed the old commit from your branch, but you also need to cleanup your reflog	23:50
mancha	right.	23:50
	how? :)	23:50
milki	mancha: step 9 shows that	23:50
	← CussBot left	23:51
milki	mancha: you can skip the for-each-ref since you didnt do the filter-branch steps	23:51
	← l4v2 left	23:51
mancha	ok, this doesn't work well	23:53
	because sensitive commit was #5	23:53
	← cdg left	23:53
mancha	if i use the time for that won't it expire reflogs for all <5?	23:53
	← Rodya_ left	23:54
milki	you are going to expire all reflogs	23:55
	you might be able to expire a single reflog	23:56
	um	23:56
	guess not	23:56
	milki shrugs	23:56
mancha	ok	23:56
	i think the easiest is to save the commits (maybe as patches) and then basically replay the commit process on a new repo.	23:57
	is there an easy way to replay commits or should i just script this in bash or similar?	23:57
milki	the alternative to 9 is listed at the end of the step	23:57
	← duderono_ left	23:57
milki	just clone the repo	23:57
mancha	that'll be clean of cruft?	23:57
	→ CussBot joined	23:57
	→ railssmith joined	23:57
milki	your new repo wont have cruft	23:57
mancha	ah nice.	23:57
milki	fresh clones never have cruft	23:58
	probably	23:58
mancha	hah	23:58
milki	you cant clone unreachable objects at least. that would be a security violation	23:58
	← dbkaplun left	23:59
milki	and clone doesnt use reflogs	23:59
mancha	let's give it a whirl	23:59
milki	if you know what your object id was, you can verify its gone in the new clone with git cat-file	23:59

Logs Search ←Prev date Next date→

Channels Documentation