IRCloggy #git 2018-08-14

Provider of IRC logs since 2005.

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

	2018-08-14
	← nevodka left	00:01
	← bookworm left	00:02
	→ nevodka joined	00:02
	← leeN left	00:03
	← ceevusee left	00:03
	→ teodorg joined	00:04
	← ilmostro left	00:05
	← p3rs3us left	00:07
	→ ilmostro joined	00:07
	← nevodka left	00:07
	→ nevodka joined	00:08
	← Mir4g3 left	00:10
	← heroux left	00:10
	→ justan0theruser joined	00:11
	→ Mir4g3 joined	00:11
	← heroux_ left	00:11
	← nevodka left	00:12
	→ nevodka joined	00:13
	→ g00s joined	00:13
	← ahammond left	00:14
	→ ahammond joined	00:14
	← __nd__ left	00:16
	← ahammond left	00:16
	→ _nd_ joined	00:16
	← rsrx left	00:16
	→ ahammond joined	00:17
	→ JeffH joined	00:17
	→ heroux joined	00:18
	→ heroux_ joined	00:18
	← ahammond left	00:19
	← nevodka left	00:21
	→ nevodka joined	00:22
	→ ahammond joined	00:23
	← ahammond left	00:24
	→ ahammond joined	00:24
	→ wpcarro joined	00:24
	← justan0theruser left	00:25
	← Sigfrid left	00:26
	← nevodka left	00:26
	← ahammond left	00:27
	→ nevodka joined	00:27
	← wpcarro left	00:29
	→ Arcatech joined	00:30
	← BallChang-CN left	00:30
	→ ahammond joined	00:31
	← RoriconKnight left	00:32
	← nevodka left	00:32
	→ justanotheruser joined	00:33
	→ strugee joined	00:35
	← CodeSlingerPaul left	00:36
	← Puffball left	00:37
	← JeffH left	00:37
	→ nevodka joined	00:38
	→ JeffH joined	00:38
	→ Cerise_ joined	00:39
	← Cerise_ left	00:39
	→ Cerise_ joined	00:39
	→ thiago joined	00:40
	Cerise_ → Cerise	00:40
	← JeffH left	00:41
	← nevodka left	00:43
	→ nevodka joined	00:44
	← kfoonamalik left	00:46
	← Arcatech left	00:47
	← lanlink left	00:47
	← raymond left	00:47
	→ durham_ joined	00:47
	← MrAureliusR` left	00:47
	← nevodka left	00:49
	→ oojacobo_ joined	00:49
	→ nevodka joined	00:49
	→ gruetzko- joined	00:49
	→ rory_ joined	00:50
	← durham left	00:50
	← durham_ left	00:51
	→ destiny joined	00:52
	→ planigan_ joined	00:52
	← maestrojed left	00:52
	← nevodka left	00:54
	→ nevodka joined	00:54
	→ sns joined	00:55
	→ AciD` joined	00:55
	← AciD` left	00:55
	→ AciD` joined	00:55
	→ kevr_ joined	00:55
	→ jave joined	00:56
	← mystica555 left	00:57
	← Gustavo6046 left	00:57
	← mdk left	00:57
	← _rgn left	00:57
	← Soni left	00:57
	← catsup left	00:57
	← Evoken left	00:57
	← erratic left	00:57
	← guideline_ left	00:57
	← heftig left	00:57
	← blahdodo left	00:57
	← doug16k left	00:57
	← marlinc left	00:57
	← Olipro left	00:57
	← nutron\|w left	00:57
	← robinsmidsrod left	00:57
	← _ikke_ left	00:57
	← Random832 left	00:57
	← argoneus left	00:57
	← traumschule left	00:57
	← oojacoboo left	00:57
	← cjkinni left	00:57
	← James0r left	00:57
	← wget left	00:57
	← Guest70186 left	00:57
	← polman left	00:57
	← BrAsS_mOnKeY left	00:57
	← mulvane left	00:57
	← BlessJah left	00:57
	← gruetzkopf left	00:57
	← chachasmooth left	00:57
	← destiny_ left	00:57
	← Remram left	00:57
	← lightstalker left	00:57
	← HalfEatenPie left	00:57
	← jave_ left	00:57
	← snsapiens left	00:57
	← AKPWD left	00:57
	← hernan604_ left	00:57
	← fxrs_ left	00:57
	← felixsanz_ left	00:57
	← jorijn_ left	00:57
	← kevr left	00:57
	← giany left	00:57
	← winny left	00:57
	← LeMike_ left	00:57
	← bauruine left	00:57
	← alcohol left	00:57
	← ruskie left	00:57
	← KFBI left	00:57
	← mrkake left	00:57
	← voker57 left	00:57
	← Hello71 left	00:57
	← Impaloo left	00:57
	← tomek left	00:57
	← tgummerer left	00:57
	← crater2150 left	00:57
	← roger_raymond left	00:57
	← ghoti left	00:57
	← murph left	00:57
	← msm__ left	00:57
	← kgz left	00:57
	← rory left	00:57
	← dzho left	00:57
	← tmz left	00:57
	← livcd left	00:57
	← planigan left	00:57
	← m0ltar left	00:57
	→ BallChang-CN joined	00:58
	→ doug16k joined	00:58
	← Sasazuka left	00:58
	← venb left	00:58
	→ venb joined	00:59
	← styler2go left	00:59
	← catern left	00:59
	← nevodka left	00:59
	← Gabemo left	00:59
	→ nevodka joined	01:00
	← Trieste left	01:00
	→ fowl joined	01:01
fowl	how can i commit from detached head	01:01
	→ Gabemo joined	01:02
	→ catern joined	01:02
	← Gabemo left	01:02
	→ Gabemo joined	01:02
	→ styler2go joined	01:02
	→ greatgatsby joined	01:02
	→ BrAsS_mOnKeY joined	01:02
	← jp left	01:02
	→ jp joined	01:03
	→ polman joined	01:04
	→ durham_ joined	01:04
	→ giany joined	01:04
	→ Gustavo6046 joined	01:04
	→ mdk joined	01:04
	→ _rgn joined	01:04
	→ Soni joined	01:04
	→ livcd joined	01:04
	→ catsup joined	01:04
	→ Evoken joined	01:04
	→ heftig joined	01:04
	→ blahdodo joined	01:04
	→ marlinc joined	01:04
	→ Olipro joined	01:04
	→ nutron\|w joined	01:04
	→ robinsmidsrod joined	01:04
	→ _ikke_ joined	01:04
	→ Random832 joined	01:04
	→ argoneus joined	01:04
	→ traumschule joined	01:04
	→ cjkinni joined	01:04
	→ James0r joined	01:04
	→ wget joined	01:04
	→ WAA7BZ8 joined	01:04
	→ mulvane joined	01:04
	→ BlessJah joined	01:04
	→ chachasmooth joined	01:04
	→ Remram joined	01:04
	→ HalfEatenPie joined	01:04
	→ lightstalker joined	01:04
	→ AKPWD joined	01:04
	→ hernan604_ joined	01:04
	→ fxrs_ joined	01:04
	→ felixsanz_ joined	01:04
	→ jorijn_ joined	01:04
	→ winny joined	01:04
	→ LeMike_ joined	01:04
	→ bauruine joined	01:04
	→ alcohol joined	01:04
	→ KFBI joined	01:04
	→ mrkake joined	01:04
	→ voker57 joined	01:04
	→ Hello71 joined	01:04
	→ Impaloo joined	01:04
	→ tomek joined	01:04
	→ tgummerer joined	01:04
	→ crater2150 joined	01:04
	→ roger_raymond joined	01:04
	→ ghoti joined	01:04
	→ murph joined	01:04
	→ msm__ joined	01:04
	→ kgz joined	01:04
	→ dzho joined	01:04
	→ tmz joined	01:04
	→ Ragnor joined	01:04
	→ Corey joined	01:04
	→ Guest48915 joined	01:04
	→ lohfu joined	01:04
	→ murr4y joined	01:04
	→ m0ltar joined	01:04
	← lohfu left	01:04
	← murr4y left	01:04
	← Random832 left	01:04
	← polman left	01:04
	← durham_ left	01:04
	← murph left	01:04
	← Gustavo6046 left	01:04
	→ polman joined	01:04
	→ murr4y joined	01:04
	→ Random832 joined	01:04
	Random832 → 3NAAAZKI0	01:04
	← 3NAAAZKI0 left	01:04
	→ NAAAZKI0 joined	01:04
	→ lohfu joined	01:04
	→ guideline joined	01:04
	→ Gustavo6046 joined	01:04
	→ Trieste joined	01:05
	← venb left	01:06
	← thinkpad left	01:06
	← paralle21_ left	01:06
	← jorj left	01:06
	← marceloneil_ left	01:06
	→ venb joined	01:06
	→ ismithers joined	01:07
	→ bookworm joined	01:07
	← axsuul left	01:07
	← Exagone313 left	01:07
	→ reto_ joined	01:08
	→ doubtful joined	01:08
	→ axsuul joined	01:09
	→ gdibasss joined	01:09
	→ thinkpad joined	01:09
	→ marceloneil joined	01:09
	→ murph joined	01:09
	→ jorj joined	01:09
	murph → Guest85612	01:10
	→ erratic_ joined	01:10
	→ Exagone313 joined	01:10
	← teodorg left	01:10
	← nixdork left	01:10
	← applecrumble left	01:11
	→ parallel21 joined	01:11
	← gdibass left	01:11
	gdibasss → gdibass	01:12
fowl	just lost my commit	01:12
	→ Arcatech joined	01:12
ismithers	How did you manage that fowl ?	01:13
	→ Kaisyu joined	01:15
	→ thomasross_ joined	01:15
	← g00s left	01:15
	← nevodka left	01:16
	→ nixdork joined	01:16
	← cagomez left	01:17
	← thomasross left	01:17
	→ nevodka joined	01:17
	→ ruskie joined	01:17
	→ cagomez joined	01:18
	→ wpcarro joined	01:23
rewt	why would you want to commit to a detached head? how did you expect to be able to check it out?	01:23
	← hahuang65 left	01:25
	→ finalbeta joined	01:28
	← wpcarro left	01:29
	← bsaboia left	01:30
	← nevodka left	01:33
	→ nevodka joined	01:35
	← nevodka left	01:39
	→ Vortex35 joined	01:42
	→ nevodka joined	01:43
	← Vortex34 left	01:45
	→ dsdeiz joined	01:46
	← dsdeiz left	01:46
	→ dsdeiz joined	01:46
	→ wpcarro joined	01:47
	← Arcatech left	01:48
	← nevodka left	01:48
	→ nevodka joined	01:49
	→ orbyt_ joined	01:49
	← orbyt_ left	01:50
	← dsdeiz left	01:51
	→ Arcatech joined	01:51
	← wpcarro left	01:53
	fii → iroha	01:56
	→ Goplat joined	01:56
	→ biberao2 joined	01:58
	→ dsdeiz joined	01:58
	← dsdeiz left	01:58
	→ dsdeiz joined	01:58
	→ stoopkid joined	01:59
	→ dreiss joined	01:59
