IRCloggy #git 2017-07-04

Provider of IRC logs since 2005.

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

	2017-07-04
	→ fstd_ joined	00:00
	→ peterbecich joined	00:00
	← pyfoo left	00:00
	→ Cabanossi joined	00:02
	→ hherman1 joined	00:02
	← Trendrrr left	00:03
	← fstd left	00:04
	fstd_ → fstd	00:04
	← dsdeiz left	00:04
	→ Trendrrr joined	00:04
	← phinxy left	00:07
	← gugah left	00:07
	→ Kaisyu joined	00:08
	→ EvilPenguin joined	00:09
	← anuxivm left	00:12
	← gopar left	00:13
	→ gopar joined	00:13
	← Trendrrr left	00:13
	← EvilPenguin left	00:14
	→ jimmyrcom_ joined	00:15
	→ Trendrrr joined	00:15
	← PaulCapestany left	00:16
	→ Dreadnaught joined	00:16
	← Dreadnaught left	00:16
	→ Dreadnaught joined	00:16
	→ PaulCapestany joined	00:18
	← Kulrak left	00:18
	← bergice_ left	00:21
	← gopar left	00:24
	→ TbobbyZ_ joined	00:25
	← Trendrrr left	00:25
	← str left	00:26
	→ moth joined	00:27
	→ Trendrrr joined	00:27
	→ jimi_ joined	00:28
	← TbobbyZ left	00:28
	← TbobbyZ_ left	00:29
	→ star_prone joined	00:32
	→ theiostream joined	00:34
	← Trendrrr left	00:34
	→ dsdeiz joined	00:34
	← bill99 left	00:34
	→ Trendrrr joined	00:35
	← theiostream left	00:35
	← Muzer left	00:36
	← star_prone left	00:36
	→ orbyt_ joined	00:36
	← cyphase left	00:38
	← m0viefreak left	00:39
	← dsdeiz left	00:39
	← snowkidind left	00:40
	→ durham joined	00:40
	→ duderonomy joined	00:40
	→ bill99 joined	00:40
	← Maskettaman left	00:42
	← Tobbi left	00:42
	→ Hyp3ri0n joined	00:42
	← Hyp3ri0n left	00:43
	→ Maskettaman joined	00:43
	← Trendrrr left	00:44
	← cebula left	00:44
	→ cebula joined	00:44
	→ Hyp3ri0n joined	00:45
	→ Trendrrr joined	00:45
	→ peterbec` joined	00:45
	← bill99 left	00:45
	Hyp3ri0n → OtakuSenpai	00:47
	→ raynold joined	00:47
	→ Muzer joined	00:48
	→ bill99 joined	00:48
	← navidr left	00:49
	← peterbec` left	00:50
	→ TbobbyZ joined	00:52
	← bill99 left	00:52
	← durham left	00:53
	→ bill99 joined	00:53
	← jimi_ left	00:54
	← svm_invictvs left	00:54
	→ madewokherd joined	00:54
	→ cyphase joined	00:54
	← duderonomy left	00:54
	→ duderonomy joined	00:55
	← Gustavo6046 left	00:55
	→ gugah joined	00:56
	→ IntrinsicCause joined	00:56
	← Trendrrr left	00:58
	← TbobbyZ left	00:58
	→ TbobbyZ joined	00:58
	→ Trendrrr joined	00:59
	← peterbecich left	00:59
	→ mentazoom joined	01:00
	← dsantiago left	01:02
	← tunekey left	01:02
	→ d^sh joined	01:03
	← TbobbyZ left	01:03
	→ donmichelangelo joined	01:03
	← Trendrrr left	01:04
	→ Trendrrr joined	01:06
	← d^sh_ left	01:06
	← mvensky left	01:07
	→ wxg joined	01:08
	← sunri5e left	01:09
	→ TbobbyZ joined	01:09
	→ dsdeiz joined	01:09
	← dsdeiz left	01:09
	→ dsdeiz joined	01:09
	→ sunri5e joined	01:11
	← mniip left	01:12
	← j08nY left	01:12
	← misosoup left	01:13
	→ cagedwisdom joined	01:13
	← ojdo left	01:14
	← dsdeiz left	01:14
	→ Rr4sT joined	01:15
	← Cabanossi left	01:15
	← TbobbyZ left	01:16
	← OtakuSenpai left	01:16
	→ TbobbyZ joined	01:16
	→ Cabanossi joined	01:17
	← gugah left	01:17
	← ohHenry left	01:17
	→ notebox joined	01:19
	← lafleurdubien left	01:19
	← notebox left	01:19
	→ ojdo joined	01:20
	← TbobbyZ left	01:20
	→ finalbeta joined	01:21
	→ fakenerd joined	01:22
	← fakenerd left	01:26
	← GT4066 left	01:27
	→ gugah joined	01:28
	← quite left	01:30
	→ quite joined	01:30
	→ reynierpm joined	01:34
	← a_thakur left	01:36
	→ dsantiago joined	01:37
	← diogenese left	01:38
	→ diogenese joined	01:39
	← ward3n left	01:40
	→ sp33drac3r joined	01:40
	→ roelmonnens joined	01:41
	← IniGit left	01:43
	→ dsdeiz joined	01:44
	← dsdeiz left	01:44
	→ dsdeiz joined	01:44
	← Cabanossi left	01:45
	← ilbot3 left	01:45
	← roelmonnens left	01:45
	→ peterbec` joined	01:46
	→ Cabanossi joined	01:46
	← dsdeiz left	01:49
	→ ilbot3 joined	01:49
	→ perrier-jouet joined	01:50
	→ pyfoo joined	01:50
	← peterbec` left	01:51
	→ VaultTec joined	01:51
	→ Maskettaman_yo joined	01:55
	← Maskettaman left	01:56
	→ CBF16888 joined	01:56
	← davimore left	01:57
	← pyfoo left	01:57
	→ mellernoia joined	01:58
	← jimmyrcom_ left	02:00
	← pks left	02:00
	← Trendrrr left	02:01
	→ Trendrrr joined	02:03
	→ davimore joined	02:04
	→ pks joined	02:04
	← NeXTSUN left	02:05
	← cebula left	02:06
	← kyan left	02:06
	→ StuartMI joined	02:07
	→ jaziz joined	02:07
	→ nast joined	02:08
	→ Hyp3ri0n joined	02:08
	← moth left	02:10
	← xyphoid left	02:10
	← berndhs left	02:12
	← Hyp3ri0n left	02:13
	→ Hyp3ri0n joined	02:15
	→ peterbec` joined	02:16
	← jaziz left	02:17
	← ZyX-I left	02:17
	← HoierM_ left	02:18
	← Trendrrr left	02:18
	← kfoonamalik left	02:18
	→ cqi joined	02:18
	→ kyan joined	02:19
	→ dsdeiz joined	02:19
	← dsdeiz left	02:19
	→ dsdeiz joined	02:19
	← Hyp3ri0n left	02:19
	→ Trendrrr joined	02:20
	← Maskettaman_yo left	02:21
	→ star_prone joined	02:21
	← sp33drac3r left	02:22
	← gugah left	02:24
	← dsdeiz left	02:24
	← star_prone left	02:25
	→ snowkidind joined	02:26
	← cqi left	02:27
	→ Goplat joined	02:28
reynierpm	hi there	02:30
	can I get some advice here: https://stackoverflow.com/questions/44896081/how-to-setup-two-different-git-accounts-for-two-different-repositories-through-s ??	02:30
	(if you've a SO account please answer over there so I can give you the reward points)	02:31
	← chachasmooth left	02:31
	→ chachasmooth joined	02:32
	← Noldorin left	02:33
	→ shgysk8zer0 joined	02:35
	→ lagothri1 joined	02:35
	← lagothrix left	02:38
	→ TbobbyZ joined	02:40
	yanome → yn	02:40
	← TbobbyZ left	02:40
	→ TbobbyZ joined	02:41
	← VaultTec left	02:41
	→ menip joined	02:44
	← Cabanossi left	02:45
	← TbobbyZ left	02:45
	→ Cabanossi joined	02:46
	← kyan left	02:47
	← peterbec` left	02:48
	→ ahr3n joined	02:48
webstrand	reynierpm: It looks as if you've got the wrong permissions set on your .ssh directory. Try `chmod 0700 ~/.ssh -R` to fix the issue	02:49
	→ jameser joined	02:49
	→ jimi_ joined	02:51
	← wxg left	02:51
	→ Lyqyd joined	02:52
	→ xyphoid joined	02:53
	→ dsdeiz joined	02:54
	← nast left	02:56
_ikke_	0700 is not a good permission	02:56
	← cxreg left	02:56
webstrand	_ikke_: You're right, hadn't thought about recursion when I wrote that	02:56
	→ cxreg joined	02:57
_ikke_	644 for config and authorized_keys, 600 for private keys	02:57
	← xyphoid left	02:58
	← a3Dman left	02:58
	→ Vortex35 joined	02:59
	← dsdeiz left	02:59
	→ kyan joined	02:59
	→ nast joined	03:00
	→ rmbeer joined	03:01
rmbeer	hello	03:01
	← Peste_Bubonica left	03:01
rmbeer	i can remove with secure the files of .git/objects/ ?	03:02
_ikke_	no	03:02
	← zmt00 left	03:02
_ikke_	You will corrupt your repo	03:02
	→ zmt00 joined	03:02
rmbeer	the 'git add .' is break by out of space, and now have garbage that annoying, i unknown how to clean this...	03:02
	← Vortex34 left	03:03
_ikke_	rmbeer: git prune --expire=now -v	03:04
	→ a3Dman joined	03:04
	← nast left	03:04
	→ roelmonnens joined	03:05
rmbeer	_ikke_, very thanks!	03:05
	← zmt00 left	03:05
	→ zmt00 joined	03:06
	← zmt00 left	03:06
	→ NeXTSUN joined	03:06
	→ nast joined	03:07
	← roelmonnens left	03:09
	→ xyphoid joined	03:14
	→ Peste_Bubonica joined	03:15
	← Cabanossi left	03:16
	→ Cabanossi joined	03:16
	← mellernoia left	03:18
	→ nevodka joined	03:19
	← CBF16888 left	03:19
	← xyphoid left	03:20
	← nast left	03:20
	→ jon-mac joined	03:21
reynierpm	_ikke_, you're right that fixed my problem thx	03:21
	*a lot	03:21
	→ nast joined	03:21
	→ CBF16888 joined	03:22
	→ xyphoid joined	03:22
	← Peste_Bubonica left	03:22
	→ fakenerd joined	03:23
	← rmbeer left	03:24
adymitruk	is there a way to create an orphan branch with a commit that uses the tree from another commit?	03:24
	→ krs93_ joined	03:25
	← shgysk8zer0 left	03:25
	← krs93 left	03:26
	← xyphoid left	03:28
_ikke_	git commit-tree <tree> -m "message"	03:28
	← fakenerd left	03:28
	→ dsdeiz joined	03:29
	← dsdeiz left	03:29
	→ dsdeiz joined	03:29
	← krs93_ left	03:29
	← hherman1 left	03:32
	← Rr4sT left	03:32
	← Rodya_ left	03:33
	← dsdeiz left	03:34
	← cschneid left	03:34
	→ xyphoid joined	03:35
	← CBF16888 left	03:35
	← jimi_ left	03:36
	→ durham joined	03:36
	→ notebox joined	03:37
	← notebox left	03:37
	→ cschneid joined	03:39
	→ CBF16888 joined	03:41
	← Trendrrr left	03:43
	← livingstn left	03:44
	← xyphoid left	03:44
	→ Trendrrr joined	03:44
	→ SaberArthur joined	03:45
	→ Hyp3ri0n joined	03:45
	← SaberArthur left	03:46
	→ mmattice joined	03:46
	← ahrs left	03:48
	← orbyt_ left	03:48
	→ ahrs joined	03:49
	← mentazoom left	03:51
	→ kfoonamalik joined	03:53
	← duderonomy left	03:54
	← Trendrrr left	03:56
	← cschneid left	03:57
	→ Trendrrr joined	03:57
	← Cabanossi left	03:58
	→ livingstn joined	03:59
	→ Cl0udN9ne joined	03:59
	← Hyp3ri0n left	04:00
	← fstd left	04:00
	→ fstd joined	04:00
	→ xyphoid joined	04:00
	Cl0udN9ne → OtakuSenpai	04:00
	→ Cabanossi joined	04:00
	→ Rakkus joined	04:01
	→ czart__ joined	04:01
	← dreiss left	04:01
	← Rakkus left	04:01
	→ shinnya joined	04:02
	→ cschneid joined	04:02
	← Trendrrr left	04:04
	→ dsdeiz joined	04:04
	← czart_ left	04:04
	→ Trendrrr joined	04:05
	← xyphoid left	04:06
	→ rscata joined	04:07
	← dsdeiz left	04:09
	← Elon_Satoshi left	04:11
	← mattcen left	04:12
	← Trendrrr left	04:13
	→ dreiss joined	04:14
	→ Trendrrr joined	04:14
	→ jaziz joined	04:14
	← davimore left	04:15
	→ YuGiOhJCJ joined	04:16
	→ davimore joined	04:16
	→ svm_invictvs joined	04:17
	→ mattcen joined	04:18
	→ a_thakur joined	04:18
	→ olalonde joined	04:19
	← nast left	04:19
	→ xyphoid joined	04:21
	→ nast joined	04:21
	← Trendrrr left	04:23
	← dreiss left	04:23
	← durham left	04:24
	→ Trendrrr joined	04:24
	→ jceb joined	04:27
	→ peterbec` joined	04:28
	← xyphoid left	04:28
	← peterbec` left	04:33
	→ Rodya_ joined	04:35
	→ malmalmal joined	04:35
	← Hello71 left	04:36
	→ cqi joined	04:38
	← CBF16888 left	04:39
	→ dsdeiz joined	04:39
	← dsdeiz left	04:39
	→ dsdeiz joined	04:39
	← Trendrrr left	04:40
	← Rodya_ left	04:41
	→ dreiss joined	04:41
	← bitbit left	04:41
	→ Trendrrr joined	04:41
	← svm_invictvs left	04:44
	← dsdeiz left	04:44
	← Cabanossi left	04:44
	→ Cabanossi joined	04:45
	→ xyphoid joined	04:45
	→ Hello71 joined	04:46
	→ duderonomy joined	04:47
	← dave0x6d left	04:47
	→ zmt00 joined	04:47
	← zmt00 left	04:47
	← mmlb left	04:48
	→ zmt00 joined	04:48
	← zmt00 left	04:48
	← Trendrrr left	04:49
	→ zmt00 joined	04:49
	→ Trendrrr joined	04:50
	→ mniip joined	04:51
	← xyphoid left	04:52
	→ CBF16888 joined	04:55
	← TzilTzal left	04:56
	→ xyphoid joined	04:57
	← Trendrrr left	04:57
	→ podlech joined	04:58
	→ Trendrrr joined	04:58
	← xyphoid left	05:02
	→ svm_invictvs joined	05:03
	← snowkidind left	05:06
	→ xyphoid joined	05:06
	→ dec0n joined	05:08
	← Trendrrr left	05:09
	← madewokherd left	05:10
	→ dsdeiz joined	05:10
	← dsdeiz left	05:10
	→ dsdeiz joined	05:10
	← xyphoid left	05:11
	→ Trendrrr joined	05:11
	→ tens0r joined	05:12
	← dsdeiz left	05:15
	→ xyphoid joined	05:16
	→ crossroadsman joined	05:19
	← Trendrrr left	05:19
	→ Trendrrr joined	05:20
	→ df0 joined	05:21
	→ star_prone joined	05:21
	→ govg joined	05:22
	← svm_invictvs left	05:22
	← malmalmal left	05:22
	→ fakenerd joined	05:23
	← nast left	05:25
	← xyphoid left	05:26
	← fakenerd left	05:28
	→ peterbec` joined	05:28
	← Trendrrr left	05:31
	→ Trendrrr joined	05:33
	← peterbec` left	05:33
	→ senaps joined	05:34
	← cam27 left	05:36
	→ Rodya_ joined	05:37
	← podlech left	05:38
	→ xyphoid joined	05:38
	→ podlech joined	05:38
	→ fatihgenc joined	05:39
	→ jknetl joined	05:40
	← cagedwisdom left	05:40
	← df0 left	05:40
	→ nilukush joined	05:41
	← Rodya_ left	05:42
	→ overlord_tm joined	05:42
	← Trendrrr left	05:43
	← jameser left	05:44
	→ jnavila joined	05:44
	← thiago left	05:44
	→ Trendrrr joined	05:45
	→ jameser joined	05:45
	→ ThomasLocke joined	05:46
	← ThomasLocke left	05:46
	→ ThomasLocke joined	05:46
	← dsantiago left	05:46
	→ dsantiago joined	05:47
	→ svm_invictvs joined	05:47
	→ King_Hual joined	05:48
	→ nast joined	05:48
	← jnavila left	05:50
	→ lordjancso joined	05:50
	← xyphoid left	05:52
	→ cagedwisdom joined	05:53
	← Trendrrr left	05:54
	→ TomyLobo joined	05:55
	← senaps left	05:56
	→ Trendrrr joined	05:56
	← overlord_tm left	05:56
	← Cabanossi left	05:59
	→ Cabanossi joined	06:01
	→ xyphoid joined	06:01
	← svm_invictvs left	06:01
	← Trendrrr left	06:01
	→ EvilPenguin joined	06:04
	→ xall joined	06:05
	→ Trendrrr joined	06:05
	→ freimatz joined	06:07
	← EvilPenguin left	06:08
	← menip left	06:09
	→ svm_invictvs joined	06:10
	← xyphoid left	06:11
	→ schleppel joined	06:11
	→ opalepatrick joined	06:12
	→ EvilPenguin joined	06:12
	← Trendrrr left	06:14
	→ roelmonnens joined	06:16
	→ Trendrrr joined	06:16
	← khatri1 left	06:18
	← podlech left	06:19
	→ tvw joined	06:19
	→ ogny joined	06:19
	← IntrinsicCause left	06:20
	→ overlord_tm joined	06:21
	← jceb left	06:21
	→ chele joined	06:21
	← Trendrrr left	06:22
	← overlord_tm left	06:22
	→ overlord_tm joined	06:23
	← jameser left	06:24
	→ Trendrrr joined	06:24
	→ dsdeiz joined	06:27
	← safe left	06:27
	← nilukush left	06:28
	→ jameser joined	06:28
	← cschneid left	06:29
	→ Silmarilion joined	06:29
	← cagedwisdom left	06:30
	← gxt left	06:30
	→ fbwnd joined	06:32
	← rasto left	06:32
	← freimatz left	06:33
	→ qt-x joined	06:33
	→ cschneid joined	06:35
	→ JeroenT joined	06:36
	→ m4sk1n joined	06:36
	← Trendrrr left	06:36
	→ xyphoid joined	06:38
	→ Trendrrr joined	06:38
	→ nilukush joined	06:38
	→ sweatsuit joined	06:39
	← dsdeiz left	06:42
	← livingstn left	06:43
	← xyphoid left	06:43
	→ dsdeiz joined	06:43
	← Cabanossi left	06:43
	→ livingstn joined	06:44
	← Trendrrr left	06:44
	→ Cabanossi joined	06:46
	→ Trendrrr joined	06:46
	← dmj` left	06:47
	← fatihgenc left	06:47
	← svm_invictvs left	06:48
	→ fatihgenc joined	06:50
	→ nisseni joined	06:51
	→ singer22 joined	06:51
	← Trendrrr left	06:52
	→ livingst_ joined	06:53
	→ ManAcidBath joined	06:53
	→ lorena_love joined	06:53
	→ Antimateria joined	06:53
	← Antimateria left	06:53
	← ManAcidBath left	06:53
	→ dmj` joined	06:53
	← lorena_love left	06:54
	→ Trendrrr joined	06:54
	← livingstn left	06:54
	← jameser left	06:55
	→ khatri1 joined	06:58
	→ doev joined	06:59
	→ wandering_vagran joined	07:02
	← Trendrrr left	07:04
	← rda-mac left	07:04
	→ dpl joined	07:04
	→ svm_invictvs joined	07:05
	→ trig-ger joined	07:05
	← nilukush left	07:06
	← davimore left	07:07
	→ pigeon joined	07:07
	→ Trendrrr joined	07:08
	→ jameser joined	07:08
	← kadoban left	07:10
	→ xyphoid joined	07:10
	← khatri1 left	07:11
	← sondr3 left	07:12
	← jimmyrcom left	07:12
	← King_Hual left	07:13
	→ khatri1 joined	07:13
	← jameser left	07:14
	→ davimore joined	07:14
	→ fakenerd joined	07:14
	← iamtakingiteasy left	07:16
	→ roelmonn_ joined	07:17
	→ rasto joined	07:18
	← xyphoid left	07:18
	→ ethali joined	07:18
	← dreiss left	07:18
	← roelmonnens left	07:20
	← Trendrrr left	07:20
	← tens0r left	07:22
	→ valhala_22 joined	07:22
	→ Trendrrr joined	07:22
	← ethali left	07:23
	→ eizua joined	07:23
	← valhala_22 left	07:25
	→ valhala_22 joined	07:25
	← mostlybadfly left	07:26
	← cschneid left	07:27
	← JeroenT left	07:27
	→ JeroenT joined	07:28
	← energizer left	07:29
	→ peterbec` joined	07:29
	→ energizer joined	07:30
	→ dsdeiz_ joined	07:30
	→ cschneid joined	07:31
	← dsdeiz left	07:31
	→ jameser joined	07:31
	→ steeze joined	07:31
	← peterbec` left	07:34
	← BSaboia left	07:34
	→ p4trix joined	07:35
	← roelmonn_ left	07:35
	← steeze left	07:35
	→ roelmonnens joined	07:36
	← Trendrrr left	07:36
	← chachasmooth left	07:36
	← Vaelatern left	07:37
	→ Trendrrr joined	07:37
	→ chachasmooth joined	07:38
	→ Rodya_ joined	07:38
	← enckse left	07:38
	→ p4trick joined	07:38
	→ shodan` joined	07:39
	← olalonde left	07:39
	← jameser left	07:42
	→ enckse joined	07:42
	← p4trix left	07:42
	← Rodya_ left	07:43
	→ jameser joined	07:45
	→ notebox joined	07:46
	← notebox left	07:46
	→ safe joined	07:46
	→ flaviodesousa joined	07:48
	→ hs366 joined	07:49
	← duderonomy left	07:49
	→ se1_ joined	07:49
	← Cthalupa left	07:50
	← Trendrrr left	07:52
	← valhala_22 left	07:54
	→ ethali joined	07:54
	→ valhala_22 joined	07:54
	→ fishcooker joined	07:55
	→ Trendrrr joined	07:55
	→ oxymoron93 joined	07:56
	← xall left	07:56
armin	it seems my company is blocking outgoing connections to some tcp port(s?) as i can't git clone git:// URLs. can i read somewhere what that port is / what these ports are, without having to do a pcap and look at it? ;)	07:56
selckin	22	07:56
_ikke_	git:// is not 22	07:56
	it's 9418	07:57
armin	_ikke_: thank you. :)	07:57
_ikke_	man git-daemon mentions it	07:57
gitinfo	the git-daemon manpage is available at https://gitirc.eu/git-daemon.html	07:57
	→ Cthalupa joined	07:57
selckin	my google got me Ignore or deny information that conflicts with existing beliefs ("This doughnut is not a high-sugar food.")	07:57
	err wrong copy paste	07:57
_ikke_	lol	07:57
	→ marcogmonteiro joined	07:58
selckin	was reading cognitive disonance wikipedia	07:58
	https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols only lists 2 protocols, so had to be the ssh one :)	07:58
	→ duderonomy joined	07:58
	← ethali left	07:58
	← Cabanossi left	07:59
_ikke_	selckin: https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols#_the_git_protocol	07:59
selckin	blub time to hide in my corner	07:59
	→ Cabanossi joined	08:01
	→ amrits joined	08:04
	← Trendrrr left	08:04
	→ Trendrrr joined	08:05
	→ seschwar joined	08:06
	→ mikecmpbll joined	08:06
	← hs366 left	08:07
	→ kurkale6ka joined	08:08
	→ alcohol joined	08:09
	← EvilPenguin left	08:10
	→ pbandark joined	08:10
	← cschneid left	08:11
	→ Brski joined	08:11
	→ bongjovi joined	08:11
	→ jstein_ joined	08:12
staafl_	Do smudge filters run between history and the index or between the index and the working copy?	08:12
	Trying to figure out why I have to delete the index after creating a filter to have it apply to the currently checked out files	08:12
	← _ADN_ left	08:13
	→ hs366 joined	08:13
Seveas	osse: fair enough :) was wondering if I had missed something :)	08:13
	jstein_ → jstein	08:13
	← duderonomy left	08:13
	→ dsdeiz joined	08:15
	← dsdeiz left	08:15
	→ dsdeiz joined	08:15
	← dsdeiz_ left	08:16
	← Trendrrr left	08:16
	← a_thakur left	08:17
	→ a_thakur joined	08:17
	→ Trendrrr joined	08:18
	→ frew joined	08:18
	→ gxt joined	08:18
	→ Maskettaman joined	08:18
	→ Baxter001 joined	08:19
	→ xyphoid joined	08:19
	→ Klumben joined	08:19
	→ EvilPenguin joined	08:20
	← a_thakur left	08:21
	→ murph joined	08:22
	→ eshlox joined	08:23
	murph → Guest83884	08:23
	→ xall joined	08:24
	← xyphoid left	08:25
	← fishcooker left	08:25
	← Trendrrr left	08:26
	→ cschneid joined	08:26
	→ zulutango joined	08:28
	→ swords joined	08:28
	← EvilPenguin left	08:29
	→ Trendrrr joined	08:29
	← nast left	08:29
	→ _ADN_ joined	08:32
	→ chll_ joined	08:33
	← Trendrrr left	08:33
	→ a_thakur joined	08:34
	→ Trendrrr joined	08:35
	← kurkale6ka left	08:35
	← a_thakur left	08:36
	← sunri5e left	08:36
	→ a_thakur joined	08:36
	→ sunri5e joined	08:36
	→ kurkale6ka joined	08:36
	← chachasmooth left	08:36
	← _ADN_ left	08:37
	→ sondr3 joined	08:38
	← martybr_ left	08:40
	→ martybr joined	08:41
	→ chachasmooth joined	08:42
	← oskarkv left	08:42
	→ huqinlou joined	08:44
	→ ToBeCloud joined	08:44
	gitinfo set mode: +v	08:45
	→ xyphoid joined	08:45
	← chachasmooth left	08:47
	→ chachasmooth joined	08:48
	← Baxter001 left	08:48
	← Trendrrr left	08:48
	→ _ADN_ joined	08:49
	→ Paraxial joined	08:50
	→ Trendrrr joined	08:50
	→ chachasmooth_ joined	08:50
	← xyphoid left	08:51
	→ notebox joined	08:51
	→ cstratak joined	08:51
	→ cstratak_ joined	08:51
	→ mischat joined	08:51
	→ ti2 joined	08:52
	← chachasmooth left	08:52
	← mischat left	08:53
	→ chachasmooth joined	08:53
	→ mischat joined	08:54
	→ mikiones joined	08:55
	← chachasmooth_ left	08:55
	→ IniGit joined	08:56
	← Arcaelyx left	08:57
	← cstratak left	08:58
	← cstratak_ left	08:58
	→ cstratak joined	08:59
	→ ferr joined	08:59
	← Lyqyd left	09:00
	← feodaron left	09:00
	→ mischat_ joined	09:00
	← chachasmooth left	09:01
	← Trendrrr left	09:01
	→ manuelschneid3r joined	09:02
	← MeltedLux left	09:02
	→ Trendrrr joined	09:02
	→ chachasmooth joined	09:03
	← marcogmonteiro left	09:03
	→ ma5ter joined	09:03
	← mischat left	09:03
	← ma5ter left	09:04
	← howitdo left	09:04
	→ ma5ter joined	09:04
	→ MeltedLux joined	09:05
	→ xyphoid joined	09:07
	← Trendrrr left	09:07
	← Goplat left	09:08
	← chachasmooth left	09:08
	→ chachasmooth joined	09:08
	→ Trendrrr joined	09:10
	← theoceaniscool left	09:11
	→ marcogmonteiro joined	09:12
	← chachasmooth left	09:13
	← MeltedLux left	09:15
	← JeroenT left	09:16
	→ JeroenT joined	09:16
	→ MeltedLux joined	09:17
	← xyphoid left	09:18
	→ amcsi joined	09:19
amcsi	Hi	09:19
	→ Gurkenglas joined	09:19
	→ JeroenT_ joined	09:20
amcsi	I know I can get a pretty graph if I do: `git log --all --decorate --oneline --graph`. But if I also filtered by author with `git log --all --decorate --oneline --graph --author=amcsi`, then even merge commits done by others are not shown, and thus I don't get a clear visual of which commits belong to the same branch. Is it possible to filter by author, but also show merge commits done by others to get a more complete graph?	09:20
	← JeroenT left	09:21
	→ feodaron joined	09:23
	← hplar left	09:24
	→ howitdo joined	09:24
	→ dwts joined	09:24
dwts	good morning, is there a way to "emulate" git merge to see all possible merge conflicts without doing it? I mean something like a "noop" option	09:25
	→ chachasmooth joined	09:26
moritz	dwts: there is a --no-commit option to git merge	09:26
	← cschneid left	09:26
moritz	dwts: it still does the merge, writes it to the index, but doesn't commit	09:26
	and then you can git merge --abort to go back	09:26
dwts	moritz: hm, thanks will check the manual to see if I can use it	09:26
	moritz: ah, nice!	09:26
	and --abort will bring local back to the initial state?	09:27
	← IniGit left	09:27
	→ cschneid joined	09:28
	← Trendrrr left	09:30
	→ peterbec` joined	09:30
	→ Trendrrr joined	09:31
	→ tunekey joined	09:33
	→ Andrew_K joined	09:34
	→ navidr joined	09:34
	← peterbec` left	09:35
	← eizua left	09:40
	← Trendrrr left	09:40
	→ TheFuzzball joined	09:41
	← rafalcpp left	09:42
	← pbandark left	09:43
	→ pbandark1 joined	09:43
	→ Trendrrr joined	09:44
	pbandark1 → pbandark	09:45
	→ leeN joined	09:47
	← dsdeiz left	09:48
navidr	git bisect is plugin ?	09:48
	← Trendrrr left	09:48
	← L00thar left	09:49
	→ sbasso joined	09:49
	→ dsdeiz joined	09:50
	← dsdeiz left	09:50
	→ dsdeiz joined	09:50
grawity	no	09:50
navidr	grawity: thank u	09:51
	→ Trendrrr joined	09:52
	← chachasmooth left	09:53
	→ chachasmooth joined	09:55
	→ xyphoid joined	09:56
	← Trendrrr left	09:57
	← a_thakur left	10:00
	→ a_thakur joined	10:00
	← chachasmooth left	10:00
	→ Trendrrr joined	10:00
	← xyphoid left	10:00
	← JeroenT_ left	10:01
	← sbasso left	10:02
	→ Panacea joined	10:02
	→ chachasmooth joined	10:03
	← zerow_ left	10:04
	← livingst_ left	10:07
	→ Fleche joined	10:07
	← Trendrrr left	10:11
	→ Trendrrr joined	10:12
	→ Sharker joined	10:13
	→ Uneedwat joined	10:13
	→ Vaelatern joined	10:14
	← safe left	10:15
	← davimore left	10:16
	← cqi left	10:17
	→ davimore joined	10:17
	← a_thakur left	10:18
	→ a_thakur joined	10:18
	→ tarkus joined	10:20
	← cschneid left	10:23
	← fbwnd left	10:24
	→ BadCodSmell joined	10:25
	→ theoceaniscool joined	10:25
	← oxymoron93 left	10:25
BadCodSmell	Extremely newbie question, but if in my local repo I want to pull and update everything from remote (all fast forwards), is there an easy way to do it? Currently I have to run git branch, then checkout each and git pull on each.	10:26
	→ deepy joined	10:26
	→ cschneid joined	10:26
	← Trendrrr left	10:26
grawity	git push . refs/remotes/origin/:refs/heads/	10:27
Vampire0	BadCodSmell, pulls involve either merges or rebases and those are prone to result in conflicts very likele	10:28
	→ Trendrrr joined	10:28
Vampire0	BadCodSmell, because of that (I think) there is no standard way by default	10:28
BadCodSmell	I am pretty sure that will break my remote and everyone wil scream at me :D	10:28
grawity	which remote? you're pushing to .	10:28
Vampire0	BadCodSmell, you need to make a shell script of alias that loops over your local branches yourslef	10:28
BadCodSmell	Vampire0, I mean more for the scenario where for example lots of branches were checked out locally, from remote, but not changes, then remote changed...	10:28
	What I see on the internet though people are just scripting it.	10:29
Vampire0	grawity, that will not really work, will it?	10:29
grawity	sure it will	10:29
BadCodSmell	Which I guess is not really that hard.	10:29
grawity	since it was explicitly mentioned that they're all fast-forwards, therefore no merges	10:29
	← Panacea left	10:29
BadCodSmell	yeh but I want t oupdate local not remote :D	10:29
grawity	. is the local repo	10:29
Vampire0	grawity, I didn't mean because of merges, I meant the syntax	10:29
BadCodSmell	ah yes, if it's a pull instead of push or fetch, it might work	10:30
Vampire0	grawity, hm, nice, thx for that new info :-)	10:30
grawity	it's specifically a push to itself	10:30
	→ xyphoid joined	10:30
grawity	I suppose `git fetch origin refs/heads/:refs/heads/` would also work but IIRC that had some downside	10:31
	and push-to-. ended up being invented	10:31
	→ mentazoom joined	10:33
	← xyphoid left	10:35
BadCodSmell	Or just a safe way to wipe out my local copes of the branches	10:35
	I am pretty sure if I do -d then push to remote poof	10:35
	safe way without recloning	10:35
	I guess convert existing repo to bare repo	10:35
Vampire0	BadCodSmell, deleting local branches will not delete remote branches	10:37
	→ IniGit joined	10:37
	← wouter0100 left	10:37
BadCodSmell	I have a feeling it will if I push that deleted branch, but if I check it out first then push it it wont, but I'll have to test it to be sure.	10:38
	Nope you are right according to the docs at least	10:38
	I would have to push with a --delete as well. :)	10:38
	→ JeroenT joined	10:38
BadCodSmell	Ah wait no I'm wrong. that's just a way to do it with only one command in git 1.7 +	10:39
	← Trendrrr left	10:39
Vampire0	BadCodSmell, if you dont push the refspec ":remote-branch" (read "nothing to remote-branch") or use "--delete", deleting a local branch will not delete a remote branch	10:40
	→ Trendrrr joined	10:41
	→ basiclaser joined	10:41
	← manuelschneid3r left	10:42
	← Lunatrius left	10:44
	← Cabanossi left	10:45
	→ Cabanossi joined	10:45
	→ ZyX-I joined	10:45
	→ glad joined	10:47
	→ Hink_ joined	10:48
	← fakenerd left	10:50
	→ fakenerd joined	10:51
	← dpl left	10:51
	← fakenerd left	10:51
	→ dpl joined	10:51
	→ fakenerd joined	10:52
	← notebox left	10:52
	→ cdown_ joined	10:53
	← ToBeCloud left	10:54
	← Trendrrr left	10:55
	cdown_ → cdown	10:56
	← fakenerd left	10:56
fcanela	oprypin _ikke_, i'm the guy who was struggling yesterday with reverting some ugly commits from his boss. Your indications solved the problem. Thanks.	10:56
	→ Trendrrr joined	10:56
	→ j08nY joined	10:57
	→ xyphoid joined	10:58
	→ Ryanar joined	11:00
	← amrits left	11:01
	← xall left	11:02
	← se1_ left	11:02
_ikke_	fcanela: yw'	11:02
	→ whoismrmichael joined	11:02
	→ michael_ joined	11:02
	← xyphoid left	11:03
	→ joes joined	11:04
	← michael_ left	11:05
	← whoismrmichael left	11:05
	→ afuentes joined	11:06
	← Trendrrr left	11:07
	→ Trendrrr joined	11:09
	→ zerow joined	11:12
	→ quackgyver joined	11:20
	→ fakenerd joined	11:21
	→ CheckDavid joined	11:21
	→ Cavallari joined	11:22
	→ notebox joined	11:22
	→ Chuguniy joined	11:23
	← inovas left	11:24
	→ Lunatrius joined	11:25
	→ kke_ joined	11:26
	← kke_ left	11:26
	→ kke_ joined	11:26
	← Trendrrr left	11:27
kke_	i made some `git mv`'s, then unstaged them because i needed to commit something else real quick. now i have some unstaged deletes and untracked files. is there some trick to restore them to be proper moves again?	11:27
	→ Trendrrr joined	11:28
_ikke_	kke_: it doesn't matter	11:29
	git infers moved files, it does not store them	11:29
grawity	kke_: just stage an addition of the new file, and a removal of the old one	11:29
kke_	so move doesn't keep history either?	11:30
	→ inovas joined	11:30
_ikke_	nope, it does not record a move	11:30
	(tree objects do not have any way to record that a file has moved)	11:30
kke_	okie dokie. thanks!	11:31
	→ peterbec` joined	11:31
	→ xall joined	11:31