parsnip	stash	01:59
	← biberao2 left	01:59
	← Arcatech left	02:01
	← dsdeiz left	02:03
	→ sdwrage joined	02:03
	← justanotheruser left	02:04
	← sh3iny left	02:04
	→ sh3iny joined	02:04
	← sdwrage left	02:04
	→ dsdeiz joined	02:05
	← dsdeiz left	02:05
	→ dsdeiz joined	02:05
	← cagomez left	02:06
	→ cagomez joined	02:09
	← doubtful left	02:18
	Guest85612 → murph	02:19
	→ altendky joined	02:20
	← Anja left	02:23
	→ watabou joined	02:23
	→ justanotheruser joined	02:24
	← dreiss left	02:27
	→ lagothri1 joined	02:28
	← notnull left	02:29
	→ orbyt_ joined	02:31
	← lagothrix left	02:31
	→ RuckusBringer joined	02:35
	← nevodka left	02:38
	← TheRuckus left	02:38
	→ nevodka joined	02:39
	→ doubtful joined	02:40
	← cagomez left	02:41
	→ Arcatech joined	02:42
	← nevodka left	02:44
	→ nevodka joined	02:45
	→ tehp joined	02:48
	→ dreiss joined	02:49
	→ bsaboia joined	02:55
	← doubtful left	02:55
	← staafl_ left	02:55
	→ raymond joined	02:55
	→ Anja joined	02:59
	← njbair left	03:00
	→ njbair joined	03:02
	→ hahuang65 joined	03:08
	← bsaboia left	03:14
	← opal left	03:14
	→ opal joined	03:15
	→ ^MillerBoss joined	03:30
	← ^MillerBoss left	03:30
	→ g00s joined	03:32
	→ tsdh joined	03:34
	→ chipk joined	03:37
	→ kfoonamalik joined	03:39
	← chipk left	03:40
	← orbyt_ left	03:40
	← Codaraxis left	03:41
	← navidr left	03:46
	→ wpcarro joined	03:49
	→ zmt00 joined	03:50
	← wpcarro left	03:54
	← Gustavo6046 left	03:54
	→ orbyt_ joined	03:54
	← JoshuaD left	03:55
	→ timj joined	03:59
	← timj1 left	04:01
	← mrCyborg left	04:05
	← Garen left	04:05
	← fakenerd left	04:05
	→ mrCyborg\|zzz joined	04:05
	→ Garen joined	04:05
	← yohnnyjoe left	04:06
	← dreiss left	04:08
	→ zumba_addict joined	04:09
	← CheckDavid left	04:11
	→ MatthewAllan9324 joined	04:13
	← MatthewAllan9324 left	04:15
	→ D630 joined	04:16
	← finalbeta left	04:17
	← D630 left	04:17
	→ finalbeta joined	04:17
	→ this joined	04:18
	← this left	04:18
	← finalbeta left	04:18
	→ finalbeta joined	04:19
	→ yoink20 joined	04:20
	← yoink20 left	04:21
	→ wpcarro joined	04:22
	→ notnull joined	04:23
	← notnull left	04:23
	→ notnull joined	04:23
	← gdibass left	04:24
	→ maestrojed joined	04:25
	← RuckusBringer left	04:26
	← wpcarro left	04:28
	← fmcgeough left	04:31
	→ Squarism joined	04:33
	→ Lyqyd joined	04:34
	→ ferdna joined	04:36
	← g00s left	04:41
	← zumba_addict left	04:41
	→ freimatz joined	04:45
	→ zumba_addict joined	04:46
	→ pawle joined	04:48
	→ fakenerd joined	04:51
	← orbyt_ left	04:52
	→ zumba_ad_ joined	04:52
	← kfoonamalik left	04:53
	← pawle left	04:55
	← zumba_addict left	04:55
	→ nic0x819 joined	04:55
	→ cfoch joined	04:59
	→ TheRuckus joined	05:00
	→ drupol joined	05:01
	→ pks_ joined	05:02
	← strugee left	05:02
	← pks left	05:02
	pks_ → pks	05:02
	← Alystair left	05:02
	← rishi` left	05:03
	→ rishi joined	05:04
	→ strugee joined	05:05
	← TheRuckus left	05:05
	→ kfoonamalik joined	05:06
	← Wetmelon left	05:07
	← Lyqyd left	05:07
	→ CheezWiz joined	05:08
	→ bsaboia joined	05:08
	→ Tobbi joined	05:13
	← CheezWiz left	05:15
	← zumba_ad_ left	05:16
	← bsaboia left	05:17
	→ up_here joined	05:18
	← netj left	05:18
	→ bsaboia joined	05:19
	→ netj joined	05:19
	→ BouncyKnightMike joined	05:19
	→ ckruczek joined	05:20
	→ \|DM\| joined	05:20
	← inovas left	05:21
	→ zumba_addict joined	05:21
	→ DMmd joined	05:23
	→ IRC-Source_1256 joined	05:25
	→ inovas joined	05:25
	← \|DM\| left	05:26
	← freimatz left	05:27
	→ muelleme joined	05:30
	→ soee joined	05:32
	← IRC-Source_1256 left	05:32
	→ IRC-Source_1256 joined	05:34
	→ keepLearning512 joined	05:35
	→ teodorg joined	05:35
	← maestrojed left	05:36
	→ subhojit777 joined	05:36
	→ schleppel joined	05:38
	← IRC-Source_1256 left	05:39
	← schleppel left	05:39
	→ sauvin joined	05:40
	→ schleppel joined	05:40
	← schleppel left	05:40
	← zumba_addict left	05:40
	→ schleppel joined	05:40
	→ zumba_addict joined	05:41
	← keepLearning512 left	05:42
	→ freimatz joined	05:42
	→ keepLearning512 joined	05:43
	← tmz left	05:44
	→ HelloWorld joined	05:46
	→ gareppa joined	05:48
	→ zumba_ad_ joined	05:48
	← zumba_addict left	05:49
	→ igemnace joined	05:51
	← dpyro left	05:53
	← muelleme left	05:53
	→ dpyro joined	05:53
	→ Raging_Hog joined	05:57
	← netj left	05:57
	→ netj joined	05:57
	→ dreiss joined	05:59
	→ zefferno joined	06:02
	← shicks_ left	06:04
	→ xeroks4 joined	06:05
	→ shicks_ joined	06:05
	→ greatgatsby_ joined	06:05
	→ tmz joined	06:05
	← zefferno left	06:06
	← greatgatsby left	06:06
	→ wandering_vagran joined	06:06
	← Bobdude left	06:06
	→ djb-irc joined	06:06
	← arecaceae left	06:07
	→ arecaceae joined	06:07
	→ wpcarro joined	06:08
	← ferdna left	06:08
	→ chele joined	06:08
	→ zefferno joined	06:08
	← tehp left	06:09
	← thiago left	06:10
	← tristanp left	06:10
	→ tehp joined	06:10
	← xeroks4 left	06:10
	← dansan left	06:10
	← kfoonamalik left	06:11
	← nevodka left	06:11
	→ tuxd00d joined	06:11
	→ nevodka joined	06:12
	← Oatmeal left	06:12
	← tehp left	06:13
	← wpcarro left	06:13
	→ ToBeFree joined	06:14
	← ToBeFree left	06:14
	→ ToBeFree joined	06:14
	gitinfo set mode: +v	06:14
	→ howdoi joined	06:14
	→ dansan joined	06:14
	→ ToBeCloud joined	06:15
	→ GreenJel_ joined	06:15
	gitinfo set mode: +v	06:15
	→ bsaboia_ joined	06:17
	← GreenJello left	06:17
	← ToBeFree left	06:17
	← bsaboia left	06:18
	→ PEG joined	06:23
j416	fowl: you can commit like normal when HEAD is detached, only that you won't have a branch to point to your new commit, making it harder to find should you check something else out, and also unreferenced, meaning it will be garbage collected after some time. It's mostly a good idea to commit while on a branch instead.	06:24
	→ lowbro joined	06:24
	← lowbro left	06:24
	→ lowbro joined	06:24
	→ Masplus joined	06:32
	← Tobbi left	06:33
	← nevodka left	06:35
	→ nevodka joined	06:35
	← dviola left	06:38
	→ mikemcowie joined	06:38
	→ tehp joined	06:42
	← dreiss left	06:42
	← bsaboia_ left	06:42
	← Muzer left	06:43
	→ Tobbi_ joined	06:43
	← lss8 left	06:44
	→ lss8 joined	06:45
	← mikemcowie left	06:45
	→ JeroenT joined	06:46
	← tehp left	06:47
	→ staafl_ joined	06:50
	← HelloWorld left	06:50
	→ wpcarro joined	06:51
	← zumba_ad_ left	06:51
	← vdamewood left	06:51
	← subhojit777 left	06:53
	→ HelloWorld joined	06:54
	→ Muzer joined	06:55
	← wpcarro left	06:55
	→ abba joined	06:59
	→ TheRuckus joined	07:02
	← gareppa left	07:04
	← TheRuckus left	07:06
	← Goplat left	07:07
	← cfoch left	07:09
	→ tomfarr joined	07:10
	→ czart_ joined	07:12
	← HelloWorld left	07:15
	← alcohol left	07:15
	→ bsaboia_ joined	07:16
	→ cur8or joined	07:17
	← Muzer left	07:19
	→ cur8or_ joined	07:20
	← cur8or left	07:21
	→ hakzsam joined	07:25
	← hakzsam left	07:25
	→ hakzsam joined	07:25
	← bsaboia_ left	07:30
	→ bsaboia joined	07:30
	→ Muzer joined	07:32
	← destiny left	07:33
	→ TheRuckus joined	07:34
	→ adac joined	07:34
	← MoziM left	07:35
	→ MoziM joined	07:36
	← TheRuckus left	07:39
	← marlinc left	07:39
	→ oxymoron93 joined	07:42
	← Defcronyke left	07:42
	→ Defcronyke joined	07:43
	← veegee left	07:43
	← keepLearning512 left	07:43
	← newnick left	07:44
	→ copchil joined	07:44
	→ newnick joined	07:44
	→ ferhaty joined	07:45
copchil	Hello! Small issue here: I have two branches: `master` (which is the production version) and `develop`. Now, say I have branch `X` which when I try to merge onto `develop` it says "already up to date". That's not true as I can't actually see the code changes on `develop`. Any ideas?	07:47
	→ marlinc joined	07:48
	← ismithers left	07:51
	→ floatleft joined	07:51
	← floatleft left	07:52
	← soee left	07:52
	→ duckgoose10 joined	07:53
	← duckgoose10 left	07:53
	← fatalhalt left	07:53
	→ tarkus joined	07:55
	→ HelloWorld joined	07:55
oxymoron93	copchil: more context is needed, as in, do you see changes on remote side or locally? what command did you run exactly? etc	07:56
	← Arcatech left	07:57
copchil	oxymoron93: I can't see the changes anywhere (neither locally or remote). I did: git checkout develop; git merge X	07:58
	and when I try to run the merge I get "Already up to date". It's like git thinks the changes are already there when they aren't	08:00
	← drupol left	08:01
	← HelloWorld left	08:01
	→ keepLearning512 joined	08:01
grawity	well, run `gitk` or `tig` on both develop and X and see what commits they both contain	08:02
	→ HelloWorld joined	08:02
	→ mikecmpbll joined	08:03
copchil	grawity: https://dpaste.de/A9gD that's the last commit on my branch. So that commit is on master, it changes that particular file, but that commit does not feature in the history of that file o.O	08:04
	→ soee joined	08:05
	→ T_UNIX joined	08:07
	→ dre_ joined	08:07
	→ mitigate joined	08:09
mitigate	if i do a shallow fetch on an old git repository will it still be able to use the earlier refs?	08:10
	→ tristanp joined	08:10
	← Muzer left	08:13
	→ mescalinum joined	08:13
mitigate	I have a git clone from 2016 from git.kernel.org. i want to generate a patch for from a torvalds-forks which is on github. so have to fetch a branch from github and fetch a branch from kernel.org and generate a diff. so i have to add a remote first? and then do two shallow fetches ? if the shallow fetch overwrites the ref, what happens to the history from before 2016	08:15
	← tristanp left	08:16
mitigate	teh point is to avoid gigabytes of storage and bandwidth on a guest box	08:16
	→ mikemcowie joined	08:16
oxymoron93	copchil: what would happen if you provide --all to the last command you ran ?	08:17
grawity	tbh, if you already have a 2016 clone, then I'm fairly sure a full fetch will be 500 MB max.	08:17
	→ Muzer joined	08:17
	→ soee_ joined	08:20
	← soee left	08:20
	→ tvw joined	08:21
	→ timj1 joined	08:23
	← timj left	08:24
	← j7k6 left	08:27
	→ j7k6 joined	08:28
	→ lanlink joined	08:28
	→ Silenced joined	08:32
	← keepLearning512 left	08:33
	← Silenced left	08:37
	→ nowhere_man joined	08:41
	← copchil left	08:44
	← ToBeCloud left	08:44
	→ wildermind joined	08:44
	← mikemcowie left	08:48
	→ _ADN_ joined	08:49
	→ mikemcowie joined	08:50
	← amirpro left	08:50
	← freimatz left	08:51
	→ wpcarro joined	08:52
	→ rsrx joined	08:53
	→ alcohol joined	08:58
	← wpcarro left	08:58
	← sentriz left	08:58
	→ sentriz joined	09:00
	→ nikio_ joined	09:02
	→ p3rs3us joined	09:02
	← dre_ left	09:05
	→ sockspls28 joined	09:06
	→ soee joined	09:07
	← soee_ left	09:07
	← cdown left	09:07
	← sockspls28 left	09:09
	→ shpoont joined	09:13
	← dsdeiz left	09:17
	← catsup left	09:18
	← hightower5 left	09:18
	→ keepLearning512 joined	09:18
	→ catsup joined	09:18
	← catsup left	09:19
	→ catsup joined	09:19
	→ amirpro joined	09:20
	← amirpro left	09:20
	→ czart__ joined	09:21
	→ amirpro joined	09:22
	← ckruczek left	09:22
	← czart_ left	09:24
	→ HelloDlrow joined	09:25
	→ ExeciN joined	09:26
mitigate	i have to try this later	09:27
	← mitigate left	09:27
	← HelloDlrow left	09:28
	→ KleinerMann joined	09:28
	→ screamineagle joined	09:28
	→ TheRuckus joined	09:29
	← KleinerMann left	09:30
	← HelloWorld left	09:31
screamineagle	Hi, is it possible to undo `git reset HEAD^`? Accidentally ran the command when I had changes in my working tree. I found a solution for `git reset HEAD~` but unsure if it is safe. HEAD~ and HEAD^ both refer to the parent of the last commit, right? So the solution for `git reset HEAD~` (`git reset ‘HEAD@{1}’`) should work?	09:32
grawity	reset to HEAD@{1}	09:32
	it works irrespective of what commit you are on or what commit you were on	09:33
	the point is that you moved from commit A to B	09:33
	→ DevAntoine joined	09:33
DevAntoine	Hi	09:33
	← TheRuckus left	09:34
screamineagle	grawity: whew.. thank you	09:34
DevAntoine	I've got a Jenkins multibranch pipeline checkouting the current branch. When Jenkins try to push a commit onto this branch I get the following error: fatal: The current branch release/1.0.0 has no upstream branch.	09:34
	I do have a "release/1.0.0" on the remote repo	09:35
oxymoron93	screamineagle: for future reference read man git reflog to see what is going on	09:35
gitinfo	screamineagle: the git-reflog manpage is available at https://gitirc.eu/git-reflog.html	09:35
GreenJel_	DevAntoine, e.g. git push origin release/1.0.0	09:35
screamineagle	thank you, will do	09:35
GreenJel_	DevAntoine, I'm not sure if you need the -u	09:35
DevAntoine	GreenJel_: "git push" isn't enough.	09:36
	?	09:36
	I've got another instance of Jenkins, with the same script, doing well with "git push" only, I'm confused.	09:36
GreenJel_	DevAntoine, nope, there isn't really a default remote to push to	09:36
DevAntoine	GreenJel_: why is it working on my other Jenkins' instance? What could differ?	09:37
GreenJel_	DevAntoine, depending on how you get to the branch, it might have a tracking branch	09:37
	DevAntoine, e.g. if you clone/pull, and branches you receive from the remote will be tracking that remote	09:37
DevAntoine	GreenJel_: it seems that in both case Jenkins does "git checkout -b release/1.0.0"	09:37
	→ discopatrick joined	09:37
	→ rafasc joined	09:39
GreenJel_	DevAntoine, generally `git checkout -b some-new-branch; git push` fails	09:39
	→ afuentes joined	09:39
GreenJel_	and -b some-existing-branch fails, so I'm not sure why the other project is working	09:40
	GreenJel_ → GreenJello	09:42
	→ zulutango joined	09:42
DevAntoine	GreenJello: yeah, I'm so confused oO	09:42
	← lankanmon left	09:44
	→ HelloWorld joined	09:44
	→ lankanmon joined	09:45
	← goweol1 left	09:46
	← amirpro left	09:47
DevAntoine	GreenJello: fatal: could not read Username for 'http://foo.bar.intra': No such device or address	09:48
	Gosh	09:48
	This make no sense. I just pulled from this remote oO	09:48
	← HelloWorld left	09:49
	→ HelloWorld joined	09:49
	← mikemcowie left	09:52
	← HelloWorld left	09:54
	→ bolovanos joined	09:54
	→ cdown joined	09:59
	→ rominronin joined	09:59
	← lankanmon left	10:01
	← screamineagle left	10:04
	→ dsdeiz joined	10:05
	← dsdeiz left	10:05
	→ dsdeiz joined	10:05
tobiasvl	DevAntoine: https?	10:06
	← MatthewAllan93 left	10:07
	→ MatthewAllan93 joined	10:07
	→ ljc joined	10:09
	← dsdeiz left	10:09
	← Kaisyu left	10:11
	← geekodour08 left	10:11
	→ nolfie joined	10:13
	→ CodeSlingerPaul joined	10:13
	→ geekodour08 joined	10:14
	→ HelloWorld joined	10:14
	← bsaboia left	10:14
	← keepLearning512 left	10:17
	→ wpcarro joined	10:17
	← HelloWorld left	10:19
	→ keepLearning512 joined	10:22
	→ jorrakay12 joined	10:22
	← wpcarro left	10:22
	→ bsaboia joined	10:25
	← BallChang-CN left	10:28
	← keepLearning512 left	10:28
	→ BallChang-CN joined	10:28
	← jorrakay12 left	10:29
	← geekodour08 left	10:29
	→ freimatz joined	10:29
	→ Anja_ joined	10:30
	→ bsanford joined	10:30
	← bsanford left	10:30
	← Anja left	10:30
	→ keepLearning512 joined	10:30
	← nowhere_man left	10:31
	→ nowhere_man joined	10:32
	→ plexigras joined	10:32
	→ geekodour08 joined	10:34
	→ tzo joined	10:37
	← nowhere_man left	10:42
	→ lankanmon joined	10:43
	← chris349 left	10:47
	→ dminuoso joined	10:48
dminuoso	Hi. I have two local repositories, what's the fastest way to get the dirty changes from one file in repo a into repo b?	10:48
pandem	copypaste	10:49
dminuoso	pandem: Yeah no.	10:49
	→ amirpro joined	10:49
dminuoso	Its a bit too much for that =)	10:49
grawity	(cd ~/foo && git diff -- myfile) \| (cd ~/bar && git apply)	10:49
pandem	if its a single file why not? that's fastest and easiest definitely	10:49
dminuoso	pandem: Because the other file has changes as well.	10:49
	grawity: Ah yes.. just create a patch - things could be so easy. Thanks.	10:50
	← nolfie left	10:50
	← amirpro left	10:51
	→ amirpro joined	10:51
	← shpoont left	10:52
	→ screamineagle joined	10:54
	→ nhandler28 joined	10:54
	← nhandler28 left	10:54
	← opal left	10:57
	← screamineagle left	10:57
	→ opal joined	10:57
	→ HelloWorld joined	10:58
	← HelloWorld left	10:58
	→ eduardas_m joined	11:00
	← keepLearning512 left	11:00
	← ljc left	11:02
	→ keepLearning512 joined	11:02
	→ chris349 joined	11:05
	← keepLearning512 left	11:08
	← zulutango left	11:08
	→ RyanKnack26 joined	11:11
	← RyanKnack26 left	11:13
	← bolovanos left	11:13
	→ bolovanos joined	11:14
	→ TheRuckus joined	11:17
	→ keepLearning512 joined	11:18
	→ Forlorn joined	11:18
	← Forlorn left	11:19
	← TheRuckus left	11:22
	← keepLearning512 left	11:23
	← rory_ left	11:28
	→ rory_ joined	11:28
	→ keepLearning512 joined	11:29
	← dpyro left	11:29
	rory_ → guest	11:29
	guest → rory	11:30
	← lanlink left	11:34
	→ elichai2 joined	11:37
	→ fakenerd_ joined	11:42
	→ Raed\|Laptop joined	11:42
	← fakenerd left	11:42
	← Anja_ left	11:44
	→ fakenerd joined	11:46
	← fakenerd_ left	11:47
	→ SerialSmile joined	11:49
	→ ferdna joined	11:52
	← Raed\|Laptop left	11:53
DevAntoine	tobiasvl: yes, that was it :\|	11:54
	← Masplus left	11:55
	→ fakenerd_ joined	11:57
	← fakenerd left	11:59
	→ Forlorn joined	12:00
	← rsrx left	12:00
	← igemnace left	12:02
	→ dsdeiz joined	12:06
	← dsdeiz left	12:06
	→ dsdeiz joined	12:06
	← Forlorn left	12:06
	← BallChang-CN left	12:07
	→ verm1n14 joined	12:10
	← dsdeiz left	12:10
	← fakenerd_ left	12:11
	→ cfoch joined	12:11
	← tomfarr left	12:13
	→ fakenerd joined	12:13
	← eduardas_m left	12:16
	← verm1n14 left	12:16
	→ wpcarro joined	12:19
	← howlymowly left	12:20
	→ rsrx joined	12:20
	← ski7777 left	12:22
	← wpcarro left	12:25
	→ wpcarro joined	12:26
	← keepLearning512 left	12:27
	→ Silenced joined	12:28
	← albel727 left	12:29
	← Silenced left	12:29
	← voiceftp left	12:30
	← wpcarro left	12:30
	→ BallChang-CN joined	12:31
	← leotaku left	12:31
	→ voiceftp joined	12:32
	→ sdwrage joined	12:32
	→ Silenced joined	12:33
	→ nkz joined	12:33
	→ lapinou joined	12:33
	→ eduardas_m joined	12:36
	← voiceftp left	12:36
	→ voiceftp joined	12:36
nkz	Hey. I just installed git and I set up the gitlab account. I made a sample hello world project. Now I want to start using git with my current java project I did in netbeans. But I don't want to simple commit whole folder which probably has bunch of unneded files. Is there a template or something for proper gitignore file? Like which things to add.	12:36
_ikke_	nkz: I think there are some lists hosted on github	12:37
	→ keepLearning512 joined	12:37
nkz	Basically asking for best practices, what do people usually commit and what do people usually ignore when they work in IDE.	12:37
	→ SheepMaester joined	12:37
_ikke_	https://github.com/github/gitignore	12:37
	→ fission6 joined	12:37
	→ izabera joined	12:38
izabera	hi	12:38
	halp meh	12:38
	→ voice_ftp joined	12:38
_ikke_	!just_ask	12:38
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	12:38
	← eduardas_m left	12:39
izabera	i often use git rebase -i HEAD~2	12:39
	then select the latest commit and mark it squash	12:39
	then remove its commit message	12:39
	what's the non interactive way to do it?	12:40
	← voice_ftp left	12:40
_ikke_	git reset --soft HEAD~; git commit --amend -C@	12:40
izabera	lemme try	12:40
	→ konquetty joined	12:41
izabera	i think i just need the last half	12:41
	what is @?	12:41
	← voiceftp left	12:41
	← keepLearning512 left	12:42
	→ muelleme joined	12:42
	→ keepLearning512 joined	12:42
izabera	works great, btw. thank you	12:43
	→ OvidiuS8 joined	12:43
oxymoron93	have you been in rebase process already? cause you need git reset --soft HEAD^ in order to remove last commit	12:43
_ikke_	izabera: @ is a shortcut for HEAD	12:44
	← konquetty left	12:44
izabera	oxymoron93: no i can just use add, then commit --amend -C@	12:44
	_ikke_: thank you very much	12:44
	← OvidiuS8 left	12:45
izabera	bye!	12:45
	← izabera left	12:45
	→ konquetty joined	12:46
	← muelleme left	12:46
	→ TheRuckus joined	12:47
konquetty	Hello! I'm wondering, when we clone a repository (in CLI) there's a progress percentage. Why is it calculated on the number of files transferred and not on the amount data?	12:49
	← ferhaty left	12:49
	← riemann left	12:53
	← notnull left	12:53
	← keepLearning512 left	12:55
	→ albel727 joined	12:55
grawity	hmm does the server know the amount of data upfront?	12:56
konquetty	let me try and clone something real quick just to make sure but I think it does know beforehand	12:57
	← TheRuckus left	12:58
	→ TheRuckus joined	12:59
konquetty	Maybe no. Git only shows the number of files (done/all) and the transfer rate.	12:59
grawity	I'm half-sure the server builds the full packfile	13:00
	← tzo left	13:01
	← konquetty left	13:02
	→ konquetty joined	13:02
	→ keepLearning512 joined	13:05
	← inovas left	13:05
	→ zumba_addict joined	13:06
	→ wpcarro joined	13:06
	→ Gurkenglas joined	13:07
	→ AndresInSpace joined	13:08
Gurkenglas	I want to report an issue to an IDE. How do I put the current state of my project folder in a separate branch without changing anything about what I have commited or changed in my current branch so I can link that new branch to them for issue reproduction?	13:08
	→ akshaykhobragade joined	13:08
akshaykhobragade	quit	13:08
	← akshaykhobragade left	13:09
	← albel727 left	13:09
tobiasvl	Gurkenglas: sorry, can you explain that one more time in other words? what do you want to do exactly	13:09
	"put the current state in a separate branch without changing anything about your current branch" <- changing what? what is your current state?	13:10
	can't you just create a new branch	13:10
	← keepLearning512 left	13:10
	← zumba_addict left	13:10
	← konquetty left	13:10
Gurkenglas	tobiasvl, I'm in a git project, I have uncommited changes. I encounter an issue with the IDE I'm using which is related to the contents of the project folder but not to git. I want to save the current folder, including uncommited changes, so they can reproduce the issue - but I don't want to commit these changes to what I'm actually working on yet.	13:11
	→ inovas joined	13:11
tobiasvl	aha	13:11
	→ fmcgeough joined	13:11
_ikke_	What prevents you from comitting it?	13:12
	← wpcarro left	13:12
	→ albel727 joined	13:12
_ikke_	A commit is a snapshot of your working directory, so the perfect mechanism to transfer this state	13:12
Gurkenglas	Can I make it a commit to the new branch without making it a commit in my actual branch?	13:12
_ikke_	git checkout -b new_branch; git commit; git checkout old_branch	13:13
Gurkenglas	Nice, thanks.	13:13
	→ dsdeiz joined	13:13
	← dsdeiz left	13:13
	→ dsdeiz joined	13:13
_ikke_	hmm	13:13
tobiasvl	well, you probably want to "undo" the commit again	13:13
_ikke_	yea	13:13
tobiasvl	Gurkenglas: commit, checkout new branch, checkout the old branch again, "git reset --soft HEAD^" to move everything you committed back to the index	13:13
	→ konquetty joined	13:13
Gurkenglas	...which of the two?	13:14
	Oh, three more lines above that last one. Okay, the latter.	13:14
tobiasvl	yeah, I think mine is what you want	13:14
	git commit; git checkout -b new_branch; git checkout old_branch; git reset --soft HEAD^	13:14
	→ aniarya82 joined	13:15
tobiasvl	I guess you can just do "git reset HEAD^" as the last step to make all the changes unstaged instead of changed	13:16
	--mixed is default	13:16
Gurkenglas	Oops, checking out the new branch again afterwards to push it to github was not so smart.	13:17
	→ ableto joined	13:17
tobiasvl	why not?	13:17
Gurkenglas	Because now the changes were discarded.	13:17
_ikke_	You don't need to checkout a branch in order to push it	13:17
	And the reset after checking out new_branch would reset the wrong commit	13:17
Gurkenglas	Using the VS Code interface :P	13:17
tobiasvl	discarded? how were they discarded? what did git say?	13:17
	→ keepLearning512 joined	13:17
tobiasvl	oh no, a !gui	13:17
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	13:17
Gurkenglas	Didn't reset on new_branch	13:18
tobiasvl	but you committed the changes, right? so they're not lost or anything	13:18
Gurkenglas	How do I transplant the commit from new_branch to old_branch so I can reset it again?	13:18
	-transplant+copy	13:18
	← ableto left	13:19
tobiasvl	Gurkenglas: git checkout old_branch; git cherry-pick new_branch; git reset HEAD^	13:19
	should do it	13:19
	if I understood the scenario correctly	13:19
Gurkenglas	thanks	13:19
	Hmm, the output was different because there wasn't a --soft, was that intended?	13:20
	→ ski7777 joined	13:20
tobiasvl	like I said above, the difference is just whether the changes were staged or not	13:22
	I hope	13:22
	→ squishythingy joined	13:23
	→ ShekharReddy joined	13:23
	← konquetty left	13:23
	← squishythingy left	13:24
	→ konquetty joined	13:24
Gurkenglas	(nothing was staged)	13:24
	→ pfleck joined	13:24
	← timj1 left	13:25
konquetty	Hey! If you're there, can you tell what 'object' is referred to in the 4th code sample at https://git-scm.com/book/en/v2/Git-Internals-Packfiles	13:25
oxymoron93	you can see info in snippet above	13:27
tobiasvl	konquetty: it's the blob for the new file that was added in the 2nd code sample	13:27
konquetty	so the object is the file ?	13:28
	← sdwrage left	13:29
	→ sdwrage joined	13:29
	→ wpcarro joined	13:30
	→ ZetFury joined	13:30
grawity	objects are git database entries; some of them contain a file	13:31
konquetty	@grawity got it	13:31
p3rs3us	hey guys, I am trying to get rid of a bad merge (with some huge files) into a branch (namely public) by using git reset --hard <okcommit>. But following this I still see the bad commits in the history, so the size of the repo is still huge. Could you let me know if you know of a way of getting rid of those bad commits, details in https://gist.github.com/ligerdev/75afa2ea2b955301a32937ab8bbedfb6	13:35
	← konquetty left	13:35
	← oxymoron93 left	13:35
	← jstimm left	13:37
	← zefferno left	13:38
	← aniarya82 left	13:40
	→ c_h_s joined	13:41
	→ zefferno joined	13:42
	→ Dougie187 joined	13:43
	← tsdh left	13:44
	→ neptune joined	13:46
	→ texasmynsted_ joined	13:46
	→ yohnnyjoe joined	13:47
	→ perrier-jouet joined	13:47
	→ malmalmal joined	13:47
	← neptune left	13:49
	← texasmynsted left	13:49
	→ stutter_ joined	13:50
	← yohnnyjoe left	13:52
	→ solarjoe4 joined	13:52
DelTree	how can I git ls-tree --name-only --full-tree master:foo/bar, without having it bark if bar doesn't exist ?	13:53
	← cur8or_ left	13:56
	← perrier-jouet left	13:56
DelTree	looks like git ls-tree --name-only --full-tree master:foo bar is better	13:57
	→ perrier-jouet joined	13:58
	→ thiago joined	13:58
	← cdown left	13:59
	→ MACscr\|lappy joined	14:01
	→ Masplus joined	14:01
	← Masplus left	14:01
	→ tristanp joined	14:02
	← fission6 left	14:04
	→ mricon joined	14:06
	← wpcarro left	14:07
	← ferdna left	14:07
	→ wpcarro joined	14:08
	← wpcarro left	14:08
	← MACscr\|lappy left	14:08
	← tuxd00d left	14:08
	→ wpcarro joined	14:08
mricon	are .keep packs safe to delete after the repo has been repacked with --pack-kept-objects?	14:08
	I have a couple that were created via what looks like receive-pack collisions	14:09
	→ __nd__ joined	14:10
	← bsaboia left	14:11
	→ vdamewood joined	14:11
	← solarjoe4 left	14:12
	→ ha73002 joined	14:12
Gurkenglas	Is there a command that undoes the last n git commands?	14:12
vdamewood	Gurkenglas: commands? Not really. What are you trying to do?	14:13
Dougie187	Gurkenglas: Kind of? But it depends on what the last n commands were. You can check out `man git reflog` and see what the last things you did were. And you can use `git reset` to reset to any of those points in time.	14:13
gitinfo	Gurkenglas: the git-reflog manpage is available at https://gitirc.eu/git-reflog.html	14:13
_ikke_	Gurkenglas: Do you want to also get rid of the changes introduced by those commits?	14:13
Gurkenglas	Well I did the usual "up-arrow, enter" to build my project except this time the last command was git reset HEAD^, so I googled around and did "git reset 'HEAD@{1}'", but the result didnt look right so I stashed everything and did git cherry-pick new_branch again, but then there were merge conflicts (!?) so I thought I'd delete the branch and check it out from new_branch again, but before I did that I thought that might go wrong in some other	14:15
	new, exciting way so I'd ask here first.	14:15
	← _nd_ left	14:15
_ikke_	!situation	14:15
gitinfo	Please post the url returned by `git log -n 20 --all --graph --format="%h %p %d %s" \| curl -F text=@- https://upaste.de/` 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)	14:15
Gurkenglas	https://upaste.de/5UN	14:16
	https://upaste.de/6Kg	14:17
	→ Gustavo6046 joined	14:18
	→ narendraj9 joined	14:20
	← cfoch left	14:20
	→ applecrumble joined	14:21
	← keepLearning512 left	14:22
	← chele left	14:31
	→ keepLearning512 joined	14:32
	← Raging_Hog left	14:32
	← nikio_ left	14:32
	← wpcarro left	14:33
	← keepLearning512 left	14:37
	→ tomfarr joined	14:38
	← nic0x819 left	14:38
	→ texasmynsted joined	14:41
	← Silenced left	14:41
	← Khisanth left	14:41
	← dsdeiz left	14:42
	→ keepLearning512 joined	14:42
	← texasmynsted_ left	14:44
	← matt8686 left	14:45
	← jhaenchen left	14:46
	← nkz left	14:47
	→ eduardas_m joined	14:49
	→ ShapeShifter499 joined	14:49
	← BouncyKnightMike left	14:49
	→ matt8686 joined	14:50
	→ Alystair joined	14:52
	→ jottr joined	14:52
	← ilmostro left	14:53
	← pfleck left	14:54
	→ Khisanth joined	14:54
	→ crose joined	14:55
	→ ilmostro joined	14:55
	→ beb-bot joined	14:56
jnewt	i popped a stash and got a conflict. what i want is the stashed file state to be put into the working directory and it just show the changes vs the current head. how do i get to that state?	14:56
thiago	do you want to discard the other changes you had to the file?	14:57
	← eduardas_m left	14:57
jnewt	i added the file and committed it, there were no changes in the working directory or index	14:58
	→ zumba_addict joined	14:58
jnewt	i don't know what i would be discarding	14:58
	← zumba_addict left	14:58
jnewt	should be nothing	14:59
	← abba left	14:59
	← ilmostro left	14:59
	→ igemnace joined	15:00
	← crose left	15:00
	← djb-irc left	15:01
	→ zumba_addict joined	15:01
	→ ilmostro joined	15:01
	→ spacesuitdiver joined	15:03
jnewt	am i discarding the last commit?	15:03
	← narendraj9 left	15:04
	→ Keygen joined	15:06
	→ greggerz joined	15:06
	← albel727 left	15:07
	← Keygen left	15:08
	← JeroenT left	15:08
	→ leeN joined	15:09
	→ jhaenchen joined	15:09
	dilfridge → \|	15:09
	\| → dilfridge	15:09
	← Xiti left	15:09
	→ fission6 joined	15:10
	→ pfleck joined	15:10
	← nevodka left	15:11
	→ nevodka joined	15:11
	← zumba_addict left	15:13