grawity	the history is kept, but under the old name	11:31
	tools like `git log` try to detect and follow renames	11:31
	→ manuelschneid3r joined	11:33
	← xall left	11:34
	→ kurkale61 joined	11:35
	← JeroenT left	11:35
	← peterbec` left	11:36
	→ jimi_ joined	11:37
	← kurkale6ka left	11:37
	← andai left	11:37
	→ andai joined	11:37
	← Trendrrr left	11:38
	→ jimi_sanchez joined	11:38
	→ xyphoid joined	11:39
	→ Trendrrr joined	11:39
	← jimi_ left	11:41
	← mischat_ left	11:43
	→ Phylock joined	11:44
	→ nauar joined	11:44
	← jaziz left	11:45
	→ thinkpad joined	11:45
	→ JeroenT joined	11:48
	→ h12o joined	11:49
	→ Baxter001 joined	11:51
	← robattila256 left	11:51
	← h12o left	11:51
	gitinfo set mode: +v	11:53
nauar	ello! I'm having some trouble setting a pre_receive hook. As it is in the server, the repo in the server is a bare git repo and then I cannot launch some git commands (like git diff or git log) to enforce policies. Does anyone know how solve this?	11:53
	← Trendrrr left	11:53
	→ nast joined	11:53
nauar	I get error messages like: remote: fatal: This operation must be run in a work tree	11:54
	→ dave0x6d joined	11:54
	→ h12o joined	11:54
	← BadCodSmell left	11:54
	→ Trendrrr joined	11:54
	← mattcen left	11:56
	← raynold left	11:57
	→ indistylo joined	11:57
	→ sz0 joined	11:58
Baxter001	Is there a good way to manage it when you're dealing with committing code from third parties that only give you the final changed files, as in I'm only being sent the subset of the codebase that has been updated or created?	11:58
	← indistylo left	11:58
	← Maskettaman left	11:59
	→ indistylo joined	11:59
	→ Maskettaman joined	11:59
_ikke_	Baxter001: What part is the challenge?	11:59
ThiefMaster	Baxter001: tell them to send you patches or GTFO :p	12:00
	or just create a branch, then copy the files, and look at the git-diff	12:00
	→ DaveTabo_ joined	12:00
Vampire0	nauar, you should be able to use most commands in a bare repository, if you use them the right way. Maybe you should ask about specific things you want to do. Actually you should probably use some plumbing command instead of percellain in a script. That's what those are for	12:00
	← DaveTabo_ left	12:01
	← Andrew_K left	12:01
	← ma5ter left	12:01
	→ DaveTabo_ joined	12:02
	← DaveTaboola left	12:02
	← manuelschneid3r left	12:02
_ikke_	right, but both git log and git diff should work	12:03
	← digitalway left	12:03
_ikke_	As long as you are refering to commits, not files in the work tree	12:03
	← xyphoid left	12:04
	→ Brski_ joined	12:04
	← marcogmonteiro left	12:04
nauar	Vampire0, _ikke_: my intention is reject pushes with files with some extensions (binary files) and with file size greater than 20MB. I thought a pre-receive hook was a good option and use git diff --stat --name-only --diff-filter=ACMRT ${oldref}..${newref} for getting the filenames and git cat-file -s ${newref}:${file} for getting the size.	12:05
	← Maskettaman left	12:05
	→ fbwnd joined	12:05
_ikke_	that looks about right	12:06
	note that 2 dots in diff are optional	12:06
	→ JeroenT_ joined	12:07
nauar	_ikke_: then I get this error: remote: fatal: Invalid revision range 0000000000000000000000000000000000000000..06fb108a5f9e7a06795b9221be9eb8fbd62bac72. And surfing I found that maybe I should replace the 0's SHA by HEAD and doing that I get this other error: remote: fatal: ambiguous argument 'HEAD..06fb108a5f9e7a06795b9221be9eb8fbd62bac72': unknown revision or path not in the working tree.	12:08
	→ peacememories joined	12:08
	← Brski left	12:08
_ikke_	nauar: Use the empty tree hash in that case	12:08
Vampire0	nauar, this is because it is the initial commit	12:09
	← Trendrrr left	12:09
	← daynaskully left	12:09
Vampire0	nauar, from the second commit on it will probably work fine, as long as no new branch is created	12:09
_ikke_	nauar: The pre-commit.example shows how to use it	12:09
Vampire0	nauar, so you should check for initial commit of a ref and handle it specially	12:09
_ikke_	https://github.com/git/git/blob/master/templates/hooks--pre-commit.sample#L15	12:10
	→ Trendrrr joined	12:10
	← JeroenT left	12:10
	→ mattcen joined	12:12
	→ daynaskully joined	12:14
	→ str joined	12:15
	→ mischat joined	12:16
nauar	_ikke_, Vampire0: Thanks, I'm going to review these both solutions and analyze how to apply them in my hook.	12:16
	← ertes left	12:16
	→ kurkale6ka joined	12:16
	→ manuelschneid3r joined	12:17
	← mischat left	12:18
	← zulutango left	12:18
	← kurkale61 left	12:18
	← theoceaniscool left	12:21
	→ dorian_ joined	12:24
	gitinfo set mode: +v	12:25
	→ MySecondNick joined	12:28
dorian_	Hey there! I would like to set up a bare repository which is updated from the master repository every hour. I'm using cron with this line: "@hourly git -C /home/git/Certif/aom.git fetch". But in the repository directory, all I get is a FETCH_HEAD file with the hash of the last commit of the master.	12:28
	← jimi_sanchez left	12:28
dorian_	And when I ask for the current HEAD, it's still the same HEAD as when I first cloned the repository	12:28
MySecondNick	Hello guys! I have a quick question - I have a directory filled with files I want to push to GitHub. I am new to Git and while I do have a GitHub account, I've never made reprositories/pushed them etc. So I already have all the files and folders that I want to be in my reprository. I just have to push all of that to my GitHub account. Can anyone here help me around with this?	12:29
	← Cabanossi left	12:29
dorian_	Any idea on how I could fix this ? The point is when another user do "git clone /path/to/bare/repository" he would be in sync with the master repository (give or take one hour)	12:29
	→ Cabanossi joined	12:30
dorian_	MySecondNick, https://guides.github.com/activities/hello-world/#repository	12:31
	→ peterbec` joined	12:32
	→ Maskettaman joined	12:32
	← valhala_22 left	12:33
	→ valhala_22 joined	12:34
	→ rda-mac joined	12:34
	← JeroenT_ left	12:35
	← Maskettaman left	12:37
	← peterbec` left	12:37
	→ Maskettaman joined	12:38
MySecondNick	dorian_ that's a good guide	12:39
	I created a reprository	12:39
	however, how do I now put my local files	12:39
	and my whole folder structure	12:39
	inside that resporsitory	12:39
	← jameser left	12:39
MySecondNick	that is, how do I push all of my local file/folder structure to that reporistory I just created	12:40
	→ JeroenT joined	12:40
dorian_	git add, git commit, git push	12:40
tobiasvl	MySecondNick: you created a repository on your computer? or only on github.com?	12:40
MySecondNick	tobiasvl I createad a reprostitory only on github.com	12:41
	→ kurkale61 joined	12:41
MySecondNick	I have local folder structure which I want to push to that repo I just created	12:41
	← manuelschneid3r left	12:42
	→ marcogmonteiro joined	12:42
	→ manuelschneid3r joined	12:42
dorian_	git add will add your files to the mysterious "staging area", git commit will commit the add locally, git push will push the changes to your github repository	12:42
tobiasvl	well	12:43
	MySecondNick needs to init/clone the repo first	12:43
	← Trendrrr left	12:43
MySecondNick	Can I use the git GUI and create a new reporistory whose directory will be my local folder?	12:43
	is that my first step?	12:43
tobiasvl	MySecondNick: yes, you can do that. and then you add the repo you created at github as a git "remote", add the files, commit and push	12:44
	← kurkale6ka left	12:44
MySecondNick	tobiasvl ok wait a bit	12:44
	← dorian_ left	12:44
MySecondNick	so I've got a repo on github.com	12:44
	I just created	12:45
	it's empty (just a README file)	12:45
	→ Trendrrr joined	12:45
tobiasvl	MySecondNick: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/	12:45
	that's what you need	12:45
	you'll need to force push in the last step though, since you created a README file when creating the github project (ie. it's not completely empty, it has a commit)	12:45
	← JeroenT left	12:45
MySecondNick	thanks tobiasvl	12:45
tobiasvl	you can just pull the github repo instead of init if you want to keep the README	12:46
MySecondNick	btw. do I need to init it again?	12:46
	if I inited it	12:46
	with my github GUI?	12:46
tobiasvl	you didn't say you had inited it	12:46
	no	12:46
	→ Darren_ joined	12:46
MySecondNick	ok	12:46
	thanks tobiasvl	12:46
	→ theoceaniscool joined	12:46
	← YuGiOhJCJ left	12:46
tobiasvl	just remember that if you follow that guide, when you push, you will not be able to do so since you did changes on github (added the README)	12:47
	→ JeroenT joined	12:47
tobiasvl	so then you can either do "git push --force" to drop the README, or "git pull" to merge the README creation into your local repo, and THEN you can "git push"	12:47
	MySecondNick: by "github GUI" I assume you mean Github for Desktop or whatever it's called? not github.com?	12:48
	← JeroenT left	12:48
	→ livingstn joined	12:48
tobiasvl	because if you only created the repo on github.com then you DO need to "git init" it locally	12:48
	→ mischat joined	12:48
MySecondNick	tobiasvl I deleted a repo on github.com	12:49
	and created a new one, without readme	12:49
	→ JeroenT joined	12:49
MySecondNick	but locally, I used github GUI	12:49
	← mischat left	12:49
	→ kurkale6ka joined	12:49
MySecondNick	and I created a new repo in my local folder structure	12:49
tobiasvl	MySecondNick: this thing? https://desktop.github.com/	12:49
	← DaveTabo_ left	12:49
tobiasvl	yeah OK	12:49
MySecondNick	I can, just in case, try to init it again	12:49
	if it's already inited, it'll probably give an error	12:50
	right?	12:50
	→ mischat joined	12:50
	→ belmoussaoui_ joined	12:50
	← Trendrrr left	12:50
MySecondNick	tobiasvl If I try to "git init" an already inited reprostiry, do I get an error?	12:51
	← kurkale61 left	12:51
	← Anja left	12:52
	→ noidea joined	12:52
	← jozwior left	12:52
	→ Tobbi joined	12:52
	→ Trendrrr joined	12:52
	→ ertes-w joined	12:52
tobiasvl	yes	12:53
	← nast left	12:53
tobiasvl	as long as you're in the same directory	12:53
	← Chuguniy left	12:54
	← mischat left	12:54
	→ Chuguniy joined	12:55
MySecondNick	tobiasvl OK so in my github.com repo	12:56
	I have a LICENCE file	12:56
	I'd like to keep it	12:56
	as you said, "git push origin master" gives an error	12:56
tobiasvl	then git pull	12:56
	← dsdeiz left	12:56
MySecondNick	"git pull <link to my repo> master" gives me this:	12:57
	← qt-x left	12:57
MySecondNick	"fatal: refusing to merge unrelated histories"	12:57
	← h12o left	12:57
tobiasvl	oh right	12:57
	git pull --allow-unrelated-histories	12:57
	I forgot about that change	12:58
	→ Cavallari1 joined	12:58
	← Cavallari left	12:58
	Cavallari1 → Cavallari	12:58
	→ xyphoid joined	12:58
	→ h12o joined	12:58
	← Trendrrr left	12:59
	→ DaveTaboola joined	12:59
MySecondNick	tobiasvl now I got a message to explain why I had to commit	12:59
	why I had to merge, sorry	12:59
	← JeroenT left	12:59
MySecondNick	how do I get out of it and how do I write a message here?	12:59
	→ Darcidride joined	12:59
tobiasvl	does it already have a standard merge message on the top?	13:00
	→ amcsi_ joined	13:00
MySecondNick	tobiasvl no	13:00
	it says "Please enter a merge message..."	13:00
	← rscata left	13:00
MySecondNick	something along those lines	13:00
	← Cabanossi left	13:00
MySecondNick	it has # before it	13:00
	→ Trendrrr joined	13:00
tobiasvl	have you ever used vim before? you're probably in vim	13:00
	press i	13:00
	→ Cabanossi joined	13:00
tobiasvl	then write something at the top, with no # before it	13:01
	then press ESC and then write :wq and press ENTER	13:01
	→ mischat joined	13:01
MySecondNick	jesus	13:01
	tahnks tobiasvl but damn, this is not user-friendly	13:02
tobiasvl	you can change to another editor than vim if you want	13:02
	vi(m) is pretty common on unix though	13:02
MySecondNick	yaaaay	13:02
	I pushed it	13:02
	thanks tobiasvl	13:02
	← martybr left	13:02
MySecondNick	gonna go grab a bit	13:02
	bite*	13:02
	then push another repo	13:02
	← xyphoid left	13:03
MySecondNick	thanks again tobiasvl	13:03
	→ jozwior joined	13:03
tobiasvl	MySecondNick: good luck, read a git !book if you want	13:03
gitinfo	MySecondNick: 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	13:03
	← amcsi left	13:03
MySecondNick	will I need it?	13:03
	I was thinking about contributing to Mozilla Firefox	13:04
	when my C++ skills reach a certain level	13:04
	and also tobiasvl, how would I add new files to my repo?	13:05
	or modify the existing ones?	13:05
	if you could just give me some commands for this	13:05
tobiasvl	MySecondNick: create or modify a file, then "git add" followed by "git commit" at some point	13:06
	you probably should read up on git a bit yes	13:06
	← mischat left	13:06
	→ martybr joined	13:06
	← martybr left	13:07
	← valhala_22 left	13:07
	→ martybr joined	13:07
	← martybr left	13:10
	→ martybr joined	13:11
	→ elsevero joined	13:12
	← Trendrrr left	13:12
	← theoceaniscool left	13:13
	→ imrg joined	13:13
	→ Trendrrr joined	13:14
	← Cavallari left	13:14
	→ Cavallari joined	13:14
	→ i3o0ih1noai joined	13:15
	→ JeroenT joined	13:16
	→ kurkale61 joined	13:17
	→ mischat joined	13:17
	← mischat left	13:17
	→ mischat joined	13:17
	← kurkale6ka left	13:17
	← Maskettaman left	13:18
	→ jedarc joined	13:18
	→ Brski__ joined	13:18
	→ Maskettaman joined	13:18
	→ kurkale6ka joined	13:18
	→ narendraj9 joined	13:19
	← kurkale61 left	13:20
	← jascot[m] left	13:20
	← KevinMGranger left	13:20
	← reactormonk[m] left	13:20
	← am2on left	13:20
	← Remramm left	13:20
	← spinningarrow[m] left	13:20
	← dyce[m] left	13:20
	← patrickr[m] left	13:20
	← flo[m] left	13:20
	← UncleCJ left	13:20
	← musicmatze[m] left	13:20
	← aidalgol left	13:20
	← aviraldg left	13:20
	← waltervargas[m] left	13:20
	← dbn[m] left	13:20
	→ mischat_ joined	13:20
	← hiq[m] left	13:20
	← dikiaap left	13:20
	← JeroenT left	13:21
	← nod left	13:21
	← unclechu left	13:21
	← SpEcHiDe left	13:21
	← dijit[m] left	13:21
	← M-meznak left	13:21
	← deepakbn[m] left	13:21
	← Satchmo1[m] left	13:21
	← heftig left	13:21
	→ JeroenT joined	13:21
	← logos[m] left	13:21
	← monomon[m] left	13:21
	← swalladge[m] left	13:21
	→ kurkale61 joined	13:21
	→ MrMojit0 joined	13:22
	← mischat left	13:22
	← Brski_ left	13:22
	← kurkale6ka left	13:24
	← Trendrrr left	13:25
	← mischat_ left	13:25
	→ Trendrrr joined	13:26
	→ Panacea joined	13:27
	→ mischat joined	13:29
	← askb left	13:29
	→ kurkale6ka joined	13:30
	← MySecondNick left	13:30
	→ theoceaniscool joined	13:31
	← kurkale61 left	13:31
	→ nod joined	13:32
	→ peterbec` joined	13:33
	← i3o0ih1noai left	13:33
	← shodan` left	13:35
	→ MySecondNick joined	13:35
	← Hink_ left	13:36
	→ darkJedi joined	13:36
	→ Hink joined	13:36
	← Hink left	13:38
	← peterbec` left	13:38
	→ kurkale61 joined	13:39
	→ Hink joined	13:39
	← JyZyXEL left	13:39
	← kurkale6ka left	13:40
	← Jackneill left	13:41
	← MySecondNick left	13:41
	→ kurkale6ka joined	13:41
	← nauar left	13:41
	→ cebula joined	13:43
	← kurkale61 left	13:44
	← Hink left	13:44
	→ Hink joined	13:45
	→ claudio1 joined	13:45
	← claudio1 left	13:45
	→ tmhind2 joined	13:46
	← Hink left	13:46
	← zerow left	13:47
	→ xyphoid joined	13:48
	→ jameser joined	13:50
	← jknetl left	13:50
	← ewitz left	13:52
	→ ewitz joined	13:53
	← xyphoid left	13:53
	→ ethali joined	13:53
	→ monomon[m] joined	13:53
	→ lmatteis joined	13:53
	← OtakuSenpai left	13:53
	← Panacea left	13:55
	← Tobbi left	13:57
	→ wouter0100 joined	13:57
	← ethali left	13:57
	← jameser left	13:58
	← a_thakur left	13:59
	→ floppydh joined	13:59
	→ a_thakur joined	14:00
	→ tcorneli joined	14:00
	← monomon[m] left	14:00
	→ malmalmal joined	14:01
	→ jameser joined	14:01
	→ mikiones_ joined	14:02
	← Trendrrr left	14:02
	← ujjain left	14:02
	← donmichelangelo left	14:03
	← Ryanar left	14:03
	← a_thakur left	14:04
	← mikiones left	14:04
	→ Trendrrr joined	14:06
	→ ujjain joined	14:06
	← ujjain left	14:06
	→ ujjain joined	14:06
	← IniGit left	14:06
	← h12o left	14:07
	→ shodan` joined	14:07
	→ freimatz joined	14:08
	→ monomon[m] joined	14:08
	← tmhind2 left	14:09
	← dec0n left	14:10
	← Trendrrr left	14:11
	→ ethali joined	14:11
	→ h12o joined	14:12
	→ kurkale61 joined	14:13
	← star_prone left	14:13
	→ star_prone joined	14:13
	→ user_corrupt joined	14:13
	→ Trendrrr joined	14:14
	← kurkale6ka left	14:16
	← ethali left	14:16
	→ cam27 joined	14:16
	← peacememories left	14:17
	← star_prone left	14:18
	→ ethali joined	14:18
	← jameser left	14:19
	→ EvilDMP joined	14:20
	← davimore left	14:20
	← diogenese left	14:21
EvilDMP	my git log contains two commits. But when I run git rebase -i HEAD~2, to squash them, it complains: "fatal: Needed a single revision - invalid upstream HEAD~2"	14:21
	what is the complaint? why does it think I am mentioning an upstream?	14:22
	→ kurkale6ka joined	14:22
	← ethali left	14:22
	→ Kulrak joined	14:22
	← Kulrak left	14:22
	→ Kulrak joined	14:22
grawity	because that's what the rebase parameter is really called	14:22
	it even defaults to the configured upstream branch	14:23
	→ dreiss joined	14:23
grawity	and as for the complaint, HEAD~2 would be the 3rd commit in your history	14:23
	which does not exist	14:23
	to do what you're probably trying to do, you need `git rebase -i --root`	14:23
	← Dreadnaught left	14:24
	← fatihgenc left	14:24
	← h12o left	14:24
	← kurkale61 left	14:24
	→ jameser joined	14:24
EvilDMP	grawity: that does it thanks	14:25
	→ SpEcHiDe joined	14:25
	→ davimore joined	14:25
	← lordjancso left	14:26
	→ xyphoid joined	14:27
	← Trendrrr left	14:27
	← nopf left	14:28
	→ a_thakur joined	14:29
	← sunri5e left	14:29
	→ bgamari joined	14:29
	→ Trendrrr joined	14:29
	← jameser left	14:29
	→ h12o joined	14:30
	→ sunri5e joined	14:30
	→ steeze joined	14:30
	→ Tobbi joined	14:31
	← indistylo left	14:32
	← mikecmpbll left	14:32
	← jedarc left	14:32
	→ jedarc joined	14:32
	→ Jackneill joined	14:33
	→ jameser joined	14:33
	→ mikecmpbll joined	14:33
	→ peterbec` joined	14:34
	→ Ben_1 joined	14:34
Ben_1	hi	14:34
	I'm using git pull --rebase	14:34
	is there a way git shows the <<<<<<< and ======= markers with this command?	14:35
	so far for me it only creates a file in .git that contains the conflict parts	14:35
	← Trendrrr left	14:36
	← xyphoid left	14:36
	→ ethali joined	14:37
	← sunri5e left	14:37
	→ Trendrrr joined	14:37
	→ Devastator joined	14:38
	→ ToBeCloud joined	14:38
	gitinfo set mode: +v	14:38
	← jameser left	14:38
	→ nast joined	14:38
	← peterbec` left	14:38
Devastator	I would like to build a local git server for my company, where should I start in terms of security? what are the risks really?	14:38
	→ sunri5e joined	14:39
	→ IniGit joined	14:39
	← ethali left	14:41
	← Trendrrr left	14:41
grawity	start with an existing product (gitolite, gogs, gitlab)	14:41
	→ Noldorin joined	14:42
	← h12o left	14:42
	→ Spydar007 joined	14:42
grawity	the risks I suppose are just a) someone could clone repos they have no read access to, b) someone could push to repos/branches they have no write access to, c) someone could run arbitrary commands and corrupt the repos on the server	14:42
	→ EvilPenguin joined	14:43
Devastator	grawity it is rather sensible data, so I'm not sure I would trust on cloud solutions for now	14:43
	← JeroenT left	14:44
	→ patrickr[m] joined	14:44
	→ M-meznak joined	14:44
	→ aidalgol joined	14:44
	→ dikiaap joined	14:44
	→ dbn[m] joined	14:44
	→ deepakbn[m] joined	14:44
	→ spinningarrow[m] joined	14:44
	→ reactormonk[m] joined	14:44
	→ logos[m] joined	14:44
	→ unclechu joined	14:44
	→ flo[m] joined	14:44
	→ UncleCJ joined	14:44
	→ Remramm joined	14:44
	→ dyce[m] joined	14:44
	→ KevinMGranger joined	14:44
	→ waltervargas[m] joined	14:44
	→ heftig joined	14:44
	→ aviraldg joined	14:44
	→ swalladge[m] joined	14:44
	→ jascot[m] joined	14:44
	→ hiq[m] joined	14:44
	→ am2on joined	14:44
	→ musicmatze[m] joined	14:44
	→ dijit[m] joined	14:44
	→ Satchmo1[m] joined	14:44
grawity	none of the above are cloud solutions, if you mean hosted/SaaS	14:44
Devastator	grawity and the risks you mentioned is related to configuration, right?	14:44
Ben_1	Devastator: if you set up a git server it is no cloud solution but a local network solution	14:44
grawity	in fact if it's for a company you could even buy Github's or BitBucket's enterprise version	14:44
	which are also entirely local	14:44
	→ Trendrrr joined	14:45
	← aaa\| left	14:45
grawity	Devastator: if you build from scratch, then also related to writing code which would enforce such configuration	14:45
Devastator	grawity ah, I see, when you said gitlab and others I thought you were talking about their cloud	14:45
	← Trendrrr left	14:45
	→ mischat_ joined	14:45
	← tvw left	14:45
grawity	as plain Git doesn't really care (if you have filesystem write permissions, you can push)	14:45
	← Fleche left	14:45
Devastator	I didn't know it would be possible to run a standalone gitlab for example	14:46
grawity	so go for something pre-written, at minimum gitolite but you'll probably want fancy gitlab/github stuff	14:46
	→ Trendrrr joined	14:47
	→ Fleche joined	14:47
grawity	(...phabricator?)	14:47
	← shodan` left	14:47