thiago	jnewt: you have conflicts because there are changes in the current commit that weren't there when you created the stash	15:14
	so ask yourself this: do you want to throw away those changes?	15:14
	if not, edit the file and fix the conflict manually.	15:14
	→ crose joined	15:15
	← adac left	15:17
jnewt	no, i don't. but i dont' want to lose anything from the stash either i want the stash changes to show in the working directory as changes not staged	15:18
	← quite left	15:19
malmalmal	Hi there. I have a bare remote repo on bluehost, with a post-receive hook that does a checkout -f to a live folder.	15:19
jnewt	and i want to understand why that's not the default behavior, or why you would want anything differently. you can always add the stashed changes anytime. but bungling up the file with all the <<<<< ===== >>>>> stuff just makes a mess.	15:19
	→ quite joined	15:19
malmalmal	lately I am getting a remote: fatal: unable to create threaded lstat when I push to that repo. The push seems to work, but not the post-receive.	15:20
	← pfleck left	15:20
	→ Silenced joined	15:21
malmalmal	I read around that that may be a resources problem on the server, and that I can perhaps fix it with git config core.preloadIndex false, I would like to understand what is this config option and why does that solve or may solve the problem, please, if you can help	15:21
	→ Xiti joined	15:21
	→ cdown joined	15:21
thiago	jnewt: because you did a stash pop. If it had succeeded, the stash would disappear.	15:22
	anyway, it can't apply the change. It has to create the conflict.	15:22
	← spacesuitdiver left	15:22
jnewt	oh, i see the problem, i want the file as it is in the stash. not the changes that are the stash.	15:23
malmalmal	I have to add that sshing into the remote server and running the post-receive works well, So I guess the problem is with doing push+checkout	15:23
thiago	git checkout stash -- file	15:23
	→ dev1 joined	15:23
jnewt	yup, now my head is right. thanks thiago	15:23
	← amirpro left	15:23
	← LiftLeft left	15:23
	← SheepMaester left	15:24
	→ ubuntuisloved joined	15:24
Gurkenglas	Imma try that branch delete then	15:24
	← modin left	15:25
	→ wpcarro joined	15:25
Gurkenglas	It doesnt want to delete :( https://upaste.de/DSw	15:26
	→ LiftLeft joined	15:26
Gurkenglas	(or to checkout away from that branch so i can delete)	15:26
	→ peepsalot joined	15:27
	→ modin joined	15:27
	← keepLearning512 left	15:27
	→ nolfie joined	15:27
Gurkenglas	(git reset --merge did it)	15:28
	← dev1 left	15:29
	→ spacesui_ joined	15:29
	← GreenJello left	15:29
	→ amirpro joined	15:30
	← amirpro left	15:31
Gurkenglas	branch delete and new checkout worked	15:31
	→ amirpro joined	15:31
	← wpcarro left	15:31
	→ YuGiOhJCJ joined	15:32
	→ keepLearning512 joined	15:34
	→ dsdeiz joined	15:34
	← dsdeiz left	15:34
	→ dsdeiz joined	15:34
	← LiftLeft left	15:35
	← Silenced left	15:35
	← keepLearning512 left	15:37
	← jhaenchen left	15:37
	← altendky left	15:37
	→ keepLearning512 joined	15:37
	→ jhaenchen joined	15:38
	← jhaenchen left	15:42
	← chris349 left	15:42
	← matt8686 left	15:44
	← lapinou left	15:44
	← soee left	15:46
	← madewokherd left	15:46
	← stutter_ left	15:46
	→ yohnnyjoe joined	15:47
	← fakenerd left	15:48
	→ sl4ck joined	15:48
	→ jhaenchen joined	15:51
	← yohnnyjoe left	15:52
	← netj left	15:53
	→ netj joined	15:54
	← keepLearning512 left	15:54
	→ matt8686 joined	15:55
	← Gustavo6046 left	15:55
	→ z]bandito joined	15:56
	← dminuoso left	15:57
	→ chris349 joined	15:58
	← watabou left	15:58
	← p3rs3us left	15:59
	→ stutter_ joined	15:59
	← z\|bandito left	15:59
	← lowbro left	16:00
	← fluxAeon_ left	16:00
	→ cagomez joined	16:01
	→ z\|bandito joined	16:02
	→ keepLearning512 joined	16:02
	← z]bandito left	16:03
	← up_here left	16:03
	← YuGiOhJCJ left	16:04
	→ LiftLeft joined	16:04
	→ YuGiOhJCJ joined	16:04
	→ wpcarro joined	16:06
	→ veegee joined	16:07
	→ durham joined	16:08
	→ g00s joined	16:09
ubuntuisloved	Is there a way to checkout a repo which has a submodule and have the submodule default to a branch?	16:10
	← ha73002 left	16:10
	→ Arcatech joined	16:11
	← wpcarro left	16:11
	→ r1fl joined	16:12