Devastator	I guess it is time to setup a VM and test	14:49
	→ shanuman joined	14:49
	← mischat left	14:49
	← bgamari left	14:49
Devastator	how do you guys backup repos etc? rsync?	14:49
	→ ShekharReddy joined	14:50
grawity	if I was running a shared Git server ... either whole-partition snapshots, or something involving `git fetch`	14:50
	→ bgamari joined	14:51
	→ h12o joined	14:51
	→ db8093246 joined	14:52
	← finalbeta left	14:53
Devastator	grawity thank you	14:53
	→ finalbeta joined	14:53
	→ AlanQ joined	14:53
	→ aaa\| joined	14:53
	← Trendrrr left	14:54
Devastator	grawity by shared you mean..? with other users?	14:54
	← elsevero left	14:55
	→ xyphoid joined	14:56
	→ Trendrrr joined	14:56
	← h12o left	14:57
	← chele left	14:58
	→ justan0theruser joined	14:58
	← notebox left	14:58
	← Silmarilion left	15:00
	← ferr left	15:00
	→ amrits joined	15:00
	← Cavallari left	15:01
	← xyphoid left	15:01
	← narendraj9 left	15:01
	→ jungsubk joined	15:01
	← justanotheruser left	15:02
	← Ben_1 left	15:02
	← a_thakur left	15:03
	→ SkyPatrol joined	15:03
	→ roelmonn_ joined	15:04
	→ Quetzal2 joined	15:05
	→ Ben_1 joined	15:06
	← SkyPatrol_ left	15:06
Ben_1	nobody an idea why git does not show the conflicts in the source file?	15:06
	→ circ-user-7Xqrs joined	15:06
	← circ-user-7Xqrs left	15:07
	→ circ-user-Z6rNi joined	15:07
	← roelmonnens left	15:07
selckin	any context	15:08
	→ valhala_22 joined	15:08
	← sunri5e left	15:08
	← roelmonn_ left	15:09
	← ThomasLocke left	15:09
	← circ-user-Z6rNi left	15:09
Ben_1	selckin: I used pull --rebase and got merge conflicts. Everytime I get an merge conflict I have conflict markers in my source file. This time there are no conflict markers. Do you have an idea why?	15:10
	→ h12o joined	15:10
	← floppydh left	15:10
	→ sunri5e joined	15:10
	→ tigerdragong joined	15:11
	← mischat_ left	15:11
Seveas	might be an edit/remove conflict. Try git diff --base, --ours and --theirs for details.	15:11
	← mikecmpbll left	15:11
	→ mischat joined	15:12
	← Hello71 left	15:12
	→ dsdeiz joined	15:13
	← dsdeiz left	15:13
	→ dsdeiz joined	15:13
	← Trendrrr left	15:13
	→ notebox joined	15:13
Ben_1	you mean a previous merge conflict that was resolved but probably not all markers were removed or something like that?	15:13
	→ justanotheruser joined	15:14
	→ Trendrrr joined	15:14
Seveas	no, an edit/remove conflict is where one side edits the file, but the other removes the file completely	15:15
	← doev left	15:16
Ben_1	ah ok thanks for that info!	15:16
	← justan0theruser left	15:17
	→ mikecmpbll joined	15:18
	← dsdeiz left	15:18
	← jungsubk left	15:19
	← bgamari left	15:20
	→ bgamari joined	15:21
	← user_corrupt left	15:21
	← PaulCapestany left	15:22
	← mikiones_ left	15:23
	← lukasdboer left	15:23
	→ snowkidind joined	15:24
	→ lukasdboer joined	15:24
	→ menip joined	15:24
	← ogny left	15:24
	← lukasdboer left	15:24
	→ Fleche_ joined	15:24
	→ Hello71 joined	15:25
	← overlord_tm left	15:25
	→ PaulCapestany joined	15:25
	← valhala_22 left	15:26
	→ valhala_22 joined	15:26
	← p4trick left	15:27
	← wandering_vagran left	15:27
	→ skroon joined	15:27
	← h12o left	15:27
	← Fleche left	15:27
skroon	I have a #develop branch, that I want to use a master... so I would like to overwrite my master branch. I'm too scared so I wanted to double check if this is the way todo it :-) git checkout -B master develop	15:29
	← Trendrrr left	15:29
	→ roelmonnens joined	15:29
	← Chuguniy left	15:29
	→ peacememories joined	15:30
rapha	Hi all!	15:30
	← davimore left	15:30
rapha	I'm trying to squash 2 commits (it's 4 now :( ) but this keeps happening: https://github.com/thoughtbot/neat/pull/620#pullrequestreview-47862857 ... what am I doing wrong?	15:30
	→ Trendrrr joined	15:30
grawity	squashing means a history rewrite	15:32
	a history rewrite means that you must use `git push --force` to actually push it	15:32
	← Ben_1 left	15:32
grawity	instead of doing `git pull` and actually merging back the pre-rewrite history	15:32
	← novae left	15:33
	→ h12o joined	15:33
	← Maskettaman left	15:33