r1fl	gitlab	16:12
	halpppp	16:12
	← matt8686 left	16:13
r1fl	im trying to setup pages for a gitlab project under that is under a group	16:13
	no idea wtf is ci\cd	16:13
	→ Oatmeal joined	16:13
	← thiago left	16:14
ubuntuisloved	Nevermind figured it out	16:14
	→ kuerbo joined	16:14
	→ maestrojed joined	16:14
	→ madewokherd joined	16:15
	← ZetFury left	16:16
	→ wpcarro joined	16:17
	← MoziM left	16:17
	→ lapinou joined	16:17
	→ dreiss joined	16:22
	← wpcarro left	16:22
	→ fluxAeon_ joined	16:23
	← Tobbi_ left	16:25
	← brethil_ left	16:25
rafasc	r1fl: ci/cd refers to continuous development/integration	16:25
r1fl	yea	16:25
	i got that part	16:25
	i did the domain thing	16:25
	and enabled shared runners	16:25
	→ muelleme joined	16:26
r1fl	though im still getting a 404 when trying to access it	16:26
	← leah2 left	16:26
	→ tehp joined	16:27
	→ leah2 joined	16:27
	← freimatz left	16:28
	→ variable joined	16:28
	← jp left	16:28
	← keepLearning512 left	16:29
	← jottr left	16:29
	→ orbyt_ joined	16:30
	← DevAntoine left	16:30
rafasc	but ci/cd is somewhat unrelated to pages.	16:30
	→ sQVe joined	16:31
	← mikecmpbll left	16:31
	→ wpcarro joined	16:31
	← tehp left	16:31
	→ watabou joined	16:32
	→ cagomez_ joined	16:33
	← muelleme left	16:33
	→ Tux23 joined	16:33
	← cagomez left	16:34
	← strugee left	16:34
	← kuerbo left	16:34
rafasc	Or maybe they aren't in gitlab..	16:35
	← wpcarro left	16:35
	← orbyt_ left	16:37
	→ interface11 joined	16:38
	← Tux23 left	16:38
	← sdwrage left	16:38
	→ sdwrage joined	16:39
	← Arcatech left	16:40
	← foul_owl left	16:41
	→ gdibass joined	16:42
	→ jottr joined	16:42
	→ keepLearning512 joined	16:43
	← sdwrage left	16:44
	← sQVe left	16:45
	→ dege joined	16:46
	→ wpcarro joined	16:48
	← dreiss left	16:48
	← keepLearning512 left	16:48
	→ Tobbi joined	16:49
	→ Slumlord_1 joined	16:49
	← zefferno left	16:50
	← DMmd left	16:50
	→ freimatz joined	16:50
	← crose left	16:50
	→ jp joined	16:50
	← bolovanos left	16:51
	← Slumlord_1 left	16:52
	← peepsalot left	16:52
	→ foul_owl joined	16:54
	← wandering_vagran left	16:55
	→ keepLearning512 joined	16:55
	→ nowhere_man joined	16:56
	→ ash_work1i joined	16:56
	→ CountryNerd joined	16:57
	← ash_work1i left	16:58
	← greggerz left	16:58
	→ ash_worksi joined	16:59
ash_worksi	is there an interactive conflict resolution tool?	16:59
	(as part of git)	16:59
	→ sdwrage joined	16:59
	→ ash_work1i joined	17:00
	← ash_work1i left	17:00
	→ thiago joined	17:00
	← vdamewood left	17:01
	← jp left	17:04
	→ zumba_addict joined	17:04
	← rominronin left	17:04
	← supernovah left	17:06
	→ supernovah joined	17:06
	← YuGiOhJCJ left	17:06
	← igemnace left	17:07
tobiasvl	ash_worksi: interactive? not really, not sure how that would work. but there is man git mergetool	17:08
gitinfo	ash_worksi: the git-mergetool manpage is available at https://gitirc.eu/git-mergetool.html	17:08
	→ jp joined	17:08
tobiasvl	well, maybe that is what you mean by interactive	17:08
	→ fakenerd joined	17:09
	← jottr left	17:09
	← CountryNerd left	17:10
	← SerialSmile left	17:11
	← wpcarro left	17:13
	→ orbyt_ joined	17:14
	→ adac joined	17:15
	→ greggerz joined	17:16
	← cjkinni left	17:18
	← variable left	17:18
	← ski7777 left	17:18
	← _ADN_ left	17:18
	→ cjkinni joined	17:18
	← Tobbi left	17:19
	→ z1haze joined	17:20
z1haze	is there a command to check the head commit of a branch?	17:20
	← lapinou left	17:20
	← cjkinni left	17:20
	← TrentonDAdams left	17:21
	← ShekharReddy left	17:23
	← telnet left	17:23
	→ skisela joined	17:23
	← skisela left	17:23
	→ variable joined	17:24
	→ staafl__ joined	17:24
	← staafl__ left	17:24
	→ lapinou joined	17:24
	← armyriad left	17:24
_ikke_	z1haze: what do you want to check?	17:25
z1haze	I Want to see the head commit of this branch	17:25
ash_worksi	tobiasvl: thanks	17:25
	→ staafl__ joined	17:25
	→ timj joined	17:25
_ikke_	z1haze: git show <branch>	17:26
z1haze	ty	17:26
_ikke_	note that the branch always points to the 'head' commit	17:27
	→ raffo joined	17:28
	← LiftLeft left	17:29
	→ hrd_04 joined	17:29
	→ opalepatrick joined	17:29
	→ Silenced joined	17:31
	→ RuckusBringer joined	17:32
	→ Arcatech joined	17:32
	← zumba_addict left	17:33
	← TheRuckus left	17:33
	→ boombatower joined	17:33
	→ AnujSharma joined	17:33
	→ wpcarro joined	17:35
	→ ymdatta joined	17:35
	← opalepatrick left	17:36
	← teodorg left	17:37
	→ LiftLeft joined	17:41
	← maestrojed left	17:41
	→ m00sehead joined	17:41
	→ MACscr\|lappy joined	17:41
	← ymdatta left	17:42
	→ albel727 joined	17:43
	← nevodka left	17:45
	← hrd_04 left	17:45
	→ nevodka joined	17:46
	→ Arcaelyx joined	17:48
	→ yohnnyjoe joined	17:48
	← Arcaelyx left	17:48
	→ opalepatrick joined	17:49
	← MACscr\|lappy left	17:51
	← sl4ck left	17:52
	← yohnnyjoe left	17:53
r1fl	im trying to setup gitlab pages for a project that is under a group	17:53
	i did the domain thing	17:53
	← nevodka left	17:53
r1fl	and enabled shared runners	17:53
	and submitted a commit	17:53
	thought it still gives me a 404	17:53
	→ nevodka joined	17:53
	→ jamtom joined	17:54
	→ strugee joined	17:54
	→ ferdna joined	17:54
	→ MACscr\|lappy joined	17:54
	→ gitfaf joined	17:55
teward	r1fl: that should be in #gitlab, not here.	17:55
r1fl	yea	17:55
	its there for like to hours	17:55
	two	17:55
teward	patience is a virtue then.	17:55
	→ ski7777 joined	17:56
	→ TheRuckus joined	18:00
	← cdown left	18:01
	← gitfaf left	18:01
	← RuckusBringer left	18:03
	← TheRuckus left	18:04
	→ TheRuckus joined	18:04
	← TheRuckus left	18:05
	→ TheRuckus joined	18:05
	→ gitfaf joined	18:06
	→ Sasazuka joined	18:06
	← tvw left	18:06
	→ Anja joined	18:12
	→ dviola joined	18:15
	← MACscr\|lappy left	18:15
	← madewokherd left	18:15
	→ doubtful joined	18:16
	← greatgatsby_ left	18:16
	→ greatgatsby joined	18:17
	← Map left	18:19
	→ teodorg joined	18:20
	→ xinus_ joined	18:21
	→ samik joined	18:21
	← versatile left	18:22
	← c_h_s left	18:23
	← ilmostro left	18:24
samik	Is there a good workflow guide for small team of git-novices to start with git for their projects? Particularly focusing of merge conflict resolving?	18:25
	← TheRuckus left	18:25
	← shabius_ left	18:25
samik	They are undoing each others changes while merging, probably doing in wrong way	18:26
	← greatgatsby left	18:26
	→ RuckusBringer joined	18:27
	→ darkbit joined	18:27
	← sauvin left	18:27
	← rsrx left	18:28
	→ rosco_y joined	18:28
	← lapinou left	18:28
samik	To be precise, would it be good for each of them to submit patch to a reviewer who'll push changes in a temporary branch, test the build and then push the changes in master?	18:28
	instead of all of them pushing to it?	18:29
	→ dpyro joined	18:30
	← T_UNIX left	18:30
	→ ymdatta joined	18:31
	→ ZetFury joined	18:31
	← jamtom left	18:32
	→ greatgatsby joined	18:33
	← greggerz left	18:34
	→ runjutsu joined	18:34
	← darkbit left	18:36
	→ shabius joined	18:36
	← bket left	18:37
	← rosco_y left	18:38
	→ rsrx joined	18:38
	← stutter_ left	18:39
	→ stutter_ joined	18:40
	← netj left	18:41
	→ netj joined	18:41
	← greatgatsby left	18:41
	→ mfa29823 joined	18:41
	→ bket joined	18:42
	← mfa29823 left	18:42
	→ greggerz joined	18:43
	→ tankf33der joined	18:44
	→ greatgatsby joined	18:46
	→ madewokherd joined	18:47
j416	samik: Maybe, have each person work on their own branch (I can recommend namespacing with the persons name), so you'd end up with branches like "samik/feature-x". Then have a person responsible for merging those branches.	18:48
ymdatta	Hello all 0/	18:48
gitinfo	ymdatta: 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.	18:48
j416	samik: until they learn; and then when they feel comfortable, let them take on the role of merging, perhaps.	18:48
	← opalepatrick left	18:49
samik	so you mean local branches or pushed to central repo?	18:49
j416	pushed	18:49
samik	Okay	18:49
j416	we used to do it like this when we were a team with a handful of git novices	18:49
	it worked ok	18:50
samik	Good idea	18:50
j416	the downside is that inevitably people who are not the authors of changes are the ones who merge -- these people aren't necessarily qualified to fix potential merge conflicts. But then, having a git-competent person merge is perhaps better than your current situation, even if each author knows his/her code best.	18:51
	← ShapeShifter499 left	18:51
	← wpcarro left	18:52
	← sanscoeur left	18:52
	→ wpcarro joined	18:53
samik	Yes that was the catch, that's why I thought of them doing the merge and then submit a patch for that merge commit	18:53
	→ sanscoeur joined	18:53
j416	you can have them rebase their branch on the latest master (or what have you)	18:53
	that way you'll at least reduce the risk	18:53
	make sure to teach proper rebasing	18:54
	→ Johnjay joined	18:55
	← elichai2 left	18:55
Johnjay	question, a submodule is for some kind of external dependency that is tracked somewhere else?	18:55
	would git clone <> --recursive avoid having to type 'git submodule init; git submodule update' for those?	18:55
	← texasmynsted left	18:56
_ikke_	yes to both questions	18:56
Johnjay	ok thanks	18:57
	slightly weirder question	18:57
	if i start mixing git versions is that potentially bad?	18:57
_ikke_	shouldn't be	18:58
	except for some difference in behaviour they should be all compattible	18:58
Johnjay	ok. i ask because i have a cygwin environment on this windows machine and i may need to install the windows git	18:58
j416	samik: people-chemistry-wise it can also be tricky; while it'll be true that the person in charge of merging will be a gatekeeper of some sort, this can quite easily cause unhappy developers if enough care isn't taken. I'd recommend having a review process involving more than one person.	18:58
Johnjay	thanks _ikke_ you know your stuff!	18:58
	→ vdamewood joined	18:58
	→ peepsalot joined	18:59
_ikke_	Johnjay: I've been frequenting this channel for some time :)	18:59
j416	samik: and emphasise strongly that review is something they can learn from, rather than being some kind of code quality validation step	18:59
	→ emeraldemon joined	18:59
j416	samik: sorry if I'm answering more than you're asking about.	18:59
Johnjay	j416: is that like agile?	19:00
j416	what's agile	19:00
samik	j416, yes, the goal is to omit the reviewer eventually, can't hold a resource for that much long	19:00
j416	all these buzzwords	19:00
	samik: another take on it -- start mob programming	19:00
samik	What's that?	19:00
	Google?	19:01
Johnjay	j416: idk. i heard it involves teams that work together or something	19:01
j416	samik: google Woody Zuill; you'll find resources on mob programming.	19:01
Johnjay	oh there's a "manifesto" of it lol	19:02
	http://www.agilealliance.org/the-alliance/the-agile-manifesto/the-twelve-principles-of-agile-software/	19:02
	← inovas left	19:02
	→ saml joined	19:03
saml	how can I diff --name-only but omit deleted files?	19:03
j416	Johnjay: 404.	19:03
	saml: man git-diff look for --diff-filter	19:03
gitinfo	saml: the git-diff manpage is available at https://gitirc.eu/git-diff.html	19:03
saml	thanks	19:03
	→ Map joined	19:04
	Map → Guest25223	19:04
j416	samik: I can recommend finding a video where Woody explains the concept	19:05
samik	Whoa, crazy concept, never saw this :D	19:05
j416	even if you don't decide to try it, it's a waste not to know	19:05
	...about the concept.	19:06
samik	It's basically how we coded in dorms, in college projects	19:06
j416	:)	19:06
	we mob program every day.	19:06
	← wpcarro left	19:07
	→ wpcarro joined	19:07
	← fakenerd left	19:07
	← jhaenchen left	19:07
Johnjay	well so much for agile then	19:08
	→ AnSh joined	19:08
	→ inovas joined	19:08
	→ elichai2 joined	19:09
	← AnujSharma left	19:09
arooni	how can i be notified if theres a new release of a git project i'm following on github.	19:10
_ikke_	arooni: I don't think github supports that, have been looking for it as well	19:11
arooni	grrr	19:11
	would definitely be nice	19:11
_ikke_	Might be some way to do it through the API or so	19:11
thiago	join the project's announcement mailing list	19:11
	:-)	19:11
arooni	i dont want to get a bunch of emails	19:11
thiago	the announcement mailing list	19:11
arooni	i dont see that at least for https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-	19:12
Johnjay	maybe a shell script?	19:12
arooni	if i hadnt already been burned by building stuff on otheer peoples platform	19:12
	seems like a nice tool/site to build	19:12
Johnjay	git isn't telling me the % downloaded this submodule is	19:13
	can i do git -vvv?	19:14
	→ ilmostro joined	19:14
	→ maskedlua26 joined	19:14
	→ fakenerd joined	19:14
	← fmcgeough left	19:15
	← discopatrick left	19:16
	→ prepend joined	19:17
	← maskedlua26 left	19:18
	← Anja left	19:19
	← greggerz left	19:23
	← emeraldemon left	19:23
	→ Fuzzy_Panda joined	19:23
Johnjay	i'm not sure but i think it might have froze	19:23
	→ jtojnar joined	19:24
	← bket left	19:24
	→ bket joined	19:25
	→ ImageJPEG joined	19:26
Johnjay	crap	19:26
ImageJPEG	So how do I remove the make and config files from a git repo and have it synced like it is upstream?	19:27
Johnjay	git submodule update --verbose doesn't work	19:27
jtojnar	I lost power and my repo got corrupted and now I cannot checkout a remote branch: error: object file .git/objects/... is empty	19:29
	fatal: loose object ... (stored in .git/objects/...) is corrupt	19:29
	Is there a way I can re-fetch the object	19:29
	?	19:29
_ikke_	jtojnar: you'd have to manually download it	19:30
	or clone that project again to get the object	19:30
	← prepend left	19:30
thiago	ImageJPEG: what does git status say about those files?	19:31
	→ prepend joined	19:31
ImageJPEG	it says it's up to date but it has some files lingering around. like "configure" for example	19:31
	→ muelleme joined	19:31
thiago	does it say "untracked files" for them?	19:32
ImageJPEG	nope	19:32
thiago	what does it say?	19:32
	← Arcatech left	19:33
ImageJPEG	https://ghostbin.com/paste/t5hsy	19:33
	→ Arcatech joined	19:33
ImageJPEG	But I have extra files and folders from compilation that I want to rid of because the branch has been updated	19:33
	→ rosco_y joined	19:33
	→ ohcibi joined	19:33
thiago	git status --ignored	19:33
	are they listed now?	19:33
	← keepLearning512 left	19:34
ImageJPEG	https://ghostbin.com/paste/r7ka8	19:34
thiago	so, "yes" ?	19:35
ImageJPEG	yes lol	19:35
	← samik left	19:35
	→ brethil joined	19:35
thiago	there's nothing to be synced	19:35
	just delete those files	19:35
	git clean -x -f will do that for you	19:35
ImageJPEG	Thanks!	19:36
	I need to remember that	19:36
	← rosco_y left	19:36
j416	run 'git clean -x -n' first to make sure	19:37
	(dry-run)	19:37
	→ WeirdTolkienishF joined	19:38
	← stoopkid left	19:39
	→ keepLearning512 joined	19:39
	← ash_worksi left	19:41
	← gdibass left	19:41
	→ thebope joined	19:41
	→ jhaenchen joined	19:43
	← Arcatech left	19:43
	← ymdatta left	19:44
	← keepLearning512 left	19:45
	→ Regon joined	19:45
	← jhaenchen left	19:47
	← tarkus left	19:48
	→ dege_ joined	19:49
	→ yohnnyjoe joined	19:49
	← variable left	19:50
	← czart__ left	19:50
	← rsrx left	19:50
	← dege left	19:52
	← muelleme left	19:53
	→ crose joined	19:53
	← venb left	19:53
	← yohnnyjoe left	19:54
	dege_ → dege	19:55
	→ jilocasin joined	19:55
jilocasin	afternoon everyone. I seem to be stuck in a git rebase loop and was wondering if someone might be able to help.	19:57
_ikke_	!just_ask	19:57
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	19:57
	← crose left	19:57
jilocasin	git version 2.17.1: running git rebase -s resolve master. It finds a delted file and a bunch of conflicts, I manually fix them and add. after running git rebase --continue it tried to auto then simple then I'm back where I started with the same conflict markers in the same files that I just resolved. :(	20:00
Johnjay	is git-remote-https.exe supposed to show cpu or memory activity during a git submodule update operation?	20:01
	i ask because my connection is unreliable and i need to know if git has frozen trying to dl this 200MB submodule	20:01
	← Muzer left	20:01
_ikke_	That should not take this long	20:01
Johnjay	it does not show any progress indicator or any indication of activity	20:02
_ikke_	I would assume it got stuck	20:02
Johnjay	_ikke_: well i know now where git wanted to put the files so i could try manually i guess	20:02
	really disappointed at the lack of a progress bar or something	20:02
	← m00sehead left	20:08
	→ fatalhalt joined	20:08
	← staafl__ left	20:08
	→ Matrixiumn joined	20:08
	→ JollyRgrs20 joined	20:09
	← JollyRgrs20 left	20:10
	← Matrixiumn left	20:10
	← gitfaf left	20:11
	← Silenced left	20:11
	← thebope left	20:12
	→ venb joined	20:12
	← tomfarr left	20:12
	→ crose joined	20:12
	→ jnavila joined	20:13
	← nolfie left	20:15
	→ Muzer joined	20:16
jilocasin	any thoughts?	20:16
_ikke_	jilocasin: what does git status say	20:17
	← foul_owl left	20:18
jilocasin	_ikke_:same as it did before I manually fixed the conflicts. rebase in progress... a modified section in green, some both modified and a deleted by us file in red	20:18
	→ Tobbi joined	20:19
_ikke_	and when running rebase --continue, you don't get any error message or other message?	20:19
	→ jcjordyn12015 joined	20:20
jilocasin	_ikke_:I fix the conflicts, run git add <>, run git rebase --continue.	20:20
	← wpcarro left	20:20
	← WeirdTolkienishF left	20:20
	→ wpcarro joined	20:21
jilocasin	_ikke_:It then says trying simple merge, then Simple merge fialed, then Auto-merging, then a bunch of errors and I am back with the same list of files to resolve manually.	20:21
_ikke_	hmm, at that point it should not evey need to do a merge anymore (except for the next commit)	20:21
	← freimatz left	20:22
jilocasin	_ikke_:hence the loop. Fix files, run git rebase --continue, can't simple merge, can't auto merge, re-adds merge markers in the same files. rinse, lather, repeat.	20:22
	← wpcarro left	20:23
jilocasin	_ikke_: irony is that I don't even care what's in these particular junk files.	20:24
	→ wpcarro joined	20:24
	← jcjordyn12015 left	20:24
	→ _ADN_ joined	20:24
	← Muzer left	20:24
	← crose left	20:25
	← prepend left	20:25
	→ jhaenchen joined	20:25