rapha	oh	15:33
	← roelmonnens left	15:33
rapha	and i just didn't dare to argue with git	15:34
	→ peterbec` joined	15:34
skroon	I have overwritten my develop branch with master by doing: git checkout -B master develop however how can I now push to remote? because it will still complain about: unrelated histories	15:35
grawity	(well, if it were a shared branch, --force-with-lease would be safer)	15:36
	skroon: also --force, since you're also rewinding history	15:36
	← Kaisyu left	15:36
skroon	grawity: ah thanks :-)	15:36
	→ chase1 joined	15:37
	← Trendrrr left	15:38
	→ davimore joined	15:38
	← valhala_22 left	15:38
	→ Trendrrr joined	15:39
	← peterbec` left	15:40
grawity	in both cases, the stuff you're trying to push is not a fast-forward, and Git doesn't (can't) really distinguish it from the more usual situation where another dev commits/pushes to the same branch	15:40
	→ Gustavo6046 joined	15:40
grawity	so if you know you want to throw away what's on the server, you use --force(-with-lease)	15:41
	← CBF16888 left	15:41
	← h12o left	15:43
skroon	thanks all	15:43
	← skroon left	15:43
	← rasto left	15:44
	→ asd5a joined	15:45
	← AlanQ left	15:46
	→ elsevero joined	15:46
	← reynierpm left	15:48
	← NeXTSUN left	15:49
	→ ethali joined	15:49
	← nast left	15:50
	→ NeXTSUN joined	15:50
	← tcorneli left	15:50
	→ h12o joined	15:50
rapha	grawity: I'm starting to cry. Now I messed up in another way and have attributed my commits to the author of the commit directly before my first one :(	15:51
	← sweatsuit left	15:51
	→ orbyt_ joined	15:51
rapha	grawity: Is it possible to undo the rebase or should I just start over with a new clone?	15:51
grawity	`git reset --hard` to the last good commit ID	15:51
rapha	grawity: but that one is gone now...	15:52
grawity	it's not	15:52
	→ sweatsuit joined	15:52
grawity	not on your local repo, that is	15:52
	→ kurkale61 joined	15:52
rapha	mm	15:52
	how do i find out what the ids were that got squashed away?	15:52
	← kurkale6ka left	15:53
_ikke_	man git reflog	15:53
gitinfo	the git-reflog manpage is available at https://gitirc.eu/git-reflog.html	15:53
	← justanotheruser left	15:54
	→ justanotheruser joined	15:54
	← ethali left	15:54
	← wouter0100 left	15:54
	→ InfoTest joined	15:55
	→ nast joined	15:56
	→ Hink joined	15:56
	← kurkale61 left	15:57
	→ BSaboia joined	15:57
	→ kurkale61 joined	15:57
	→ xyphoid joined	15:58
	← h12o left	15:58
	← seschwar left	15:59
	← Trendrrr left	15:59
	→ oskarkv joined	15:59
	← bgamari left	16:00
	← ahr3n left	16:00
	→ Trendrrr joined	16:00
	← tigerdragong left	16:00
	→ donmichelangelo joined	16:00
rapha	Oh boy.	16:01
	→ bgamari joined	16:01
rapha	I think I'll leave it at that and wait for the original author to tell me whether he'll accept this state or wants me to start fresh.	16:01
	→ overlord_tm joined	16:02
rapha	Thanks grawity!	16:02
	→ King_Hual joined	16:02
zxd	is there a way to print all types of tags (annotated or not) from most recent backwards	16:04
	← bgamari left	16:05
grawity	possibly, but non-annotated tags don't have a timestamp (other than the tagged commit's timestamp – if they even tag a commit)	16:05
	← xyphoid left	16:05
	← Trendrrr left	16:06
	→ bgamari joined	16:06
zxd	ok how to do it with annotated?	16:06
	← fakenerd left	16:07
	→ wouter0100 joined	16:07
	→ thiago joined	16:08
	→ Trendrrr joined	16:08
	→ phinxy joined	16:08
	→ mischat_ joined	16:08
	→ h12o joined	16:10
	← bgamari left	16:11
	← mischat left	16:12
	→ fakenerd joined	16:14
	→ al-damiri joined	16:14
	→ valhala_22 joined	16:15
	← valhala_22 left	16:15
	→ kurkale62 joined	16:17
	← kurkale61 left	16:17
	← peacememories left	16:17
	→ bgamari joined	16:17
	← theoceaniscool left	16:17
	→ Sein joined	16:18
	← Brski__ left	16:18
	→ valhala_22 joined	16:21
	→ star_prone joined	16:24
	← Trendrrr left	16:24
	→ Trendrrr joined	16:26
	→ jimi_ joined	16:27
	← jimi_ left	16:27
	→ jimi_ joined	16:27
	← cstratak left	16:28
	← h12o left	16:28
	← cam27 left	16:28
	← star_prone left	16:28
	← malmalmal left	16:29
grawity	git tag --sort=creatordate	16:29
	→ Rodya_ joined	16:29
	← mischat_ left	16:29
	← svm_invictvs left	16:30
	← jimi_ left	16:30
	→ L00thar joined	16:30
	→ xyphoid joined	16:32
	→ dsdeiz joined	16:32
	→ h12o joined	16:32
	← Trendrrr left	16:33
	→ mischat joined	16:33
	→ df0 joined	16:33
	← kurkale62 left	16:34
	→ Jellyg00se joined	16:34
	→ Trendrrr joined	16:34
	← mikecmpbll left	16:35
	→ peterbec` joined	16:35
	← Baxter001 left	16:36
	← dsdeiz left	16:37
	← xyphoid left	16:37
	← mischat left	16:37
	→ jimi_ joined	16:38
	← eshlox left	16:39
	← peterbec` left	16:40
	← marcogmonteiro left	16:40
	→ malmalmal joined	16:41
	← h12o left	16:42
	→ marcogmonteiro joined	16:42
	← darkJedi left	16:43
	← nast left	16:45
	→ narendraj9 joined	16:45
	→ jimmyrcom joined	16:46
	← ToBeCloud left	16:47
	← Tobbi left	16:48
	← flaviodesousa left	16:49
	→ vuoto joined	16:49
	→ h12o joined	16:51
	→ theoceaniscool joined	16:52
	← khatri1 left	16:52
	← Trendrrr left	16:53
	← foul_owl left	16:53
	← valhala_22 left	16:54
	→ Trendrrr joined	16:54
	→ prg318 joined	16:55
	← freimatz left	16:55
	← malmalmal left	16:57
	→ foul_owl joined	16:57
	→ friendlyspider joined	16:58
	→ Gustavo6046_ joined	16:58
	← h12o left	16:58
	← Trendrrr left	16:59
	← friendlyspider left	17:00
	← Gustavo6046 left	17:01
	← a3Dman left	17:02
	← TheFuzzball left	17:02
	→ Trendrrr joined	17:03
	→ Jitta joined	17:03
	← elsevero left	17:03
	← jimi_ left	17:04
	← finalbeta left	17:05
	→ finalbeta joined	17:05
	→ xyphoid joined	17:06
	← czart__ left	17:06
	→ a3Dman joined	17:07
	→ mischat joined	17:09
	→ endiruna joined	17:10
	→ h12o joined	17:10
	← Rodya_ left	17:11
	← Trendrrr left	17:11
	→ SteffanW joined	17:12
	→ __g_k__1_w_m__s_ joined	17:12
	← xyphoid left	17:13
	→ Trendrrr joined	17:13
	← mischat left	17:13
	Guest83884 → murph	17:15
	← __g_k__1_w_m__s_ left	17:15
	← dsantiago left	17:16
	← shanuman left	17:17
	→ Rodya_ joined	17:19
	← dreiss left	17:20
	← chase1 left	17:20
	→ ethali joined	17:20
	← NeXTSUN left	17:21
	→ NeXTSUN joined	17:22
	← Trendrrr left	17:22
	→ Harzilein joined	17:23
Harzilein	hi	17:23
	is there something similar to git subtree split that will not move stuff from the prefix up into the root?	17:24
	→ Trendrrr joined	17:24
	← ethali left	17:25
Harzilein	i.e. i want to extract a perl module from girocco, it's in the Girocco prefix of the regular project, but could/should be a directory in the perl distribution as well	17:25
	s/ a / the /	17:25
	→ __g_k__1_w_m__s_ joined	17:26
	← __g_k__1_w_m__s_ left	17:26
	→ indistylo joined	17:26
	← indistylo left	17:26
	← endiruna left	17:27
	← h12o left	17:27
	→ diogenese joined	17:30
	→ czart joined	17:30
	→ tomasm- joined	17:30
	→ jimklo joined	17:31
tomasm-	ok is it possible to create a develop branch on a new repo without having a master branch? I have some files but not sure how to commit to develop branch or how to create it	17:31
grawity	a) commit as always, then rename master to develop	17:31
	→ h12o joined	17:31
tomasm-	ok thanks! was confused for a second there	17:32
	→ jceb joined	17:32
	← belmoussaoui_ left	17:32
	→ dsantiago joined	17:33
	→ YuGiOhJCJ joined	17:33
	← jimklo left	17:34
	← Gustavo6046_ left	17:34
	← sammyo left	17:34
Vampire0	Harzilein, shouldn't a subtree merge then move it back down into the wanted prefix?	17:34
	→ Gustavo6046 joined	17:34
Vampire0	grawity, tomasm- if you didn't make any commit yet, there is no branch at all yet, not even "master".	17:35
	→ peterbecich joined	17:35
Vampire0	grawity, tomasm- git status will tell so, but it is a lie	17:35
	grawity, tomasm- as long as you don't make a commit, no branch is present	17:35
_ikke_	tomasm-: git symbolic-ref HEAD refs/heads/develop	17:36
Vampire0	grawity, tomasm- so if you do `git checkout develop` before the first commit and then create the commit, there will only be a develop branch, no master branch	17:36
_ikke_	That will cause the new branch to be called develop instead of master	17:36
Vampire0	_ikke_, why not simply `git checkout develop`?	17:36
grawity	because there's no branch by that name	17:37
_ikke_	git checkout -b develop works too	17:37
Vampire0	`git checkout -b develop` I meant of course	17:37
	grawity, sorry, forgot the -b	17:37
	← Trendrrr left	17:37
	← Rodya_ left	17:37
Vampire0	grawity, the -b will create the branch, even without something to "branch off"	17:37
_ikke_	Was not sure if that would work, but it does	17:38
	← nowhere_man left	17:38
	→ Ardethian joined	17:38
	→ mikiones joined	17:38
	→ nowhere_man joined	17:38
	→ Trendrrr joined	17:38
	→ duderonomy joined	17:38
	→ df00z joined	17:39
	← invisbl left	17:39
df00z	Hey git add -a . should add everything in all subdirectories right?	17:40
	← Ardethian\ left	17:40
_ikke_	df00z: git add -A	17:40
df00z	hm maybe i see what is going on	17:41
	I have a subfolder that is another git repository	17:41
	it's not adding that	17:41
grawity	and it's not going to	17:41
df00z	I guess I don't need it to either.	17:41
	Just didnt know it was doing that	17:41
	→ svm_invictvs joined	17:41
grawity	you can add it two ways: a) add it as a submodule, or b) add its contents (the working tree) but not the .git repo itself	17:41
	→ jnavila joined	17:42
	← notebox left	17:42
	← chll_ left	17:43
	← h12o left	17:44
	→ Maskettaman joined	17:44
	← Trendrrr left	17:45
	→ Trendrrr joined	17:46
	← multi_io left	17:48
	← duderonomy left	17:48
	← marcogmonteiro left	17:48
	← ShekharReddy left	17:49
	← vuoto left	17:49
	← tomasm- left	17:49
	→ sammyo joined	17:50
	← mikiones left	17:51
	← svm_invictvs left	17:52
	← Trendrrr left	17:52
	→ robattila256 joined	17:52
	← bongjovi left	17:53
	→ multi_io joined	17:53
	→ duderonomy joined	17:53
	← narendraj9 left	17:53
	← CheckDavid left	17:53
	→ Trendrrr joined	17:54
	← fbwnd left	17:54
	→ nopf joined	17:55
	→ xyphoid joined	17:55
	← gxt left	17:57
	← noidea left	17:58
	← amrits left	17:59
	→ Lyqyd joined	17:59
	← jnavila left	18:00
	← xyphoid left	18:01
	← Trendrrr left	18:06
	→ iliakan joined	18:07
	gitinfo set mode: +v	18:07
iliakan	hello	18:07
	→ Trendrrr joined	18:08
iliakan	"git checkout another-branch" allows changes to be "carried over" to a new branch only if they are in new, just indexed (or untracked) files?	18:08
osse	iliakan: No, also if the changes are in files that are equal in the two branches	18:10
iliakan	umm what you mean?	18:10
	← _ADN_ left	18:10
iliakan	I felt like there's something else here, but don't remember what :(	18:11
osse	iliakan: The you i	18:11
	If you're in branch foo and want to check .	18:11
	Shit	18:11
	← SteffanW left	18:11
osse	You're in branch foo and what to checkout bar. Between them fileA and fileB are different. Then you can make changes to fileC and carry them over	18:12
	→ peterbec` joined	18:12
	← energizer left	18:13
iliakan	fileC is in both foo and bar?	18:14
	→ ethali joined	18:14
osse	Yes	18:14
	← Trendrrr left	18:14
	→ cam27 joined	18:15
osse	!float	18:15
gitinfo	If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	18:15
	← theoceaniscool left	18:15
iliakan	yep right	18:15
	→ xyphoid joined	18:15
iliakan	ah there's a tip for that!	18:15
	cool!	18:15
	thank ya	18:16
	→ Trendrrr joined	18:16
	→ star_prone joined	18:17
	← peterbec` left	18:18
	→ peterbec` joined	18:20
	← star_prone left	18:21
	← Trendrrr left	18:22
	← xyphoid left	18:23
	→ Arcaelyx joined	18:23
	→ Trendrrr joined	18:24
	← shinnya left	18:26
	← schleppel left	18:26
	← peterbecich left	18:27
	← peterbec` left	18:28
	→ m0viefreak joined	18:28
	→ mar77i_ joined	18:29
	→ fatihgenc joined	18:29
	← mar77i left	18:31
	→ xyphoid joined	18:32
	← blackwind_123 left	18:32
	← Lyqyd left	18:33
	← Trendrrr left	18:34
	→ blackwind_123 joined	18:34
	← jimmyrcom left	18:35
	→ jimmyrcom joined	18:35
	→ Trendrrr joined	18:35
	← YuGiOhJCJ left	18:37
	→ EvilPeng1 joined	18:38
	← EvilPenguin left	18:38
	← lmatteis left	18:43
	← Trendrrr left	18:45
	→ narendraj9 joined	18:45
	→ ethali_ joined	18:45
	→ Trendrrr joined	18:46
iliakan	checkout "floats" uncommitted changes only if fileC is same in both branches, right?	18:47
	← ethali left	18:47
iliakan	exactly same file, not changed in any commits	18:47
osse	iliakan: Well if it's changed but changed vack that's no problem	18:48
	← oskarkv left	18:48
osse	It must be equal in the branchest. That's it	18:48
	→ Matsv joined	18:48
	→ oskarkv joined	18:49
iliakan	OR it also floats new files	18:49
	only these two cases?	18:49
osse	New fie	18:50
	News files aren't just news files. Git doesn't know about them so they just remain	18:50
	→ h12o joined	18:50
iliakan	cat >new.html	18:50
	git add new.html	18:50
	git checkout foo	18:50
	→ belmoussaoui joined	18:50
iliakan	floats new.html both in WD and in index	18:50
	→ schleppel joined	18:51
	→ whitby joined	18:51
osse	In both thosr caded, at least. Try it out. If it doesn't work then nothing bad will happen	18:52
	← EvilPeng1 left	18:52
	← Trendrrr left	18:52
iliakan	yep, I tried the second case	18:53
	it does float	18:53
	these two are the only cases?	18:54
	→ Trendrrr joined	18:54
osse	I don't know.	18:55
	What other cases could there be	18:55
	→ dreiss joined	18:55
	→ npgm joined	18:57
	← dpl left	18:58
	← Trendrrr left	18:59
	← h12o left	19:00
	→ jnavila joined	19:00
	→ robotroll joined	19:01
	→ mischat joined	19:02
	→ Trendrrr joined	19:03
	← jceb left	19:08
	→ minn joined	19:09
	→ elsevero joined	19:09
	← Trendrrr left	19:10
	→ h12o joined	19:10
	→ Trendrrr joined	19:11
	← mischat left	19:14
	→ eahmedshendy joined	19:15
	← dreiss left	19:16
	← xyphoid left	19:16
eahmedshendy	Hi, I have a master and dev branches. I have a full commits on dev, I pushed them on GitHub, then I merge it with master, then before pushing my master to the origin, I did "git gc", then I tried to push my master to origin I am getting "Everything up-to-date"	19:17
	Am I lost something on the master?	19:17
iliakan	git gc has nothing to do with it in any case	19:17
_ikke_	No, git gc does not remove anything that is being referenced	19:17
eahmedshendy	So, what happened?	19:18
	I almost have 9 commits that needed to be pushed	19:18
iliakan	are you sure you're on master now?	19:18
eahmedshendy	Yes	19:18
_ikke_	Seveas: git log --oneline @{u}..	19:19
iliakan	fetch the remote master?	19:19
	← Uneedwat left	19:19
_ikke_	eahmedshendy: ^	19:19
	Seveas: sorry, wrong highlight	19:19
	→ chase1 joined	19:20
eahmedshendy	What is @{u}?	19:20
_ikke_	shortcut for the upstream branch	19:20
	upstream tracking branch	19:20
eahmedshendy	fatal: ambiguous argument '@u': unknown revision or path not in the working tree.	19:21
iliakan	git --version ?	19:21
eahmedshendy	I put " around it	19:21
_ikke_	eahmedshendy: your shell eats the {}	19:21
eahmedshendy	Sorry I am using "fish" shell	19:21
DelTree	" is not enough... ' should work...	19:21
eahmedshendy	The HEAD is pointing to 859c151 on master, and also on dev	19:22
	That is locally	19:22
	_ikke_	19:22
	← Trendrrr left	19:23
	→ githubmgw joined	19:23
_ikke_	!situation	19:24
gitinfo	Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)	19:24
	→ Trendrrr joined	19:24
iliakan	did log --oneline @{u}.. show anything?	19:25
	← jedarc left	19:25
eahmedshendy	iliakan, yes	19:25
iliakan	there should be a list of commits	19:25
eahmedshendy	_ikke_, should I do this on master or dev?	19:25
iliakan	9 commits?	19:25
_ikke_	eahmedshendy: it should not matter	19:25
	→ githubmgw1 joined	19:25
eahmedshendy	Ok	19:25
	iliakan, more	19:26
	_ikke_, http://paste.ubuntu.com/25020305/	19:26
	→ githubmgw2 joined	19:26
	→ dreiss joined	19:27
_ikke_	eahmedshendy: and what are you trying to push?	19:27
	→ phy1729 joined	19:27
eahmedshendy	I need to push master to origin	19:27
_ikke_	according to this, origin already has everything	19:27
iliakan	it says master and origin/master are same	19:27
	← githubmgw left	19:27
eahmedshendy	The last commit is: 859c151	19:27
iliakan	but why log --oneline @{u}.. shows anything?	19:27
	how can it be?	19:27
	→ githubmgw joined	19:28
eahmedshendy	iliakan, what should it display?	19:28
iliakan	if I get things right, nothing...	19:28
_ikke_	eahmedshendy: well, I expect it to show nothing, right	19:28
	Seveas slaps _ikke_	19:28
	_ikke_ auch	19:28
eahmedshendy	Oh, guys now the origin is the same as master	19:28
_ikke_	yes, that's what we say :P	19:28
iliakan	was the push successful meanwhile?	19:29
Seveas	be careful who you highlight. I have a large garden and enough fertilizer to make you disappear :P	19:29
	← h12o left	19:29
_ikke_	auch	19:29
	hehe	19:29
	→ podlech joined	19:29
eahmedshendy	iliakan, which one?	19:29
iliakan	dunno :) but right now you've pushed it.	19:29
eahmedshendy	Would the push take a minutes to take affect	19:29
_ikke_	eahmedshendy: for git not	19:30
iliakan	if you have a slow network	19:30
_ikke_	but web services might	19:30
	← githubmgw1 left	19:30
	→ malmalmal joined	19:30
iliakan	are you over GPRS	19:30
	← githubmgw2 left	19:31
	← Trendrrr left	19:31
	← robotroll left	19:31
	→ guardian joined	19:31
eahmedshendy	I remember something, I didn't push before "git gc", but after I do "git gc" then I did push again and I got this output "796ffa7..859c151 master -> master"	19:31
	Sorry I did push before "git gc" bad typing	19:31
	I remember something, I did push before "git gc", then after I do "git gc" then I did push again and I got this output "796ffa7..859c151 master -> master"	19:32
	← d0liver left	19:32
eahmedshendy	edited	19:32
	→ h12o joined	19:32
	→ Trendrrr joined	19:32
	→ IntrinsicCause joined	19:32
	← phy1729 left	19:33
_ikke_	eahmedshendy: note that you rarely have to run git gc yourself	19:33
	→ gargola joined	19:33
	→ dsdeiz joined	19:34
	← dsdeiz left	19:34
	→ dsdeiz joined	19:34
eahmedshendy	_ikke_, I choose a wrong command, I just deleted a folder for dependencies packages that is used to be pushed on the repo, and I still get more than 2000 thousands for file when trying to clone the project from scratch	19:34
_ikke_	just running git gc is not getting rid of them	19:34
eahmedshendy	yeah, I see it now, I understand it wrong	19:35
	I definitely sure that there was a delay, because I cloned the repo to test some from scratch and I got an old commit	19:35
	→ roelmonnens joined	19:35
	→ star_prone joined	19:35
eahmedshendy	_ikke_, do you know how to git rid of that folder even If removed it from git?	19:35
	← star_prone left	19:35
_ikke_	if clone is getting you that folder, it means it's still part of your history	19:36
	so you need to make sure it's removed from all commits	19:36
	← basiclaser left	19:37
	← podlech left	19:37
	→ podlech joined	19:38
	→ star_prone joined	19:38
eahmedshendy	I don't get them while cloning, but I only have less than 50 active files and I see while cloning that: 2667 object is being received	19:39
	Does that number mean something?	19:39
	← dsdeiz left	19:39
	← db8093246 left	19:39
	← roelmonnens left	19:39
eahmedshendy	Am the received files size is 7m	19:39
Seveas	yes, every version of every file and directory is in the repo	19:39
	and commits themselves are also objects	19:39
eahmedshendy	I guess that number doesn't related to how many files, but may be related to how many blobs and tree and commits stored int git, right?	19:40
Seveas	correct	19:40
eahmedshendy	Seveas, aha	19:40
	← Trendrrr left	19:40
eahmedshendy	Seveas, we can't get rid of unused object right, or we should care about this at all?	19:40
	→ Trendrrr joined	19:42
_ikke_	they will be removed eventually	19:42
eahmedshendy	Aha, good	19:43
	← manuelschneid3r left	19:43
DelTree	but what are unused objects ?	19:43
_ikke_	DelTree: objects created but due to history rewriting no longer referenced	19:44
eahmedshendy	I don't know, I am just pretending there is an unused objects, may be there is	19:44
osse	DelTree: if you 'git add file' twice then the object created the first time is unused	19:44
	for example	19:44
	→ peterbecich joined	19:44
	← Cabanossi left	19:44
_ikke_	(git add. edit file, git add)	19:44
DelTree	git add twice like in not commit between...	19:45
	← h12o left	19:45
	→ nauar joined	19:45
	→ rominron_ joined	19:45
DelTree	does that ever amount to many objects ?	19:45
	→ Cabanossi joined	19:45
osse	when stuff like filter-branch or rebase is involved, yes.	19:46
_ikke_	or when you git add a dir with lots of files and reset	19:46
DelTree	the rebased part is considered unused ?	19:47
osse	no the old part	19:47
	← malmalmal left	19:48
DelTree	yes... that's what I meant... well, I think...	19:48
	I think I fail to get the rule...	19:48
_ikke_	what rule?	19:48
DelTree	for an object to be "unused"...	19:49
osse	when git doesn't use it anymore	19:49
_ikke_	an object in git only exists if it's reachable from one of the roots (refs, reflog)	19:49
	→ jeffreylevesque_ joined	19:49
DelTree	I pretty much don't see how commits can be unused...	19:49
_ikke_	If an object is not reachable anymore, it's eligible for GC	19:49
osse	DelTree: git commit --amend => produces a new SHA1. The old one is unused	19:50
	DelTree: basically, git doesn't clean up after itself	19:50
	that's what happens	19:50
_ikke_	DelTree: Are you familiar with the git object model?	19:50
	← jeffreylevesque left	19:50
	→ h12o joined	19:51
DelTree	but if I git tag the old sha1 before gc comes over there, then it's no longer unused ?	19:51
osse	DelTree: correct	19:51
	because git needs it	19:51
DelTree	_ikke_: I guess you can imagine I'm still having trouble to catch upon things...	19:51
_ikke_	np	19:51
nauar	_ikke_, Vampire0: With your guidelines, I got to finish my filesize/extensions policies in my pre-receive hook! I published it in a gist: https://gist.github.com/nauar/826f85d25d692d9bc009312cb71577dd . Thanks a lot to you!	19:52
DelTree	osse: sounds quite odd to me......	19:52
_ikke_	DelTree: what sounds odd?	19:52
	← Trendrrr left	19:52
osse	DelTree: imagine if your text editor saved the file you're working on under a new name every time you save. That's what git does.	19:52
DelTree	that the commit can get unused and the used again...	19:52
	then*	19:52
	← jnavila left	19:53
osse	DelTree: it can be used again if you tag it, yes, but in practice that never happens	19:53
	→ valhala_22 joined	19:53
	→ Trendrrr joined	19:54
DelTree	well... almost never... strange people like me can do weird things...	19:54
	← opalepatrick left	19:54
_ikke_	DelTree: as long as an object exists in the repository, you can still reference it	19:54
	DelTree: When git runs gc, it basically starts at all the refs and reflog, and traverses all objects	19:54
	→ xyphoid joined	19:54
DelTree	strange race between me and gc... ^_^	19:54
_ikke_	refs point to commits, commits point to trees, trees point to blobs and other trees	19:54
	tag refs point to commits and tag objects	19:55
	the reflog points to commits	19:55
	any object that is not reached by this project, is deemed unused	19:55
	a commit points to it's parent commit(s) too	19:56
	s/it's/its/	19:56