_ikke_	jilocasin: But I'm confused why it's even trying to merge the same thing again	20:26
	jilocasin: might want to hit the mailing-list with this though	20:26
	jilocasin: what's the reason you are using resolve as the merge strategy?	20:27
jilocasin	_ikke:I don't know that's why I was hoping someone here might know.	20:27
	→ jottr joined	20:28
	← vdamewood left	20:29
	→ prepend joined	20:29
jilocasin	_ikke_:because when I try git rebase master (using the default recursive) it completly borks.	20:29
	_ikke_:it keeps claiming that files were deleted in one directory and renamed in another. They were deletd in one directory (in both branches) and were NOT renamed in another, they are just copies.	20:31
	_ikke_: "warning: inexact rename detection was skipped due to too many files."	20:32
	→ kes joined	20:32
	→ cdown joined	20:32
	→ keepLearning512 joined	20:33
	→ foul_owl joined	20:34
	← AnSh left	20:34
	→ Muzer joined	20:38
	← jottr left	20:41
	→ m00sehead joined	20:44
	← m00sehead left	20:45
	→ jottr joined	20:45
	→ m00sehead joined	20:47
	→ m0viefreak joined	20:48
	→ sl4ck joined	20:50
	→ staafl__ joined	20:52
	← _cyril_ left	20:52
	← beb-bot left	20:52
	← jilocasin left	20:52
	→ TripFandango joined	20:53
	→ _cyril_ joined	20:54
	→ MillerBoss18 joined	20:55
	matth1askrgr → matthiaskrgr	20:56
	← dviola left	20:57
	← MillerBoss18 left	20:57
	← strugee left	21:04
	→ durham_ joined	21:06
	← plexigras left	21:06
	← RuckusBringer left	21:08
	→ MuffinMedic26 joined	21:08
	← r1fl left	21:09
	← durham left	21:09
	← MuffinMedic26 left	21:11
	← wpcarro left	21:13
	← charlton left	21:13
	→ wpcarro joined	21:13
	→ charlton joined	21:14
	← ImageJPEG left	21:14
	← stutter_ left	21:14
	→ rsrx joined	21:14
	← Tobbi left	21:16
	→ mikecmpbll joined	21:18
	← Simonious left	21:23
	← adac left	21:25
	← sdwrage left	21:28
	→ tterrag joined	21:29
	← prepend left	21:29
	← schleppel left	21:30
	→ Arcatech joined	21:33
	→ thebope joined	21:33
	← dsdeiz left	21:33
	← jottr left	21:33
	→ navidr joined	21:34
	→ notnull joined	21:35
	← notnull left	21:35
	→ notnull joined	21:35
	← LiftLeft left	21:35
	← AndresInSpace left	21:35
	← mikecmpbll left	21:36
	← finalbeta left	21:37
	→ finalbeta joined	21:37
	→ Tobbi joined	21:38
	← troyt left	21:40
	→ troyt joined	21:40
z1haze	anyone know of a good channel to talk to people who write use bitbucket pipelines?	21:42
	→ LiftLeft joined	21:43
	→ Gustavo6046 joined	21:44
	→ ntqz joined	21:48
	← LiftLeft left	21:49
	→ Simonious joined	21:49
	← wpcarro left	21:50
	→ mikecmpbll joined	21:50
	← jnavila left	21:51
	← kes left	21:51
	→ isBEKaml joined	21:51
	← Gurkenglas left	21:52
	→ LiftLeft joined	21:53
	→ wpcarro joined	21:54
greatgatsby	#bitbucket?	21:55
	→ SilenceDogood joined	21:55
	← durham_ left	21:56
	← Dougie187 left	21:56
	→ durham joined	21:57
SilenceDogood	Something's driving me nuts. I have a folder called "TestResults which I want to include, but git keeps ignoring it. Check-ignore says it is in .gitignore:283 but that is a blank line in my .gitignore	21:57
	what gives	21:57
	→ HuskyApocalypse joined	21:57
greatgatsby	it's not empty is it? (only thing I can think of, git n00b here)	21:58
SilenceDogood	no, there are many folders inside it	21:59
	waaait ... maybe they're all empty too!?	21:59
	→ Anja joined	21:59
	→ LiftLeft2 joined	22:00
SilenceDogood	hahahahahahaha thats why its not there. there are zero files. just a bunch of folders. im an idiot. thanks greatgatsby!	22:00
	← SilenceDogood left	22:00
greatgatsby	I didn't want to insult your intelligence and ask if those subdirs have files :-)	22:00
	← durham left	22:01
	→ durham joined	22:01
	← LiftLeft left	22:02
	← z\|bandito left	22:03
	← dege left	22:04
	→ Gurkenglas joined	22:04
	→ NwS joined	22:05
	→ calcul0n21 joined	22:07
	→ dsdeiz joined	22:07
	← dsdeiz left	22:07
	→ dsdeiz joined	22:07
	← keepLearning512 left	22:07
	← fission6 left	22:10
	→ nahtnam joined	22:10
	← applecrumble left	22:10
	← runjutsu left	22:10
	← spacesui_ left	22:11
	→ bulletmark joined	22:11
	← dsdeiz left	22:11
	← calcul0n21 left	22:12
	← Arcatech left	22:14
	← teodorg left	22:14
	← pR0Ps_ left	22:17
	← afuentes left	22:17
	← wpcarro left	22:18
	→ wpcarro joined	22:18
	← durham left	22:18
	← HuskyApocalypse left	22:19
	→ durham joined	22:19
	→ pR0Ps joined	22:20
	→ HuskyApocalypse joined	22:21
	← wpcarro left	22:23
	← durham left	22:23
	→ durham joined	22:24
	← nowhere_man left	22:27
	← mikecmpbll left	22:27
	→ Enphuego joined	22:27
	← TinkerT left	22:27
	← HuskyApocalypse left	22:28
	→ TinkerT joined	22:29
	→ HuskyApocalypse joined	22:30
	← ilmostro left	22:32
	→ ilmostro joined	22:34
	← isBEKaml left	22:34
	→ syncretism_mbl joined	22:35
	→ TheRuckus joined	22:36
	← syncretism_mbl left	22:36
	→ justan0theruser joined	22:38
	→ RuckusBringer joined	22:39
	← justanotheruser left	22:39
	→ Xentinus joined	22:40
	← Xentinus left	22:40
	← TheRuckus left	22:40
	← Alystair left	22:41
	← orbyt_ left	22:47
	→ wpcarro joined	22:48
	← wpcarro left	22:49
	→ wpcarro joined	22:49
	← Tobbi left	22:52
	← wpcarro left	22:54
	→ quipa joined	22:54
	→ lapinou joined	22:55
	→ dsdeiz joined	22:55
	← dsdeiz left	22:55
	→ dsdeiz joined	22:55
	← HuskyApocalypse left	22:58
	kevr_ → kevr	22:58
	← Forty-3 left	23:00
	← dsdeiz left	23:00
	← Fuzzy_Panda left	23:00
	← Sasazuka left	23:01
	→ Sasazuka joined	23:02
	← finalbeta left	23:04
	← malmalmal left	23:05
	← peepsalot left	23:05
	→ dsdeiz joined	23:07
	← dsdeiz left	23:07
	→ dsdeiz joined	23:07
	← mmattice left	23:09
	← cliluw left	23:13
	→ cliluw joined	23:14
	→ cdown_ joined	23:15
	← elichai2 left	23:15
	→ Wetmelon joined	23:15
	← cdown left	23:17
	cdown_ → cdown	23:18
	← inovas left	23:18
	← quipa left	23:19
	← cliluw left	23:22
	→ cliluw joined	23:23
	→ yohnnyjoe joined	23:23
	→ inovas joined	23:25
	← Brain left	23:25
	→ [Brain] joined	23:26
	→ CheckDavid joined	23:27
	← dsdeiz left	23:28
	← yohnnyjoe left	23:28
	← jasmith left	23:28
	→ Brain joined	23:29
	← preisi left	23:29
	→ lanlink joined	23:29
	← TripFandango left	23:30
	→ durham_ joined	23:30
	← [Brain] left	23:30
	← jhaenchen left	23:31
	→ preisi joined	23:32
	→ jhaenchen joined	23:32
	← durham left	23:33
	← jhaenchen left	23:36
	← Brain left	23:37
	→ jhaenchen joined	23:39
	← lanlink left	23:39
	← leeN left	23:42
	ec_ → ec	23:43
	← rsrx left	23:45
	← notnull left	23:45
	→ gideon_s joined	23:45
	← ubuntuisloved left	23:46
	→ mmattice joined	23:47
	→ c_h_s joined	23:47
	← thiago left	23:47
	← gideon_s left	23:47
	← c_h_s left	23:47
	→ [Brain] joined	23:48
	→ gideon_s joined	23:48
	← jhaenchen left	23:48
	→ yohnnyjoe joined	23:49
Johnjay	ok i'm reading the git book	23:49
	is it possible to just completely ignore the github website	23:49
	and just push commits and such from the git command line or gui?	23:50
	like if i want to fork a project do i have to click the fork button on github or can i do it cmd line?	23:50
jim	do you have projects on github?	23:51
	→ RoriconKnight joined	23:51
	→ ismithers joined	23:51
Johnjay	not yet i just created my account	23:52
rewt	i think there's a command-line client for github, but !github	23:52
gitinfo	GitHub is a !3rdparty commercial service offering freemium !hosting services for repositories & projects. https://github.com/features	23:52
Johnjay	the git book is saying you fork the project, then use git cmd line to edit and such, then go back to github to submit the Pull request	23:53
rewt	!3rdparty	23:53
gitinfo	Your question is about a third-party tool or service, not a core `git` component. It is OK to ask, but replies are not guaranteed	23:53
Johnjay	github is considered 3rd party software to git?	23:53
rewt	yes, it's just a website that happens to use git under the hood	23:53
	no relation to git otherwise	23:54
Johnjay	ok	23:54
rewt	there's others like gitlab, bitbucket, etc that offer similar services	23:54
	← mescalinum left	23:54
	← [Brain] left	23:54
Johnjay	ah ok that makes sense	23:55
jim	yeah, I guess git was written first, then someone came up with github	23:57
	Johnjay, but what has you wanting to ignore github?	23:57
	Timvde\| → Timvde	23:58
	→ dviola joined	23:58
Johnjay	sometimes I use my raspi which crashes firefox constantly	23:58
	so i'd prefer not to have to use a browser if possible	23:58
	← profmac left	23:59
jim	do browsers like lynx work on github?	23:59

Logs Search ←Prev date Next date→

Channels Documentation