DelTree	it's starting to make sense to me... but I still have to get used to it...	19:57
	← L00thar left	19:57
	→ L00thar_ joined	19:57
	→ UrsoBranco joined	19:58
DelTree	(and not start tagging everything before gc gets a chance to get rid of it)... ^_^	19:58
	→ VaultTec joined	19:58
	← h12o left	19:58
	← valhala_22 left	19:58
	← VaultTec left	19:58
	← nauar left	19:59
osse	it really does not make sense to tag something that would be gc'ed in the first place	19:59
_ikke_	right	19:59
	← podlech left	19:59
osse	DelTree: if you ever do for a valid reason I'll buy you a beer	19:59
_ikke_	and there is always the reflog, which keeps commits referenced for 90 days	19:59
	→ VaultTec joined	19:59
	← xyphoid left	20:00
	← nisseni left	20:00
	← rominron_ left	20:00
	→ malmalmal joined	20:01
DelTree	well I do have that one repo where I pretty much succeeded in making a mess of everything...	20:02
	← Trendrrr left	20:02
	→ Trendrrr joined	20:03
	→ rahtgaz joined	20:04
dodobrain	umm, how do i cherry-pick a commit but have it appear as a completely new commit in the branch i am picking to?	20:06
osse	dodobrain: Isn't that what already happens?	20:07
tang^	use --no-commit and custom commit	20:07
osse	You can change author/message if you want	20:07
dodobrain	osse, it preserves the original commit date i think	20:08
	→ Tobbi joined	20:08
	← narendraj9 left	20:09
tang^	which also makes it easier to tell that it was a cherry-pick... code reuse ftw	20:09
	→ dotin joined	20:09
	← iliakan left	20:10
	→ iliakan joined	20:10
	→ h12o joined	20:10
	← dotin left	20:11
	→ L00thar__ joined	20:11
	← Trendrrr left	20:11
	→ mischat joined	20:11
	→ SCHAPiE joined	20:12
	← dreiss left	20:13
	→ jnavila joined	20:13
	← L00thar_ left	20:14
	→ Trendrrr joined	20:14
	→ dreiss joined	20:15
	← h12o left	20:15
	← mischat left	20:16
osse	dodobrain: use --reset-author	20:17
	Bur why?	20:17
	→ Maskettaman_yo joined	20:17
	← Maskettaman left	20:19
	mar77i_ → mar77i	20:20
	→ peterbec` joined	20:20
	← df0 left	20:20
	← Trendrrr left	20:21
	→ cagedwisdom joined	20:21
	→ Trendrrr joined	20:22
	← peterbec` left	20:26
	→ robotroll joined	20:27
	← eahmedshendy left	20:27
	← malmalmal left	20:27
	← schleppel left	20:28
	← peterbecich left	20:29
	← robotroll left	20:29
	← Trendrrr left	20:29
	→ askb joined	20:29
	→ h12o joined	20:30
	→ shinnya joined	20:31
	→ _ADN_ joined	20:31
	← spm_draget left	20:31
	→ Trendrrr joined	20:31
	← bitmod left	20:32
	→ bitmod joined	20:32
	→ xyphoid joined	20:32
	← konsolebox left	20:33
	← Quetzal2 left	20:35
	→ roelmonnens joined	20:35
	→ abstr0n joined	20:35
	→ mischat joined	20:36
	→ konsolebox joined	20:38
	← Trendrrr left	20:38
	← xyphoid left	20:38
	← roelmonnens left	20:39
	→ Trendrrr joined	20:42
	→ misosoup joined	20:42
	← h12o left	20:44
	← abstr0n left	20:48
	← Trendrrr left	20:49
	→ HoierM_ joined	20:50
	→ podlech joined	20:50
	← podlech left	20:50
	→ Trendrrr joined	20:50
	→ h12o joined	20:51
	← blackwind_123 left	20:55
	← Trendrrr left	20:55
	← King_Hual left	20:56
	→ blackwind_123 joined	20:57
	← UrsoBranco left	20:57
	→ oleksiyp joined	20:58
	← h12o left	20:59
	→ Trendrrr joined	20:59
	→ abstr0n joined	20:59
	← ethali_ left	21:00
	← oleksiyp left	21:01
	→ Maskettaman joined	21:02
	← Maskettaman_yo left	21:04
	→ hs12 joined	21:04
	← Fleche_ left	21:05
	→ ncthom91 joined	21:05
	→ jaziz joined	21:07
	→ macrover joined	21:07
	← abstr0n left	21:08
	← Trendrrr left	21:08
	→ brent__ joined	21:09
	→ Trendrrr joined	21:10
	→ h12o joined	21:10
	→ trac3r_ joined	21:11
	← Sharker left	21:14
	→ opalepatrick joined	21:14
	→ Sharker joined	21:14
	← h12o left	21:16
	→ xyphoid joined	21:16
Serus	hi	21:16
	how is git lfs support on windows?	21:17
	I assume it to be working well on *nix systems, but last time I checked it seemed to be lacking with windows support	21:18
	Anybody using it on a project?	21:18
	← opalepatrick left	21:18
	→ opalepatrick joined	21:19
	← fatihgenc left	21:21
	← Trendrrr left	21:23
	← VaultTec left	21:23
	← xyphoid left	21:25
	← Jitta left	21:25
	→ Trendrrr joined	21:25
	→ VaultTec joined	21:26
	→ wilbert joined	21:26
	← hanna left	21:26
	→ mozzarella joined	21:27
	← Cabanossi left	21:28
	→ hanna joined	21:28
	→ valhala_22 joined	21:29
	→ Fleche_ joined	21:29
	→ h12o joined	21:30
	→ Cabanossi joined	21:31
	← jstein left	21:32
	← Darren_ left	21:33
	← Trendrrr left	21:34
	→ tyoc213 joined	21:34
	→ Trendrrr joined	21:36
	→ xyphoid joined	21:36
	→ evifn joined	21:37
	→ roelmonnens joined	21:38
	→ jceb joined	21:38
	→ andy joined	21:38
	← andy left	21:39
tyoc213	if I only have 3 commits and for git rebase -i -p I need to put the commit of the latest commit (which there isnt) how I can do that?	21:40
	I mean, I want to rebase and ammend the user for each one of this 3 commits	21:40
	← xyphoid left	21:40
	← jnavila left	21:41
	← roelmonnens left	21:42
b0nn	git rebase -i HEAD~n (where n is the number of commits back to cover the 3)	21:42
	← Trendrrr left	21:42
b0nn	then mark each of the 3 for edit/r/whatever you deem appropriate	21:43
	→ Trendrrr joined	21:44
	← h12o left	21:45
	← Eryn_1983_FL left	21:49
	← ahrs left	21:50
	← str left	21:50
	← duderonomy left	21:50
	→ Eryn_1983_FL joined	21:50
	→ tymczenko joined	21:50
	→ h12o joined	21:50
	→ Anja joined	21:51
	→ ahrs joined	21:51
	← cdown left	21:51
	→ peterbec` joined	21:52
	→ nullcone_ joined	21:53
	→ kculpic joined	21:57
tyoc213	thx b0nn	21:57
	← scarcry left	21:57
	← Phylock left	21:58
	→ scarcry joined	21:58
	← Cabanossi left	21:58
	← raulp left	21:59
	→ raulp joined	21:59
	← Trendrrr left	22:00
	← h12o left	22:00
	→ Cabanossi joined	22:01
	→ Trendrrr joined	22:01
	→ xyphoid joined	22:03
	← VaultTec left	22:04
	← IntrinsicCause left	22:04
tyoc213	b0nn I get fatal: Needed a single revision	22:05
	← huqinlou left	22:07
	← xyphoid left	22:08
	← pbandark left	22:10
	← singer22 left	22:12
	→ invisbl joined	22:12
	← ncthom91 left	22:12
	← Domhack left	22:14
	→ Domhack joined	22:15
	← snowkidind left	22:17
	← brent__ left	22:17
	← Gustavo6046 left	22:17
	→ nast joined	22:17
	→ brent__ joined	22:18
	← Trendrrr left	22:18
	← al-damiri left	22:20
	→ Trendrrr joined	22:20
	→ theoceaniscool joined	22:20
	→ Gustavo6046 joined	22:20
	→ cdown joined	22:21
	← brent__ left	22:22
	→ xyphoid joined	22:22
	→ singer22 joined	22:23
	→ Lunatrius` joined	22:24
	← nast left	22:25
	← peterbec` left	22:26
Vampire0	tyoc213, did I get you right that you want to rebase each and every commit?	22:27
	→ nisseni joined	22:27
Vampire0	tyoc213, then use --root	22:27
	← Lunatrius left	22:27
	Lunatrius` → Lunatrius	22:27
tyoc213	yeah, is because I started a project with git and commit 3 but I didnt see that I was using the credentials of my work instead of my personal ones... and this project is from me to myself	22:28
	xD	22:28
	so I want to rewrite the commiter	22:28
	→ fission6 joined	22:28
	← xyphoid left	22:28
	← livingstn left	22:30
	→ nast joined	22:30
	← Trendrrr left	22:32
	→ itseris joined	22:34
	→ mns joined	22:34
	← msonntag left	22:34
	← InfoTest left	22:34
	→ Trendrrr joined	22:35
	→ Husky_Apocalypse joined	22:35
	← steeze left	22:37
	→ msonntag joined	22:38
	← nast left	22:38
	← Trendrrr left	22:42
	← Darcidride left	22:42
	← hs12 left	22:43
	→ Trendrrr joined	22:43
	→ Bennux joined	22:44
	← rahtgaz left	22:44
	← tarkus left	22:44
	← valhala_22 left	22:44
	← belmoussaoui left	22:45
minn	How do you compare one file against every file in a tree and obtain similarity scores? I can do this for file/file (or tree/tree, etc) pairs, but not file/tree pairs (without manually diffing against all relevant files).	22:45
	→ valhala_22 joined	22:45
	← Noldorin left	22:46
Vampire0	tyoc213, instead of rebase you could also use man git filter-branch	22:46
gitinfo	tyoc213: the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html	22:46
Vampire0	tyoc213, with an environment filter	22:46
	← Bennux left	22:48
	← jceb left	22:53
	→ fishcooker joined	22:54
	← nisseni left	22:54
	→ jungsubk joined	22:55
	← mel00010 left	22:55
	← msonntag left	22:56
	← TomyLobo left	22:57
	← Cabanossi left	22:59
	← NeXTSUN left	22:59
	← overlord_tm left	23:00
	→ Cabanossi joined	23:01
	→ svm_invictvs joined	23:02
	← ertes-w left	23:02
	← chase1 left	23:04
	← Tobbi left	23:04
	← finalbeta left	23:04
	← jungsubk left	23:04
	← donmichelangelo left	23:05
	→ msonntag joined	23:07
	→ NeXTSUN joined	23:07
	← fishcooker left	23:09
	← phinxy left	23:10
	→ mel00010 joined	23:11
	→ Achylles_ joined	23:15
	→ optimus joined	23:15
	← Gurkenglas left	23:16
	← Achylles_ left	23:16
	→ PtxDK joined	23:18
	← Jellyg00se left	23:18
	← leeN left	23:18
	← xcm left	23:19
	→ xcm joined	23:20
	← itseris left	23:20
	← Trendrrr left	23:21
	← afuentes left	23:21
	← fission6 left	23:22
	→ peterbec` joined	23:22
	→ Trendrrr joined	23:23
	→ bgrrtt joined	23:23
	→ nisseni joined	23:23
	← bgrrtt left	23:24
	← valhala_22 left	23:24
	← PaulCapestany left	23:24
	← msonntag left	23:25
	← rostero left	23:25
	→ Kaisyu joined	23:25
	← theoceaniscool left	23:26
	← menip left	23:26
	← L00thar__ left	23:27
	← peterbec` left	23:27
	← invisbl left	23:27
	← Lunatrius left	23:27
	→ valhala_22 joined	23:28
	← svm_invictvs left	23:28
	← mel00010 left	23:31
	→ msonntag joined	23:31
	→ svm_invictvs joined	23:31
	← dsantiago left	23:32
	→ Vgr joined	23:32
	→ Lunatrius joined	23:32
	← nisseni left	23:32
	← NeXTSUN left	23:33
	← misosoup left	23:33
	← Trendrrr left	23:34
	→ xyphoid joined	23:34
	→ PaulCapestany joined	23:35
	→ dsdeiz joined	23:35
	← dsdeiz left	23:35
	→ dsdeiz joined	23:35
	→ Trendrrr joined	23:35
	← msonntag left	23:35
	→ f3r70rr35f joined	23:36
	← opalepatrick left	23:36
	→ NeXTSUN joined	23:37
	→ JackFruh joined	23:38
	→ ohHenry joined	23:39
	← mentazoom left	23:40
	← dsdeiz left	23:40
	→ msonntag joined	23:41
	← Maskettaman left	23:41
	→ IntrinsicCause joined	23:41
	→ ertes joined	23:43
	→ mostlybadfly joined	23:46
	→ kadoban joined	23:46
	← NeXTSUN left	23:47
	← lagothri1 left	23:47
	← xyphoid left	23:48
	← glad left	23:49
	→ lagothrix joined	23:51
	→ mar77i_ joined	23:55
	← mar77i left	23:57
	← Trendrrr left	23:58
	← Cabanossi left	23:58
	← mischat left	23:59
	→ chase1 joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation