IRCloggy #git 2017-09-19

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-09-19
	← jrabe left	00:00
	→ jrabe joined	00:00
parsnip	/9/9	00:00
	← fahadash left	00:00
	← rorro left	00:04
	→ roelmonnens joined	00:05
	← steeze left	00:06
	→ a3Dman joined	00:07
	← ahr3n left	00:08
	← gugah left	00:09
	← roelmonnens left	00:09
	→ jeffripke joined	00:15
	← brent__ left	00:16
	→ mr_sm1th joined	00:17
	→ brent__ joined	00:18
	→ roelmonnens joined	00:19
	→ Guest3590 joined	00:19
	← a3Dman left	00:20
	← mikecmpbll left	00:21
	← nettoweb__ left	00:23
	→ bronson joined	00:23
	← acidjnk left	00:23
	← roelmonnens left	00:23
	← brent__ left	00:23
	← dreiss left	00:26
	← jeffripke left	00:26
	→ justanotheruser joined	00:27
	← bronson left	00:27
	→ a3Dman joined	00:28
	→ Tobbi joined	00:30
	→ ahr3n joined	00:33
	→ jeffripke joined	00:33
	→ watabou joined	00:34
	← evulish left	00:36
	← a3Dman left	00:36
	← mizu_no_oto left	00:37
	← jeffripke left	00:37
	← torshido left	00:38
	← rewt left	00:39
	← m0viefreak left	00:40
	→ josuedhg joined	00:41
	→ magicturtle joined	00:42
	→ renarc joined	00:42
	← Mattiaslndstrm left	00:43
	← Tobbi left	00:43
	→ mizu_no_oto joined	00:44
	← igemnace left	00:46
	→ surfist joined	00:46
	← iamthad left	00:46
	→ durham_ joined	00:46
	← cbonobo left	00:48
	← josuedhg left	00:48
	← durham left	00:50
	← Cabanossi left	00:50
	← Peppernrino left	00:50
	→ Cabanossi joined	00:51
	← durham_ left	00:51
	→ gugah joined	00:52
	→ durham joined	00:53
	→ igemnace joined	00:53
	← Gustavo6046 left	00:55
	→ iamthad joined	00:56
	→ jeffripke joined	00:58
	→ steeze joined	00:58
	← salamanderrake left	00:58
	← ti2 left	00:58
	← gugah left	00:59
	← CheckDavid left	00:59
	→ acidvegas joined	01:00
	→ gugah joined	01:00
	← acidvegas left	01:00
	← Sasazuka left	01:01
	→ acidvegas joined	01:01
	← iamthad left	01:01
acidvegas	<-	01:01
	→ iamthad joined	01:01
	← acidvegas left	01:02
	← jeffripke left	01:02
	← fuzzmz left	01:02
	→ venmx joined	01:03
	→ venmx_ joined	01:03
	→ Nizumzen joined	01:05
	← ArcaTech left	01:05
	→ finalbeta joined	01:06
	← d^sh left	01:06
	← venmx_ left	01:08
	← venmx left	01:08
	→ courrier___ joined	01:08
	← Nizumzen left	01:08
	→ d^sh joined	01:08
	← Oatmeal left	01:09
	→ fuzzmz joined	01:10
	← courrier__ left	01:11
	→ Mattiaslndstrm joined	01:11
	→ brent__ joined	01:13
	← svm_invictvs left	01:13
	← brent__ left	01:13
	→ brent__ joined	01:13
	→ ArcaTech joined	01:14
	→ rewt joined	01:16
	← justanotheruser left	01:18
	→ justanotheruser joined	01:18
	← brent__ left	01:19
	→ roelmonnens joined	01:20
	← Mattiaslndstrm left	01:20
	← rtjure left	01:21
	→ courrier____ joined	01:22
	← roelmonnens left	01:24
	← SideFX left	01:24
	← courrier___ left	01:25
	→ Locra joined	01:25
	← sunri5e left	01:25
	→ rtjure joined	01:26
	← Murr left	01:27
	← lb1c left	01:27
	→ Murr joined	01:27
	← mizu_no_oto left	01:30
	← tubaman left	01:30
	← gopar left	01:30
	→ lb1c joined	01:30
	← mr_sm1th left	01:31
	→ cdg joined	01:31
	→ sunri5e joined	01:31
	← Locra left	01:32
	→ joeco joined	01:32
	← durham left	01:33
	← Cabanossi left	01:34
	→ Kaisyu joined	01:35
	→ Cabanossi joined	01:36
	→ Mattiaslndstrm joined	01:37
	← Guest3590 left	01:38
	← tarkus left	01:41
	→ hfu joined	01:44
	→ durham joined	01:45
	← ilbot3 left	01:45
	→ Oatmeal joined	01:45
	← Mattiaslndstrm left	01:46
	→ hfu_ joined	01:47
	→ neightchan joined	01:48
	← hfu left	01:49
	→ xaxxon joined	01:51
	← str_ left	01:52
	→ cdown joined	01:54
	← hfu_ left	01:54
	→ ilbot3 joined	01:55
	← neightchan left	01:56
	→ nettoweb__ joined	01:57
	→ Mattiaslndstrm joined	01:57
	← ArcaTech left	02:01
	→ Peng_ joined	02:01
	→ evulish joined	02:01
	→ stutter joined	02:03
	← nettoweb__ left	02:03
	→ jeffripke joined	02:03
	← joeco left	02:06
	→ hfu joined	02:08
	← jeffripke left	02:12
	→ ForeignBiscuit joined	02:13
	← ForeignBiscuit left	02:13
	→ ForeignBiscuit joined	02:13
	← Mattiaslndstrm left	02:16
	← ResidentBiscuit left	02:16
	← peepsalot left	02:16
	dmc → pacman	02:18
	pacman → namcap	02:18
	→ mkali joined	02:18
	sangy → makepkg	02:18
	makepkg → sangy	02:19
	→ wxg joined	02:22
	→ Nizumzen joined	02:23
	→ bronson joined	02:23
	→ dunpeal joined	02:26
	← raijin left	02:26
dunpeal	Hey. On github, I approved a pull request, when it should instead be resolved as "request changes". Is there a way to switch the resolution?	02:27
rewt	that sounds more like a !github question	02:27
gitinfo	Note that github != git. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)	02:27
	← lafleurdubien left	02:28
dunpeal	rewt: yup, already asked there, seemed dead.	02:28
	← bronson left	02:28
dunpeal	FWIW, I believe the answer is "no", which is a bit strange.	02:28
	Since one could easily approve instead of reject a PR, and the implications are quite serious.	02:29
	easily *mistakenly	02:29
	← akushner___ left	02:32
	← vrishab left	02:33
	→ nettoweb__ joined	02:33
	← mkali left	02:33
	← nettoweb__ left	02:34
	namcap → dmc	02:34
	← gugah left	02:34
	← cdg left	02:35
	→ chachasmooth joined	02:35
	← chachasmooth_ left	02:35
	← surfist left	02:36
	← durham left	02:37
	→ lagothri1 joined	02:37
	→ Vortex35 joined	02:37
	dmc → git	02:39
	← lagothrix left	02:40
	→ durham joined	02:40
	← Vortex34 left	02:41
	→ jeffripke joined	02:43
	→ clickjack joined	02:45
	→ ArcaTech joined	02:46
	→ cdown_ joined	02:47
	← frsk left	02:48
	← Achylles left	02:49
	← cdown left	02:49
	cdown_ → cdown	02:49
	← jeffripke left	02:49
	← thinkdoge left	02:51
	→ raijin joined	02:52
	→ Guest51185 joined	02:52
	→ pijiu joined	02:53
	← jakogut_ left	02:53
	← durham left	02:55
	← wxg left	02:56
	← pks left	03:00
	← MACscr left	03:01
	→ brent__ joined	03:02
	→ venmx joined	03:04
	→ venmx_ joined	03:04
	→ pks joined	03:04
	→ Motoko joined	03:05
	→ CssNoOb joined	03:06
	← belmoussaoui left	03:07
	← CssNoOb left	03:07
	← brent__ left	03:07
	→ CssNoOb joined	03:07
	→ tunekey joined	03:08
	← CssNoOb left	03:08
	← venmx left	03:09
	→ safe joined	03:09
	→ CssNoOb joined	03:09
	← venmx_ left	03:09
	→ jeffreylevesque joined	03:11
	→ belmoussaoui joined	03:11
	← bongozig left	03:13
	→ TikityTik joined	03:15
	→ fstd_ joined	03:16
	← fstd left	03:16
	fstd_ → fstd	03:16
	→ magictits joined	03:18
	→ danslo joined	03:18
	← magicturtle left	03:19
	← MattMaker left	03:19
	→ MattMaker joined	03:20
	← ArcaTech left	03:21
	← hfu left	03:21
	← danslo left	03:23
	← Cumulo741 left	03:24
	← xaxxon left	03:24
	→ peepsalot joined	03:24
	→ orbyt_ joined	03:25
	→ akushner___ joined	03:26
	→ surfist joined	03:27
	← Murr left	03:27
	→ Murr joined	03:27
	→ Guest3590 joined	03:28
	→ courrier_____ joined	03:29
	→ sarbs joined	03:29
	→ hfu joined	03:32
	→ robotroll joined	03:32
	← courrier____ left	03:32
	→ nd- joined	03:32
	← Cabanossi left	03:34
	→ Cabanossi joined	03:35
	← Noldorin left	03:36
	← gableroux left	03:36
	→ vrishab joined	03:36
	← nd left	03:36
	→ gableroux joined	03:37
	← gableroux left	03:37
	→ howdoi joined	03:38
	← Guest51185 left	03:39
	→ h12o joined	03:41
	← hahuang65 left	03:44
	→ frsk joined	03:45
	← Guest3590 left	03:49
	→ svm_invictvs joined	03:51
	← robotroll left	03:53
	→ courrier______ joined	03:53
	← Elon_Satoshi left	03:56
	← CssNoOb left	03:56
	← courrier_____ left	03:57
	← clickjack left	03:57
	← h12o left	03:57
	→ Elon_Satoshi joined	03:59
	→ h12o joined	03:59
	← dsdeiz left	04:00
	→ dsdeiz joined	04:00
	← dsdeiz left	04:00
	→ dsdeiz joined	04:00
	← h12o left	04:01
	← svm_invictvs left	04:03
	→ roelmonnens joined	04:04
	→ courrier_______ joined	04:04
	→ jeffripke joined	04:05
	← courrier______ left	04:08
	← roelmonnens left	04:08
	→ e^1 joined	04:08
	→ h12o joined	04:08
	← hfu left	04:08
	→ robotroll joined	04:10
	← jeffripke left	04:11
	← h12o left	04:11
	← v4ult left	04:14
	→ h12o joined	04:15
	→ piremi joined	04:20
	← robotroll left	04:20
	← cdown left	04:22
	← h12o left	04:23
	→ hfu joined	04:23
	← dviola left	04:24
	→ bronson joined	04:25
	→ Guest3590 joined	04:25
	→ v4ult joined	04:27
	→ gableroux joined	04:29
	← basiclaser left	04:29
	→ cagomez joined	04:29
	← bronson left	04:29
_ikke_	dunpeal: You can also ask github support itself	04:30
	→ RandomUser4321 joined	04:31
	→ atesc joined	04:31
	← kculpis left	04:32
	→ ShekharReddy joined	04:32
dunpeal	_ikke_: yeah, maybe I should.	04:32
	← kaldoran left	04:32
	← renarc left	04:33
	← sim590 left	04:33
	← cagomez left	04:33
	← TikityTik left	04:33
	→ cdg joined	04:35
	← cagedwisdom left	04:36
	← RandomUser4321 left	04:36
	→ govg joined	04:37
	← Elon_Satoshi left	04:37
	← cdg left	04:40
	→ hahuang65 joined	04:41
	→ timofonic joined	04:43
timofonic	Hello	04:43
	→ Elon_Satoshi joined	04:43
	← dsdeiz left	04:43
	→ dsdeiz joined	04:43
	← dsdeiz left	04:43
	→ dsdeiz joined	04:43
timofonic	Anyone has idea about what may happen in this issue? I'm unable to copy the submodules there. Can anyone look at it? Please https://github.com/Argon-/mpv-config/issues/12	04:45
_ikke_	timofonic: Let me take a look	04:46
timofonic	_ikke_: Thanks!	04:46
	← hahuang65 left	04:46
	→ jceb joined	04:46
timofonic	_ikke_: Feel free to comment in GitHub too, I'm just a mere user with zero programming knowledge :P	04:47
	→ rkta_ joined	04:47
	→ justan0theruser joined	04:48
_ikke_	timofonic: I'm not familiar with that repo, so can you explain what is not working?	04:48
	← Cabanossi left	04:48
	→ cagedwisdom joined	04:48
	← justan0theruser left	04:49
_ikke_	timofonic: Are you saying that the submodules are not populated?	04:49
timofonic	_ikke_: Oh yes. The bold letters means those files are wrong in some reason. 1. empty directory. 2. Dead redirection	04:49
	← orbyt_ left	04:49
timofonic	_ikke_: Yes, that whay I mean...	04:49
	→ freimatz joined	04:50
_ikke_	ok	04:50
	→ justan0theruser joined	04:50
	← rkta left	04:50
	rkta_ → rkta	04:50
	→ ArcaTech joined	04:50
	→ Cabanossi joined	04:50
	→ svm_invictvs joined	04:50
	← justanotheruser left	04:50
	← Lyqyd left	04:51
	← sarbs left	04:51
_ikke_	timofonic: I see, the .gitmodules file is missing	04:51
	in the repo	04:51
	So git has no idea where to clone these repos from	04:51
	→ TikityTik joined	04:52
	→ fatihgenc joined	04:52
	→ Guest51185 joined	04:52
timofonic	_ikke_: So. I'm somewhat happy and unhappy it's not my fault. Would you like to reply about that? Please think about it. A dev will be more trustworthy than a random user :P	04:52
_ikke_	Yes, I'm about to do that	04:52
	→ Aeterne joined	04:53
_ikke_	done	04:54
	→ sim590 joined	04:55
	→ kaldoran joined	04:56
	← atesc left	04:58
parsnip	_ikke_: ooh, ledger-dashboard. is that mobile-friendly? shouldn't be too tricky to add a flask login i suppose.	04:58
	← Anja left	04:58
parsnip	oh, you're on #ledger	04:59
	→ hahuang65 joined	04:59
_ikke_	parsnip: It should be mobile friendly	04:59
	→ a3Dman joined	05:01
	← a3Dman left	05:01
	→ a3Dman joined	05:01
	← v4ult left	05:02
	← thierryp left	05:03
	→ thierryp joined	05:03
	← thierryp left	05:03
	← Elon_Satoshi left	05:04
	← Nizumzen left	05:04
	→ venmx joined	05:05
	→ venmx_ joined	05:05
	← pbandark left	05:07
	← a3Dman left	05:08
	→ cqi joined	05:08
	← venmx_ left	05:10
	← snowkidind left	05:10
	← venmx left	05:10
	→ Anja joined	05:12
	→ tarkus joined	05:12
	→ a3Dman joined	05:14
	→ roelmonnens joined	05:14
	→ ashpokemonZ joined	05:15
	→ Bock joined	05:17
	← TikityTik left	05:17
	← roelmonnens left	05:18
	→ Codaraxis joined	05:19
timofonic	_ikke_: Thanks a lot for your reply!	05:20
	→ renarc joined	05:20
	→ olga joined	05:22
	← igmp left	05:23
	← safe left	05:24
	→ justanotheruser joined	05:24
	← olalonde left	05:25
	← justan0theruser left	05:26
	← hfu left	05:27
	← Murr left	05:27
	→ imack joined	05:27
	→ Murr joined	05:27
	← freimatz left	05:28
	← justanotheruser left	05:29
	→ justanotheruser joined	05:30
	← al-damiri left	05:30
	← planigan left	05:31
	→ igmp joined	05:31
	← ahr3n left	05:32
	→ Solvaring joined	05:34
	→ lss8_ joined	05:35
	→ xaxxon joined	05:35
	← lss8 left	05:38
	→ hfu joined	05:38
	← dsdeiz left	05:39
	← edvb left	05:39
	← madewokherd left	05:40
	→ dsdeiz joined	05:40
	← dsdeiz left	05:40
	→ dsdeiz joined	05:40
	→ dre_ joined	05:40
	← timofonic left	05:41
hanna	I wonder if it's possible somehow to get a four-way “diff of diffs” after a rebase operation? Imagine you have `A` as the ancestor and `B` deriving from it, and somebody updates A to A'. You now rebase B ontop of A', resulting in B', and want to compare the `diff A B` against the `diff A' B'`. Right now it seems like the only way is to literally run those two commands, save the diffs to a file, and then	05:42
	compare them side-by-side or something. But I wonder if there's a more principled solution	05:42
	← Guest51185 left	05:42
	← rkta left	05:42
	← steeze left	05:42
hanna	if you just `diff B B'` you also get the changes from A vs A' in the diff output	05:42
	← dre_ left	05:43
	→ glad joined	05:44
	→ steeze joined	05:44
hanna	Since rebasing is such a common operation in a snapshot-based VCS like `git`, it's a useful operation to make sure your B' still has all of the changes of B after a conflicting rebase	05:45
	← steeze left	05:45
	→ planigan joined	05:46
	→ dege joined	05:48
	← Cabanossi left	05:48
	→ Cabanossi joined	05:50
	→ ThomasLocke joined	05:55
	← ThomasLocke left	05:55
	→ ThomasLocke joined	05:55
	→ freimatz joined	05:55
	→ courrier________ joined	05:57
	← courrier_______ left	06:01
	→ Raging_Hog joined	06:01
	← boombatower left	06:02
	→ venmx joined	06:03
	→ venmx_ joined	06:03
	← Raging_Hog left	06:05
	← ThomasLocke left	06:05
	← howdoi left	06:05
	← Peng_ left	06:05
	← Kaisyu left	06:05
	← xaa left	06:05
	← netj left	06:05
	← sphalerite left	06:05
	← alcohol left	06:05
	← SerusWork left	06:05
	← nydel09 left	06:05
	← kozy left	06:05
	← stoopkid__ left	06:05
	← catsup left	06:05
	← tazle_ left	06:05
	← Xiti left	06:05
	← matoro left	06:05
	← prg318 left	06:05
	← Nothing4You left	06:05
	← Kazuto left	06:05
	← Hello71 left	06:05
	← jimmyrcom left	06:05
	← nixdork left	06:05
	← Jackneilll left	06:05
	← raffo left	06:05
	← tchan left	06:05
	← torarne left	06:05
	← UncleCJ left	06:05
	← primeos[m] left	06:05
	← aidalgol left	06:05
	← Tee_Pee left	06:05
	← systmkor left	06:05
	← Peetz0r left	06:05
	← Olipro left	06:05
	← nellicus_ left	06:05
	← spacemud left	06:05
	← Eugene left	06:05
	← hagabaka left	06:05
	← rideh- left	06:05
	← nedbat left	06:05
	← mquin left	06:05
	← Kulrak left	06:05
	← aspiers left	06:05
	← sorenb left	06:05
	← i7c left	06:05
	← nioncode left	06:05
	← Ploppz left	06:05
	← brandonw left	06:05
	← babilen left	06:05
	← dmj` left	06:05
	← souther left	06:05
	← lukasdboer left	06:05
	← rebrec left	06:05
	← EvilJStoker left	06:05
	← pepijndevos left	06:05
	← diget left	06:05
	← singlerider left	06:05
	← thejoecarroll left	06:05
	← nopacienc3 left	06:05
	← mns left	06:05
	← dogmatic69 left	06:05
	← gkatsev left	06:05
	← wloncom left	06:05
	← Ownix left	06:05
	← Shayan-To left	06:05
	← AndrewGazelka left	06:05
	← Nickeeh left	06:05
	← argoneus left	06:05
	← pmn left	06:05
	← madknight left	06:05
	← kba left	06:05
	→ Learath2 joined	06:05
	→ Kazuto joined	06:05
	→ babilen joined	06:05
	→ spm_draget joined	06:05
	← Kazuto left	06:05
	→ Kazuto joined	06:05
	→ nixdork joined	06:05
	→ Nickeeh joined	06:05
	→ mns joined	06:05
	→ Peetz0r joined	06:05
	→ systmkor joined	06:05
	→ pmn joined	06:05
	→ Peng_ joined	06:05
	→ aspiers joined	06:05
	→ spb joined	06:05
	→ Nothing4You joined	06:05
	→ pepijndevos joined	06:05
	→ gkatsev joined	06:05
	→ rideh joined	06:05
	→ diget joined	06:05
	→ prg318 joined	06:05
	→ nellicus_ joined	06:05
	→ dogmatic69 joined	06:05
	→ errr_ joined	06:05
	→ wloncom joined	06:05
	→ lukasdboer joined	06:05
	→ raffo joined	06:05
	→ EvilJStoker joined	06:05
	→ Jackneilll joined	06:05
	→ nioncode joined	06:05
	→ biertie joined	06:05
	→ ahammond joined	06:05
	→ kba joined	06:05
	→ i7c joined	06:05
	→ mquin joined	06:05
	→ noahsussman joined	06:05
	→ janx joined	06:05
	→ spacemud joined	06:05
	→ thejoecarroll joined	06:06
	→ Shayan-To joined	06:06
	→ netj joined	06:06
	→ alcohol joined	06:06
	→ Olipro joined	06:06
	→ matoro joined	06:06
	→ brandonw joined	06:06
	→ SerusWork joined	06:06
	→ AndrewGazelka joined	06:06
	→ Hello71 joined	06:06
	→ Hobbyboy joined	06:06
	→ Ownix joined	06:06
	→ howdoi joined	06:06
	→ rfv joined	06:06
	→ Lowell joined	06:06
	→ barteks2x joined	06:06
	→ Kaisyu joined	06:06
	→ fcrick joined	06:06
	→ Eugene joined	06:06
	→ stoopkid__ joined	06:06
	→ ScalaWilliam joined	06:06
	→ Kulrak joined	06:06
	← Kulrak left	06:06
	→ Kulrak joined	06:06
	→ johtso joined	06:06
	→ dmj` joined	06:06
	→ AlexanderS joined	06:06
	→ voiceftp joined	06:06
	→ Tee_Pee joined	06:06
	→ rscata joined	06:06
	→ demize joined	06:07
	→ unholycrab joined	06:07
	→ Meow-J joined	06:07
	← hfu left	06:07
	← igemnace left	06:07
	→ Travis-42 joined	06:07
	← ashpokemonZ left	06:07
	→ jknetl joined	06:07
	← fuzzmz left	06:07
	← upperdeck left	06:07
	→ jeffripke joined	06:07
	← venmx_ left	06:08
	→ hfu joined	06:08
	← venmx left	06:08
	→ dec0n joined	06:08
	← Whisket left	06:08
	← dyce[m] left	06:08
	→ Cumulo741 joined	06:08
	← Demos[m] left	06:08
	← nappy[m] left	06:08
	← sunri5e left	06:08
	→ Whisket joined	06:08
	← olbat[m]1 left	06:09
	← swalladge[m] left	06:09
	← waltervargas[m] left	06:09
	← ushaNg6i[m] left	06:09
	← Techie[m] left	06:09
	← dreadful[m] left	06:09
	← reactormonk[m] left	06:09
	← am2on left	06:09
	← pvn[m] left	06:09
	← flo[m] left	06:09
	← Orbixx[m] left	06:09
	← monomon[m] left	06:09
	← colonelkrud[m] left	06:09
	← patrickr[m] left	06:09
	← Miguelngel[m] left	06:09
	← cverna left	06:09
	← JerkyMcJerkface[ left	06:09
	← sanday[m] left	06:09
	← hiq[m] left	06:09
	← Guest38326 left	06:09
	← yanbbyan left	06:09
	← aviraldg left	06:09
	← spinningarrow[m] left	06:09
	← aspiers[m] left	06:09
	← rigid left	06:09
	→ igemnace joined	06:09
	← horpoppy[m] left	06:09
	← abithvijayan[m] left	06:09
	→ ZyX-I joined	06:09
	← acme[m] left	06:09
	← Remramm left	06:09
	← dikiaap left	06:09
	← KevinMGranger left	06:09
	← unclechu left	06:09
osse	hanna: i usually do git log -p A B and git log -p A' B' side by side and eye-ball it. It's usually good enough. I've had patch sets maintained in git, and looking at the diff of a diff isn't easy :P	06:10
	← adamus1red left	06:10
	← maxorator left	06:10
	← pR0Ps left	06:10
	→ fuzzmz joined	06:10
	→ adamus1red joined	06:10
	→ grawity joined	06:10
	→ Raging_Hog joined	06:10
	→ ThomasLocke joined	06:10
	→ xaa joined	06:10
	→ nydel09 joined	06:10
	→ kozy joined	06:10
	→ catsup joined	06:10
	→ tazle_ joined	06:10
	→ Xiti joined	06:10
	→ jimmyrcom joined	06:10
	→ tchan joined	06:10
	→ hagabaka joined	06:10
	→ nedbat joined	06:10
	→ sorenb joined	06:10
	→ Ploppz joined	06:10
	→ nopacienc3 joined	06:10
	→ souther joined	06:10
	→ rebrec joined	06:10
	→ singlerider joined	06:10
	→ argoneus joined	06:10
	→ madknight joined	06:10
	→ ohcibi joined	06:10
	→ bittyx_ joined	06:10
	→ msev- joined	06:10
	→ LVK267 joined	06:10
	→ mani2 joined	06:10
	← stutter left	06:10
	← singlerider left	06:11
	← hagabaka left	06:11
	← kozy left	06:11
	← Xiti left	06:11
osse	hanna: you can also compare the patch-id (man git-patch-id) but it's a bit fickle	06:11
	← VladGh_ left	06:11
gitinfo	hanna: the git-patch-id manpage is available at https://gitirc.eu/git-patch-id.html	06:11
	← dhollinger left	06:11
	→ rigid joined	06:11
	← rigid left	06:11
	→ rigid joined	06:11
	→ voice_ftp joined	06:11
	→ Xiti joined	06:11
	→ hagabaka joined	06:11
	→ dhollinger joined	06:11
	← Motoko left	06:12
	→ maxorator joined	06:12
	← jeffripke left	06:12
	→ kozy joined	06:12
	→ singlerider joined	06:12
	← voice_ftp left	06:13
	← Guest3590 left	06:13
	→ brent__ joined	06:14
	→ sunri5e joined	06:14
	→ voice_ftp_ joined	06:14
	→ upperdeck joined	06:14
	→ JeroenT joined	06:14
	→ pR0Ps joined	06:15
	← tarkus left	06:15
	← voiceftp left	06:15
	→ jameser joined	06:16
	→ Guest3590 joined	06:17
	← brent__ left	06:18
	← acetakwas left	06:19
	→ zefferno joined	06:19
	→ Silmarilion joined	06:20
	→ CssNoOb joined	06:20
	→ roelmonnens joined	06:20
	→ sz0 joined	06:22
	→ ti2 joined	06:22
	← ArcaTech left	06:23
	→ dreiss joined	06:24
	→ opencw joined	06:25
	→ bronson joined	06:26
	→ chele joined	06:28
	← bronson left	06:30
	← courrier________ left	06:31
	→ courrier________ joined	06:31
	→ VladGh joined	06:32
	→ tkore joined	06:33
	← Cabanossi left	06:34
	← jceb left	06:34
	→ Cabanossi joined	06:35
	→ schleppel joined	06:38
	← cagedwisdom left	06:38
	← robinsmidsrod left	06:39
	→ robinsmidsrod joined	06:40
	← pyvpx_ left	06:42
	→ opalepatrick joined	06:42
	← jameser left	06:42
	← dreiss left	06:42
	→ luc4 joined	06:43
	→ thierryp joined	06:44
	→ wandering_vagran joined	06:45
	← Sleepy63 left	06:46
	→ Sleepy63 joined	06:46
	→ jameser joined	06:49
	← robinsmidsrod left	06:50
	→ cagedwisdom joined	06:51
	→ robinsmidsrod joined	06:51
	→ danslo joined	06:51
	← thiago left	06:54
	← ertes left	06:55
	← npgm left	06:58
	→ Chulbul joined	06:59
Chulbul	how to deal with line ending issue, my server is linux and I'm working on windows machine, out of no where, there are files which shows all file changes in git commit because of line ending issue. How can I get rid of this, please guide.	07:00
	→ elsevero joined	07:01
	← a3Dman left	07:02
	→ jceb joined	07:03
	→ MACscr joined	07:03
	← Aeterne left	07:04
	← luc4 left	07:05
	→ a3Dman joined	07:05
	→ roelmonn_ joined	07:06
	→ bybb joined	07:06
	→ luc4 joined	07:06
	← Cumulo741 left	07:07
	← CussBot left	07:07
	← hs366 left	07:07
	→ hs366 joined	07:08
	→ jeffripke joined	07:09
jast	Chulbul: !crlf	07:09
gitinfo	Chulbul: to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	07:09
	← roelmonnens left	07:09
	← elsevero left	07:09
	→ overlord_tm joined	07:11
	→ Nizumzen joined	07:12
	→ stylsi433 joined	07:13
	← jeffripke left	07:13
Chulbul	jast: Ok, let me check	07:15
	→ j08nY joined	07:15
	→ dabura667 joined	07:16
	← a3Dman left	07:18
	← Dick_Hammer left	07:18
	← jaggz left	07:19
	→ CussBot joined	07:19
	← dave0x6d left	07:19
	→ wissy joined	07:20
	← wissy left	07:20
Chulbul	jast: I treid git config --global core.autocrlf input from here https://help.github.com/articles/dealing-with-line-endings/#platform-linux but it didn't seem to work.	07:20
	And how to fix current file which shows all the changes? jast	07:20
jast	I don't recommend autocrlf, .gitattributes is a better approach because it's easier to propagate the settings to all people using the repo	07:20
	→ patrickr[m] joined	07:20
	→ a3Dman joined	07:21
jast	that said, if files have already been checked in with CRLF line endings (which isn't supposed to happen), both approaches will force you to re-commit affected files once	07:21
	← xaxxon left	07:22
	← BUSY left	07:22
jast	the difference is that when using .gitattributes and adding that to your repo, it's much more unlikely that the same thing will happen again. autocrlf depends on everyone activating that setting in their config. .gitattributes doesn't.	07:22
	← raijin left	07:23
	→ jaggz joined	07:23
	→ Darcidride joined	07:24
Chulbul	jast: Ok, so you mean if I use this method and try to commit, that affected file will automatically be commited with right changes. Right?	07:24
jast	yep	07:24
Chulbul	sounds good jast	07:24
jast	you'll have the "every line is changed" thing once, but there's no way around that	07:24
Chulbul	Ok	07:25
	Is there any command to create, .gitattributes file. Windows not allowing me to create this file directly?	07:25
	→ ertes-w joined	07:26
	← Murr left	07:27
	→ Murr joined	07:27
Chulbul	jast: I found it: type nul > .gitattributes	07:27
	← ZyX-I left	07:27
	→ jungsubk joined	07:27
	← bybb left	07:28
	→ Mement joined	07:28
jast	that's one way :) Windows can be a little picky sometimes with filenames	07:28
	→ bybb joined	07:28
	← hfu left	07:28
Mement	This is my .gitignore: https://pastebin.com/WEusEeTE - However, /pub/media/.htaccess is not excluded and I can not commit the file, but I can commit /pub/.htaccess. How can I exclude it?	07:29
Chulbul	jast: Hey, inside this file I just added: text eol=lf , that's it right?	07:29
jast	Chulbul: unless you want to force your checked out files to have LF endings on Windows, you don't need the "eol=lf" part	07:30
	and .gitattributes works on patterns, so you need to tell it which files should have which attributes	07:30
Chulbul	I want it to be LF, because code on github is with LF. jast	07:30
jast	the checked in code with always be LF if you use the 'text' attribute	07:31
	for instance, if you put this line: *.py text	07:31
	that activates conversion for all .py files. they'll always be converted to LF when checking in, and your checked out files will have the native line endings for your local OS	07:31
	← jungsubk left	07:32
jast	you can put a line for each pattern you want to activate conversion for (don't convert binary files like images, they'll break)	07:32
Chulbul	jast: Ok, I'm working in PHP, so I need to add *.php text eol=lf, right	07:32
jast	as I said, unless you need the checked out files to be LF, too, just '*.php text' is fine	07:33
	I don't know PHP that well. If PHP on Windows has issues with CRLF line endings, 'eol=lf' probably makes sense.	07:33
Chulbul	jast: but how to specify LF otherwise?	07:33
	yeah right	07:33
	thanks	07:33
jast	however, even without that, if you checkout the files on UNIX systems, they'll be converted to LF by default	07:34
	← stylsi433 left	07:34
jast	conversely, you may want to force CRLF on checked out files sometimes, e.g. for Windows batch files, so you can use 'eol=crlf' for those. the checked in version will still use LF, though.	07:35
	→ CheckDavid joined	07:35
	→ cdg joined	07:36
	→ mar77i_ joined	07:36
	→ hfu joined	07:36
	← mar77i left	07:37
	← cdg left	07:40
	→ King_Hual joined	07:41
	← King_Hual left	07:41
	→ King_Hual joined	07:41
	→ Dick_Hammer joined	07:41
	→ _ng joined	07:42
	← j08nY left	07:43
	← dsdeiz left	07:45
	→ dsdeiz joined	07:46
	← dsdeiz left	07:46
	→ dsdeiz joined	07:46
	← energizer left	07:48
	→ abba joined	07:49
	← danslo left	07:49
	← Dick_Hammer left	07:50
	← hs366 left	07:50
	→ hs366 joined	07:51
	← piremi left	07:51
	→ piremi joined	07:52
	→ danslo joined	07:53
	→ malmalmal joined	07:54
	→ aard_ joined	07:54
	← piremi left	07:54
	→ mikecmpbll joined	07:54
	→ Raed\|Mobile joined	07:55
	→ olbat[m] joined	07:55
	→ reactormonk[m] joined	07:55
	→ sanday[m] joined	07:55
	→ flo[m] joined	07:55
	→ cverna joined	07:55
	→ primeos[m] joined	07:55
	→ aspiers[m] joined	07:55
	→ UncleCJ joined	07:55
	→ nappy[m] joined	07:55
	→ spinningarrow[m] joined	07:55
	→ acme[m] joined	07:55
	→ hiq[m] joined	07:55
	→ dikiaap joined	07:55
	→ monomon[m] joined	07:55
	→ dyce[m] joined	07:55
	→ unclechu joined	07:55
	→ waltervargas[m] joined	07:55
	→ Demos[m] joined	07:55
	→ pvn[m] joined	07:55
	→ abithvijayan[m] joined	07:55
	→ Miguelngel[m] joined	07:55
	→ torarne joined	07:55
	→ horpoppy[m] joined	07:55
	→ Techie[m] joined	07:55
	→ aviraldg joined	07:55
	→ yanbbyan joined	07:55
	→ aidalgol joined	07:55
	→ Orbixx[m] joined	07:55
	→ sphalerite joined	07:55
	→ swalladge[m] joined	07:55
	→ dreadful[m] joined	07:55
	→ Guest3850 joined	07:55
	→ Remramm joined	07:55
	→ KevinMGranger joined	07:55
	→ am2on joined	07:55
	→ ushaNg6i[m] joined	07:56
	→ colonelkrud[m] joined	07:56
	→ JerkyMcJerkface[ joined	07:56
	← saulll left	07:57
	→ TheVice joined	07:57
	← TheVice left	08:00
	→ rorro joined	08:01
	← bybb left	08:03
	→ venmx joined	08:03
	→ venmx_ joined	08:03
	← sammyo left	08:04
	→ Dick_Hammer joined	08:04
	→ kurkale6ka joined	08:05
	← govg left	08:06
	→ kurkale61 joined	08:07
dcpc007	hi, to delete old commit useless (not pushed), can i git rebase -i and only remove thos 2 commit lines ?	08:07
parsnip	yes	08:07
dcpc007	ok, think it was more complicated ... i have a supervision with night auto-commit	08:08
	and 2 days ago it add a temp file ...	08:08
	and yesterday i delete the file .. and another auto-commit :)))	08:08
	not really usefull in history	08:08
	→ dimi1947 joined	08:08
	← venmx_ left	08:08
	← venmx left	08:08
dcpc007	(i should show this to my svn dev :) )	08:09
	← lb1c left	08:09
	→ pbandark joined	08:09
	← kurkale6ka left	08:09
	→ lb1c joined	08:10
parsnip	oh, i read that as "remove those two commits", might still be yes, but i have to imagine it now.	08:10
	how many commits is this temp file in?	08:11
	er, one commit commited the file?	08:11
dcpc007	HEAD~4 = add temp and HEAD~2 = delete	08:12
	→ acidjnk joined	08:12
dcpc007	then i rebase -i HEAD~5 and remove lines	08:12
	nothing more in the commits	08:12
	i already split other stuf	08:12
parsnip	and those commits don't add anything else?	08:12
	ah, nice	08:13
dcpc007	i love git log --stats	08:13
	git log --stat (-s)	08:13
	→ masuberu joined	08:14
	← magictits left	08:15
	→ magictits joined	08:15
	→ mescalinum joined	08:16
	← ejsf left	08:16
	→ jsears joined	08:16
	← ahrs left	08:17
	← CssNoOb left	08:17
	→ ahrs joined	08:18
	→ Floflobel joined	08:18
	← masuberu left	08:20
	→ BUSY joined	08:20
	← sword left	08:20
	← dimi1947 left	08:21
zxd	hey, if git add -A . adds subdirectories that are git repositories ( with .git ) as submodule should it not create a .gitmodules file ?	08:24
	→ rokups joined	08:25
	→ bronson joined	08:27
	← Noodlewitt left	08:27
	← nedbat left	08:28
	→ brent__ joined	08:30
	→ dre_ joined	08:31
	← sz0 left	08:31
	← bronson left	08:32
	→ migueltorrescost joined	08:33
	← guardian left	08:34
	← migueltorrescost left	08:34
	← brent__ left	08:34
	kurkale61 → kurkale6ka	08:34
	← PaulCapestany left	08:35
	→ guardian joined	08:36
	→ Vortex34 joined	08:37
	← Vortex35 left	08:38
zxd	"git submodule init to initialize your local configuration file, and git submodule update to fetch all the data from that project and check out the appropriate commit listed in your superproject:" how do I see what commit is in the superproject	08:38
	→ exxi joined	08:39
exxi	when i am clonning a repo, all the branches are also clonned ? or only the master branch ?	08:39
selckin	all	08:40
	→ nedbat joined	08:40
exxi	selckin, cool	08:40
	← hfu left	08:41
	→ cstratak joined	08:42
	→ achadwick joined	08:42
	→ TomyWork joined	08:43
	→ baxx joined	08:44
	→ r4w joined	08:45
	← Solvaring left	08:46
	→ hfu joined	08:49
	→ SteffanW joined	08:50
	git → namcap	08:51
	→ murii joined	08:51
	→ JeroenT_ joined	08:52
	← r4w left	08:52
	→ cagomez joined	08:53
	→ czart_ joined	08:54
	← hfu left	08:54
	← JeroenT_ left	08:54
	→ hfu joined	08:55
	→ JeroenT_ joined	08:55
	← freimatz left	08:55
	← fatalhalt left	08:55
	← JeroenT left	08:56
	→ D630 joined	08:56
	← czart__ left	08:57
	← cagomez left	08:58
	← JeroenT_ left	08:59
	→ JeroenT joined	08:59
	→ manuelschneid3r joined	09:00
	← cqi left	09:02
	← luc4 left	09:03
	← jknetl left	09:04
	→ phinxy joined	09:04
	← phinxy left	09:05
	→ luc4 joined	09:07
gurrkiin	are 'git reset' and 'git reset --soft' the same?	09:09
	← JeroenT left	09:09
	→ jeffripke joined	09:10
_ikke_	gurrkiin: no, git reset == git reset --mixed	09:10
gurrkiin	yeah I actually just saw this part in the docs!	09:10
jast	gurrkiin: no. no option is the same as --mixed. the difference between --mixed and --soft is that --mixed resets the index and --soft doesn't.	09:10
gurrkiin	what exactly is the index?	09:11
jast	a.k.a. staging area	09:11
	i.e. reset --mixed unstages all changes	09:11
gurrkiin	what does git reset --soft do then?	09:11
jast	without any extra arguments, nothing :)	09:11
_ikke_	It only touches branches	09:11
gurrkiin	ah okay	09:12
_ikke_	git reset --soft HEAD~ moves the current branch back one commit, but the changes remain staged	09:12
	← Guest3590 left	09:12
jast	reset changes what the current branch points to, but it defaults to HEAD (which resolves to the current commit, so it's a no-op)	09:12
	resetting to an old commit makes the newer commits disappear, and then --mixed and --soft do make a difference	09:13
	→ cagomez joined	09:13
jast	--hard = reset to old commit and update working tree and index to match	09:13
	--mixed = reset to old commit and update index to match but leave your current working tree	09:13
zxd	did they remove the --recursive option to git clone ? I don't see it in https://git-scm.com/docs/git-clone	09:14
jast	--soft = reset to old commit but leave working tree and index alone	09:14
gurrkiin	would (--soft HEAD~) be a good idea for amending a commit	09:14
	it almost seems like a hack	09:14
	← jeffripke left	09:14
gurrkiin	instead of rebasing	09:14
tobiasvl	zxd: did it ever exist? do you mean --recurse-submodules ?	09:14
jast	zxd: --recurse-submodules	09:14
	gurrkiin: you could do that, but for amending the topmost commit you can just use 'git commit --amend' instead :)	09:15
gurrkiin	Ah, I thought that was just for the message	09:15
	good to know!	09:15
jast	no, it will use your current index, too	09:15
	if you haven't staged anything new, that's basically the same as before	09:16
zxd	it did exist :)	09:17
	→ jknetl joined	09:17
	← cagomez left	09:17
	← D630 left	09:17
	→ mkali joined	09:18
	→ JeroenT joined	09:18
	← JeroenT left	09:18
jast	zxd: it's no longer documented because it's a little vague, but still works	09:19
	→ JeroenT joined	09:19
	→ kurkale61 joined	09:19
zxd	jast: it behaves the same it seems	09:20
	same thing	09:20
jast	yeah	09:20
	← kurkale6ka left	09:20
jast	--recursive was hidden in favour of --recurse-submodules because people thought the original name wasn't descriptive enough, but it's still accepted as an alias	09:21
_ikke_	mostly to not break scripts I guess	09:22
	← SkyPatrol_ left	09:23
jast	or people's habits :)	09:23
	→ gxt joined	09:23
zxd	is there a way to automatically git clone --recurse-submodules and checkout master branch to track each submodule automatically?	09:24
	instead of having to cd to the submodule dir and git checkout master	09:25
	→ SkyPatrol joined	09:25
	← dabura667 left	09:25
zxd	ah there is foreach	09:25
	here is a foreach submodule command to run some arbitrary command in each submodule.	09:25
	← guardian left	09:26
	← onla left	09:27
	← Mement left	09:28
	→ kurkale6ka joined	09:28
	← sergio left	09:29
	→ ppang joined	09:30
	← svm_invictvs left	09:30
	→ Tobbi joined	09:30
	← olivetree_ left	09:30
	← kurkale61 left	09:31
	→ guardian joined	09:31
	→ chll_ joined	09:37
	← JeroenT left	09:38
	→ ferr joined	09:39
	← hfu left	09:40
	→ hfu joined	09:40
	← malmalmal left	09:41
	→ JeroenT joined	09:42
	→ cdg joined	09:43
	← Timvde left	09:44
	← mkali left	09:44
	→ cdg_ joined	09:45
	→ cdg__ joined	09:46
	→ swift1 joined	09:47
	→ PaulCapestany joined	09:48
	← cdg left	09:48
	← Cabanossi left	09:48
	→ Timvde joined	09:49
	← cdg_ left	09:50
	→ Cabanossi joined	09:50
	← cdg__ left	09:50
	→ venmx joined	09:52
	→ venmx_ joined	09:52
	← Raging_Hog left	09:54
	→ Raging_Hog joined	09:54
	→ hfu_ joined	09:55
	→ cdg joined	09:57
	← hfu left	09:57
	→ cdg_ joined	09:59
	← hfu_ left	10:00
	→ cdg__ joined	10:01
	← cdg left	10:01
	→ chrfle joined	10:01
	← chrfle left	10:01
	→ chrfle joined	10:01
	→ freimatz joined	10:01
	← JeroenT left	10:02
	← jknetl left	10:02
	← chrfle- left	10:03
	← exxi left	10:04
	→ exxi joined	10:04
	← cdg_ left	10:04
	← exxi left	10:04
	→ exxi joined	10:04
	→ JeroenT joined	10:05
	← cdg__ left	10:05
	→ nettoweb__ joined	10:06
	← nettoweb__ left	10:11
	← JeroenT left	10:11
	← guardian left	10:11
	→ jeffripke joined	10:11
	← in1t3r_ left	10:12
	→ czart joined	10:12
	← jsears left	10:12
	← roelmonn_ left	10:13
	← czart_ left	10:13
	→ roelmonnens joined	10:13
	← roelmonnens left	10:14
	→ guardian joined	10:14
	→ roelmonnens joined	10:14
	← jeffripke left	10:16
	→ jknetl joined	10:16
	← a3Dman left	10:16
	→ Guest3590 joined	10:17
	→ olivetree_ joined	10:18
	← Spydar007 left	10:19
	→ masuberu joined	10:21
	← Guest3590 left	10:21
	← King_Hual left	10:24
	← sarri left	10:24
	← matumbo left	10:25
	→ a3Dman joined	10:25
	→ sarri joined	10:27
	← sarri left	10:27
	→ sarri joined	10:27
	← e^1 left	10:28
	← exxi left	10:29
	→ Spydar007 joined	10:29
	→ freddieptf joined	10:30
	→ exxi joined	10:32
	← exxi left	10:32
	→ exxi joined	10:32
	→ e^1 joined	10:32
	← Cabanossi left	10:33
	→ sarp joined	10:34
	→ Cabanossi joined	10:35
	← jimmyrcom_ left	10:37
	→ piremi joined	10:40
	← masuberu left	10:41
	← mescalinum left	10:42
	→ JeroenT joined	10:44
	← jeffreylevesque left	10:44
	← piremi left	10:44
	→ dimi1947 joined	10:46
	← opencw left	10:46
	← sarp left	10:46
	→ theoceaniscool joined	10:47
	← danslo left	10:47
	← jameser left	10:47
	← troyt left	10:49
	→ PHPanos joined	10:49
	→ opencw joined	10:50
	→ troyt joined	10:51
	→ in1t3r_ joined	10:51
	→ mescalinum joined	10:51
	→ danslo joined	10:52
	← raynold left	10:53
	← SteffanW left	10:55
	→ Borg- joined	10:56
	gitinfo set mode: +v	10:56
	← dimi1947 left	10:58
	→ TheVice joined	10:59
	← enkrypt left	11:00
	← hfp_work left	11:01
	→ roelmonn_ joined	11:01
	← in1t3r_ left	11:02
	→ sarp joined	11:03
	→ enkrypt joined	11:03
	← Cabanossi left	11:03
	← roelmonnens left	11:05
	→ Cabanossi joined	11:05
	→ hfp_work joined	11:06
	→ bongozig joined	11:06
	→ zaccanasta joined	11:09
	→ sz0 joined	11:09
	→ piremi joined	11:09
	→ jsears joined	11:09
	→ dave0x6d joined	11:14
zaccanasta	so I formatted all my project files with clang-format. After commiting I saw git copied an .h files to a different one in a different location. Something like copy src/{AAAA/xxx.h => BBBB/yyyy.h}	11:14
	problem is yyyy.h is the same file as before, just reformatted	11:15
	what's the meaning of that copy?	11:15
	→ bruce_lee joined	11:16
	← bruce_lee left	11:16
	→ bruce_lee joined	11:16
osse	zaccanasta: is there still a file at the old path ?	11:16
zaccanasta	yeah all files are fine, project builds ok	11:17
osse	so it is a copy, then?	11:17
	← rorro left	11:17
zaccanasta	for me it meand xxxx.h replaces yyyy.h	11:17
	*means	11:17
	→ southernirc joined	11:18
osse	but does both xxxx.h and yyyy.h exist at the moment ?	11:18
zaccanasta	they do	11:18
osse	so what's the confusion ?	11:18
zaccanasta	I diffed with masters, they are just formatted differentely by clang-format	11:19
	← gableroux left	11:19
osse	does the diff also include a deletion ?	11:19
zaccanasta	my confusion is git output showed xxxx.h copied to yyyy.h	11:19
	← AfroThundr left	11:19
zaccanasta	no deletions, some files have been rewritten, this one has been copied to enother location	11:20
	but everything seems ok	11:20
osse	this is all a heuristic, and maybe that fails in this case... Git thinks you've copied one file, since two files are so similar	11:21
	no big deal	11:21
zaccanasta	but they are very different and in different directories	11:21
	← ski7777 left	11:21
zaccanasta	and the copy didn't actually happen	11:22
	anyway, just my curiosity	11:22
	→ zulutango joined	11:22
osse	if you run git diff --no-find-renames ... then it should make more sense	11:22
	→ jeffreylevesque joined	11:24
zaccanasta	in git diff there's nothing that's been renamed	11:25
	it was the output of git commit	11:25
	← konsolebox left	11:26
	→ jameser joined	11:26
osse	ah	11:26
	→ konsolebox joined	11:27
	← Murr left	11:27
osse	well, anyway, the point is that it's a guess from git	11:27
	→ Murr joined	11:27
	→ Cavallari joined	11:27
zaccanasta	so I saw that copy in the output and I was confused	11:27
	but nothing has actually been copied	11:28
osse	you should reproduce it with 'git diff --find-renames --stat HEAD~1 HEAD'	11:28
	and you can adjust the threshold for what git thinks is a rename/copy/etc.	11:28
	as long as there are no new files before and after clang-format, everything is good	11:29
	→ h12o joined	11:31
zaccanasta	osse: thanks a lot	11:32
	← Cabanossi left	11:34
	→ Cabanossi joined	11:35
	← h12o left	11:35
	← Tobbi left	11:36
	← nowhereman left	11:36
	→ nettoweb__ joined	11:36
	→ nowhereman joined	11:37
	→ obacht-heiss joined	11:37
	→ Tobbi joined	11:38
	← JeroenT left	11:43
	→ jripke74 joined	11:44
	→ masuberu joined	11:44
	← scottjl left	11:45
	→ scottjl joined	11:49
	→ Raedism joined	11:50
	→ Cavallari1 joined	11:51
	→ ShalokShalom_ joined	11:52
	← oskarkv left	11:52
	← Raed\|Mobile left	11:52
	← Cavallari left	11:52
	Cavallari1 → Cavallari	11:52
	← dre_ left	11:53
	← ShalokShalom left	11:55
	→ JeroenT joined	11:55
	← nettoweb__ left	11:55
	← pix9 left	11:55
	← lohfu left	11:55
	→ lohfu joined	11:56
	→ ski7777 joined	11:57
	← TheVice left	11:59
	→ synthroid joined	12:01
	ShalokShalom_ → ShalokShalom	12:02
	← Cabanossi left	12:03
	← jripke74 left	12:04
	← BUSY left	12:04
	→ BUSY joined	12:05
	→ Cabanossi joined	12:05
	← Floflobel left	12:06
	← VladGh left	12:07
	→ jripke74 joined	12:07
	← PHPanos left	12:07
	→ VladGh joined	12:08
	→ feodaron joined	12:10
	← sarp left	12:11
	← jripke74 left	12:12
	→ YuGiOhJCJ joined	12:13
	← colona_ left	12:14
	← a3Dman left	12:16
	← danslo left	12:18
	→ tvw joined	12:19
	← manuelschneid3r left	12:20
	← cverna left	12:20
	→ cverna joined	12:20
	→ Guest51185 joined	12:21
	→ manuelschneid3r joined	12:21
	← voice_ftp_ left	12:23
	→ Raed\|Mobile joined	12:23
	→ voiceftp joined	12:23
	← jameser left	12:26
	← Guest51185 left	12:26
	→ jameser_ joined	12:26
	← Raedism left	12:26
	→ colona joined	12:27
	← Raed\|Mobile left	12:27
	→ tmsmith joined	12:28
	→ bronson joined	12:29
	→ brent__ joined	12:30
	← voiceftp left	12:31
	→ voiceftp joined	12:31
	← jameser_ left	12:31
	← Cabanossi left	12:32
	← renarc left	12:33
	→ jameser joined	12:33
	← CheckDavid left	12:33
	← bronson left	12:34
	→ nettoweb__ joined	12:34
	→ PHPanos joined	12:34
	← brent__ left	12:34
	→ Cabanossi joined	12:35
	→ gableroux joined	12:36
	← gableroux left	12:37
	→ Noodlewitt joined	12:38
	→ gableroux joined	12:38
	→ Guest3590 joined	12:38
	→ a3Dman joined	12:38
	← zaccanasta left	12:39
	← cagedwisdom left	12:40
	← finalbeta left	12:41
	→ finalbeta joined	12:41
	← nettoweb__ left	12:41
	← gableroux left	12:42
	→ Acerific joined	12:42
	← Acerific left	12:42
	→ Acerific joined	12:42
	← jameser left	12:43
	→ gableroux joined	12:45
	← plasticle left	12:46
	→ sobersabre joined	12:46
	→ nettoweb__ joined	12:47
	← freimatz left	12:48
	← Noodlewitt left	12:48
	← Acerific left	12:50
	← nettoweb__ left	12:50
	→ jungsubk joined	12:50
	→ nettoweb__ joined	12:51
	→ jameser joined	12:51
	← Guest3590 left	12:51
	→ freimatz joined	12:51
	← Guest34710 left	12:52
	← neil_cn left	12:53
	→ Guest3590 joined	12:55
	← nettoweb__ left	12:55
	→ Budyn joined	12:58
	← tmsmith left	12:58
	→ stutter joined	13:00
	← jameser left	13:00
	→ hfu joined	13:01
	→ jameser joined	13:02
	→ str_ joined	13:02
	← bsanford left	13:02
	← theoceaniscool left	13:02
	← Nizumzen left	13:03
	→ bybb joined	13:04
	← stutter left	13:04
zxd	is there an equivalent of git clone --recurse-submodules but for git pull ? so it will auto fetch and initalize new submodules added to the superproject?	13:04
	→ nettoweb__ joined	13:05
_ikke_	zxd: the same option	13:05
	→ Odaym joined	13:05
Odaym	hi fellas	13:05
	← nettoweb__ left	13:06
	→ theoceaniscool joined	13:06
Odaym	how can I make branch B become master?	13:06
	or have master point to branch B?	13:06
grawity	by renaming it	13:06
Odaym	to master??	13:07
	→ nettoweb__ joined	13:07
Odaym	heresy	13:07
jast	well, then maybe you meant something slightly different? :)	13:07
grawity	well that's literally the only difference	13:07
s17	merge it	13:07
jast	do you want to have B checked out by default instead of master?	13:07
	when cloning, that is	13:07
Odaym	that branch is way ahead, and there are tons of conflicts of course back at master	13:07
	→ cdg joined	13:07
	→ giraffe joined	13:08
Odaym	i think i should check for conflicts first, merge is the natural way to do this	13:08
_ikke_	If you're not on master: git branch -f master <branch>	13:08
jast	so you basically don't care about the version currently in master?	13:08
	giraffe → Guest431	13:08
Odaym	yea i dont care for anything in master anymore	13:08
	← cdg left	13:08
jast	I wouldn't forcibly overwrite master	13:08
Odaym	went out of sync long time ago and I just stuck with this new branch	13:08
jast	unless you're the only one on the project	13:08
	→ cdg joined	13:08
Odaym	I am	13:08
	let me try a normal merge	13:08
jast	okay, then there are two ways	13:08
	1) overwrite the history (and content) of master to match what's in B	13:09
	← nettoweb__ left	13:09
	← hfu left	13:09
jast	2) do a magical merge that brings in all the history of B but finagle it so that the merge results in content identical to what's in B right now	13:09
Odaym	finagling is not my trade	13:09
jast	since nobody else is collaborating with you it's only a matter of taste	13:09
	it's not literal finagling, fortunately	13:10
	basically you can start a merge and when it conflicts badly, tell it to just ignore all of that and use version X as is	13:10
zxd	_ikke_: but it dosen't do it	13:10
	→ cdg_ joined	13:11
jast	but if you don't care about the old master, overwriting it will do the job, too. if you have B checked out, _ikke_'s command will do it. if master is checked out, this discards all uncommitted changes and overwrites master's history with B: git reset --hard B	13:11
	→ nettoweb__ joined	13:11
_ikke_	zxd: Right, it does only update existing modules I read	13:11
Odaym	branch -f?	13:12
jast	yeah, that does it in the "master not checked out" case	13:12
Odaym	says here master is ahead of B by 2	13:13
	i can reset hard on master	13:13
	and merge	13:13
	← magictits left	13:13
Odaym	now it's at the moment when i created the new branch	13:13
jast	after the hard reset, there's nothing left to merge :)	13:13
	→ plasticle joined	13:13
Odaym	no of course there is, the branch is still out there	13:13
	ah, conflicts	13:13
jast	well, if you didn't hard reset to B, then you're right	13:13
Odaym	oh	13:13
	lol	13:13
	← cdg left	13:14
Odaym	oh wow	13:14
	magic	13:14
jast	we're full of that here ;)	13:14
zxd	_ikke_: yea	13:14
	→ jripke74 joined	13:14
Odaym	Your branch and 'origin/master' have diverged,	13:14
	and have 35 and 2 different commits each, respectively.	13:14
jast	of course, using reset this way is a little destructive, so caution is advised	13:15
Odaym	I did a push on B before checking out to master and doing that reset	13:15
jast	okay, now git recognizes that your old master (as of what the remote repo knew the last time you fetched) is quite different from your new master	13:15
Odaym	yes	13:15
jast	to force the new master to your remote repo, a simple 'git push -f origin master' should do	13:15
	this makes the destructive power spread ;)	13:16
Odaym	pull would reset what I DID	13:16
	oops did*	13:16
jast	not quite. it would try to merge the old master with the new master. but yeah, you'd get the same old conflicts again.	13:16
Odaym	alright, destruction achieved	13:17
	→ SkyPatrol_ joined	13:17
jast	yay!	13:18
	→ bsanford joined	13:18
	← jripke74 left	13:18
	← theoceaniscool left	13:18
	← tunekey left	13:19
	← SkyPatrol left	13:19
Odaym	ah damn	13:20
	→ maryo_ joined	13:20
Odaym	I had the note here in my Git Tips doc lol http://snpy.in/PG50sB	13:20
	probably from the last time I was here, but didn't actually execute it that time	13:20
jast	just goes to show that doing beats writing down :)	13:21
Odaym	haha	13:21
	yep	13:21
	→ Dasir joined	13:21
	← dave0x6d left	13:23
zxd	what's the difference between git submodule update --remote --merge and git pull --recurse-submodules does the latter merge with the status of the submodule's remote tracking branch or it uses superproject’s recorded SHA-1	13:24
	→ Noldorin joined	13:24
	→ snowkidind joined	13:24
	→ relipse__ joined	13:25
	← jameser left	13:26
	→ malmalmal joined	13:26
	← Murr left	13:27
	→ Murr joined	13:27
	→ diqidoq joined	13:27
	→ relipse___ joined	13:27
	→ FrostCandy joined	13:29
	← relipse__ left	13:30
	→ h12o joined	13:31
	→ chrisshattuck joined	13:32
	→ jameser joined	13:33
	← Budyn left	13:35
	← h12o left	13:36
	→ v4ult joined	13:36
	→ gugah joined	13:38
	← gugah left	13:38
	→ gugah joined	13:38
	← chrisshattuck left	13:39
	→ stutter joined	13:41
	← bybb left	13:42
	→ Diaoer joined	13:43
	← Diaoer left	13:44
	→ dougquaid joined	13:44
dougquaid	Can a tag be applied to an old commit rather than the most current one?	13:44
jast	yep, it's just an extra optional argument	13:45
	→ Diaoer joined	13:45
dougquaid	What the is extra argument? I haven't found it yet in my searches	13:46
	← a3Dman left	13:47
	→ jottr joined	13:47
	→ Cumulo741 joined	13:50
	← Raging_Hog left	13:51
	← jameser left	13:51
jast	git tag mytag abc123	13:52
	it's also the first synopsis line in man git-tag :)	13:52
gitinfo	the git-tag manpage is available at https://gitirc.eu/git-tag.html	13:52
	← overlord_tm left	13:53
zxd	is it possible to set a timeout for --recurse-submodule to git clone so that if submodules are unreachable to not get stuck forever?	13:54
	← justanotheruser left	13:54
	ForeignBiscuit → ResidentBiscuit	13:54
	→ h12o joined	13:55
	→ gonhidi joined	13:55
zxd	bah I see the whole clone fails if it can't connect	13:55
	→ a3Dman joined	13:55
	← a3Dman left	13:55
	→ a3Dman joined	13:55
dougquaid	jast: Thanks	13:55
Borg-	the whole submodule thing..... I kinda dont like it... how they works..	13:56
	→ Es0teric joined	13:56
	→ Nizumzen joined	13:56
Borg-	for now I use super-project git repo.. with SH bootstrap script.. and git archive... works better for me..	13:56
	→ galaxie_ssh joined	13:56
zxd	ah actually it does clone without the submodule	13:56
	← qqx left	13:57
Borg-	and if you need full repo of sub-project... just rm -rf it and do full clone.. removing info about sub-project..	13:57
	→ qqx joined	13:57
zxd	Borg-: it's easier to just commit information of new projects to the superproject!	13:57
	without having to manage manually with scripts each new project	13:57
	← galaxie_ssh left	13:57
	→ e-dard joined	13:57
	← e-dard left	13:57
	← neunon left	13:58
zxd	the remote information	13:58
	→ neunon joined	13:58
Borg-	zxd: you mean with git submodules?	13:58
zxd	Borg-: yes	13:58
	← sz0 left	13:59
	← manuelschneid3r left	13:59
	← Raed left	13:59
	→ Locra joined	13:59
	→ jameser joined	13:59
Borg-	I guess its personal preference... I feel it a bit counter-intuitive..	13:59
	maybe I need to try submodules harder.. one day	13:59
	dunno...	13:59
	→ dave0x6d joined	14:00
	→ jesst joined	14:01
	← synthroid left	14:01
	→ jameser_ joined	14:02
	← ferr left	14:02
	→ AnujSharma joined	14:02
	← YuGiOhJCJ left	14:03
	← jameser left	14:03
	→ chrfle^ joined	14:04
	← malmalmal left	14:04
	→ damasceno joined	14:05
	← chrfle left	14:05
damasceno	Hey guys, I'm adding "github/users/terraform.tfstate.backup" to my .gitignore but it's not working. When I do "git status --ignored" I can't see the file being ignored. Does anyone know how to do that?	14:06
	→ Argylelabcoat joined	14:06
	→ Raed joined	14:07
	→ torshido joined	14:10
	← igemnace left	14:11
	← aard_ left	14:11
	→ Lacro joined	14:12
	← Lacro left	14:12
osse	damasceno: what does 'git log -- github/users/terraform.tfstate.backup' show ?	14:13
	← TomyWork left	14:15
	→ AaronMT joined	14:18
	← Odaym left	14:18
	→ cbonobo joined	14:18
	← AnujSharma left	14:18
	→ cdown joined	14:21
	← Khisanth left	14:23
	→ Dougie187 joined	14:23
	→ Khisanth joined	14:24
	→ noecc joined	14:24
	→ ecuanaso joined	14:25
	← zulutango left	14:25
	← bitmod left	14:25
	→ manuelschneid3r joined	14:27
	→ overlord_tm joined	14:27
	← jesst left	14:27
	→ malmalmal joined	14:29
	← feodaron left	14:30
	← Guest3590 left	14:30
	→ bronson joined	14:30
	→ cdown_ joined	14:32
	← baxx left	14:32
	← fatihgenc left	14:32
	← jameser_ left	14:32
	← malmalmal left	14:32
	← Guma left	14:33
	← spacemeld left	14:33
	→ bergice_ joined	14:34
	← cdown left	14:34
	cdown_ → cdown	14:34
	→ feodaron joined	14:35
	← bronson left	14:35
	→ Mattiaslndstrm joined	14:36
	→ dreiss joined	14:36
	← murii left	14:37
	→ urnix joined	14:37
	← black_13 left	14:37
	← nettoweb__ left	14:38
	← Locra left	14:38
	← jknetl left	14:39
	→ artem joined	14:39
	← urnix left	14:39
	← Mattiaslndstrm left	14:40
	→ thiago_ joined	14:40
	→ chrissha_ joined	14:43
	→ hroi joined	14:44
	← Es0teric left	14:45
	→ re1 joined	14:45
	← damasceno left	14:45
	← artem left	14:46
	→ cha18 joined	14:46
	→ tmhind2 joined	14:46
	→ iNCoNFuN joined	14:47
	→ artem joined	14:47
	→ pinux joined	14:47
	→ TikityTik joined	14:48
	← Chulbul left	14:49
	→ bitmod joined	14:50
	← ppang left	14:50
	← cdown left	14:51
	← visual left	14:52
	← tmhind2 left	14:52
	→ fahadash joined	14:53
	→ gwd joined	14:54
	← pinux left	14:55
hroi	I have branch with some 3 commits at the beginning.	14:55
	I'd like to merge them with master and rebase the branch with master so that only the follow on commits will be left	14:55
	does this make sense?	14:56
	I.e. take first commits from a brand and apply them to master,	14:56
	*branch	14:56
gwd	I'm having a weird problem where if I execute git commands from another programm too quickly in succession, the commands sometimes error out with lock file contention	14:57
hroi	will rebase then realize that those are the same commits, or will they appear as empty commits	14:57
gwd	https://hastebin.com/lucawebino.sql	14:57
osse	hroi: it will realize	14:57
	→ jripke74 joined	14:57
osse	hroi: git checkout master; git cherry-pick foo bar baz; git rebase master branchname	14:57
gwd	(The brackets there are the arguments to git -- so it executes a checkout and a clean, then attempts to do an 'am' and it fails with lockfile contention)	14:57
	← Dasir left	14:58
	→ synthroid joined	14:58
	← chele left	14:58
hroi	osse, ok so I can cherry pick the commits I want,	14:58
	on master then rebase	14:59
	← JeroenT left	14:59
gwd	Git doesn't exit while commands are still going on in the background, does it?	14:59
	← howdoi left	14:59
hroi	osse, would it be enough to cherry pick commit number 3 on my branch, therefore bringing in the 1st and 2nd	14:59
	→ cdown joined	14:59
	→ visual joined	15:00
	← Silmarilion left	15:00
osse	hroi: no	15:00
	cherry-pick takes individual commits	15:00
	← rscata left	15:00
osse	hroi: i've written a script that makes this easier: https://github.com/Osse/git-scripts/blob/master/git-move	15:01
	→ sz0 joined	15:01
	→ Phylock joined	15:01
	← jripke74 left	15:01
	← freddieptf left	15:01
osse	hroi: also: yes, rebase will realize and therefor drop duplicate commits	15:02
	→ jost joined	15:05
	← thierryp left	15:05
	← Diaoer left	15:05
	← relipse___ left	15:06
	← roelmonn_ left	15:06
	→ relipse joined	15:06
	← ThomasLocke left	15:07
	→ roelmonnens joined	15:07
	→ jripke74 joined	15:07
	→ lexvegas joined	15:07
	← diqidoq left	15:08
	← AaronMT left	15:08
	→ AaronMT_ joined	15:08
	← cdown left	15:08
	← dreiss left	15:08
	← jripke74 left	15:09
lexvegas	Hi all, I'm trying to fetch from LocalRepo1 into LocalRepo2 by running "git fetch LocalRepo1Remote". My working directory is up to date, but none of the new objects were transferred to LocalRepo2. If I run "git fetch origin" I get the expected objects downloading. Is there some flag I'm missing to fetch all of the objects in the local copy of the repo?	15:09
	→ TomyLobo joined	15:10
	← ecuanaso left	15:11
	← thiago_ left	15:11
	← akushner___ left	15:11
	← roelmonnens left	15:12
	AaronMT_ → AaronMT	15:12
	← imack left	15:13
	← zefferno left	15:13
	→ boombatower joined	15:14
	← Cavallari left	15:15
	→ Cavallari joined	15:15
	→ heym0e joined	15:15
	→ acidjnk2 joined	15:15
	← mikecmpbll left	15:16
	→ steeze joined	15:16
	→ Gustavo6046 joined	15:16
	→ kculpis joined	15:17
	← acidjnk left	15:17
	← gugah left	15:17
	→ mikecmpbll joined	15:17
	→ ams__ joined	15:20
	← Gustavo6046 left	15:21
	→ Gustavo6046 joined	15:21
	→ durham joined	15:22
	→ svm_invictvs joined	15:24
	→ bomb-on joined	15:24
	→ _kk22kk_ joined	15:25
	← bitmod left	15:25
	→ imack joined	15:25
	→ bitmod joined	15:25
	→ roelmonnens joined	15:26
	← Murr left	15:27
	→ igemnace joined	15:27
	→ Murr joined	15:27
	→ chrfle joined	15:27
	← chrfle left	15:27
	→ chrfle joined	15:27
	← Gustavo6046 left	15:28
	→ SteffanW joined	15:29
	← chrfle^ left	15:29
	← h12o left	15:29
	← durham left	15:30
	→ Gustavo6046 joined	15:30
osse	lexvegas: by default git will share objects and whatnot between two local repos to save space	15:30
	maybe that	15:30
	→ durham joined	15:30
osse	's messing it up	15:30
	← Gustavo6046 left	15:31
	← roelmonnens left	15:31
	→ Gustavo6046 joined	15:31
	← iNCoNFuN left	15:32
lexvegas	osse, Yeah, that seems to be exactly what's happening. I haven't found any flags to disable that thouh.	15:32
	→ Locra joined	15:32
lexvegas	nor is it on the git fetch man page	15:33
osse	lexvegas: not sure if it can be done after the fact	15:33
	but git clone --no-local or git clone file://foo does the trick	15:33
lexvegas	hmm, yeah. I just had an existing repo and wanted to save bandwidth	15:34
	→ gugah joined	15:35
lexvegas	Thanks for confirming my suspicions though	15:35
	→ dreiss joined	15:36
	← heym0e left	15:36
lexvegas	I did manage to work around it using the -t flag, but even then there was still a few things when I just did a normal fetch form origin	15:36
	→ SkyPatrol joined	15:37
	→ CheckDavid joined	15:37
	→ dimi1947 joined	15:38
	← artem left	15:38
	← SkyPatrol_ left	15:39
	→ shdw joined	15:39
	← oojacoboo left	15:40
	← PHPanos left	15:41
	→ Floflobel joined	15:42
	→ brent__ joined	15:43
	← brent__ left	15:43
	→ brent__ joined	15:43
	← durham left	15:44
	← Kaisyu left	15:44
	← imack left	15:44
	→ madewokherd joined	15:44
	→ h12o joined	15:45
hroi	after cherry picking my first 3 commits into master, I'm now rebase the branch with master	15:46
	I get... off course... errors like "No changes" when going through the rebase	15:46
	should I do git rebase -skip, to skip over those "no changes" rebase steps.	15:47
	?	15:47
	→ rkta joined	15:47
	→ ashpokemonZ joined	15:47
	← Cabanossi left	15:48
	→ durham joined	15:49
	→ Cabanossi joined	15:50
	→ debakarroy2 joined	15:52
	→ dsdeiz_ joined	15:52
	← debakarroy2 left	15:52
	← jceb left	15:53
	← lexvegas left	15:54
	→ debakarroy2 joined	15:54
	← ashpokemonZ left	15:54
	← h12o left	15:55
	→ cagomez joined	15:55
	→ dviola joined	15:56
	→ mike_oalian joined	15:56
	← dsdeiz_ left	15:57
	→ ArcaTech joined	15:57
	→ nixjdm joined	15:58
	→ joelroa joined	15:59
	← joelroa left	15:59
	→ Motoko joined	16:00
	← masuberu left	16:00
	← bomb-on left	16:01
	→ cdown joined	16:02
	← _ng left	16:03
	← Motoko left	16:03
	→ thiago joined	16:03
	→ bomb-on joined	16:04
	← deltam left	16:05
	→ deltam joined	16:05
	→ orbyt_ joined	16:06
	→ xz joined	16:06
	→ SkyPatrol_ joined	16:06
	← v4ult left	16:07
xz	hi there, we use gerrit in one of the project I work for. There is this workflow where people when enabling new hardware/new feature create so called 'recipes'. Recipe is set of git cherry-picks + optional wiki with further instructions on how to build and run the feature. For me that seems little cumbersome, I believe branches should be used instead. Does gerrit support branches? Are branches good solution to keep new features temporarily,	16:08
	as long as they are not merged?	16:08
	→ phluks joined	16:08
	← SkyPatrol left	16:08
	→ kurkale61 joined	16:09
	← mike_oalian left	16:09
	→ mike_oalian joined	16:10
	← kurkale6ka left	16:12
	← bomb-on left	16:12
	← igemnace left	16:13
	→ kurkale6ka joined	16:13
	→ k999k joined	16:14
	→ h12o joined	16:14
	← kurkale61 left	16:16
	← hahuang65 left	16:16
	← dreiss left	16:17
	→ thinkdoge joined	16:18
	→ Murii\|linux joined	16:18
	← h12o left	16:19
	→ morenoh149 joined	16:24
	← cdown left	16:24
	← k999k left	16:24
	← _kk22kk_ left	16:24
	→ chrfle^ joined	16:24
	← abba left	16:25
	→ Rodya_ joined	16:25
	← chrfle left	16:26
	← freimatz left	16:26
	← SkyPatrol_ left	16:29
	→ h12o joined	16:29
	→ SkyPatrol joined	16:30
	← guardian left	16:31
	→ energizer joined	16:31
	← durham left	16:31
	→ bronson joined	16:31
	→ durham joined	16:32
	→ bomb-on joined	16:32
	← rapha left	16:33
	→ thierryp joined	16:34
	← bronson left	16:36
	← durham left	16:36
	← mike_oalian left	16:38
	→ mike_oalian joined	16:38
	→ Mattiaslndstrm joined	16:39
	← cagomez left	16:40
	← Cavallari left	16:41
	→ cagomez joined	16:41
	← svm_invictvs left	16:43
	→ tang^ joined	16:44
	→ chrfle joined	16:45
	← chrfle left	16:45
	→ chrfle joined	16:45
	← jsears left	16:45
	← luc4 left	16:46
	← Rodya_ left	16:46
	← chrfle^ left	16:46
	← manuelschneid3r left	16:47
	→ oojacoboo joined	16:47
	→ manuelschneid3r joined	16:48
	← cagomez left	16:48
	→ cagomez joined	16:48
	← Cabanossi left	16:49
	→ freimatz joined	16:49
	← xz left	16:49
	→ durham joined	16:50
	→ Cabanossi joined	16:50
	→ Achylles joined	16:52
	← jottr left	16:52
	← kurkale6ka left	16:54
	→ SkyPatrol_ joined	16:57
	→ guardian joined	16:57
	← SteffanW left	16:58
	← SkyPatrol left	16:59
	← Locra left	17:01
	← nixjdm left	17:01
	→ svm_invictvs joined	17:01
	→ fatalhalt joined	17:07
	← cstratak left	17:07
	← chll_ left	17:08
	→ SkyPatrol joined	17:08
	← sz0 left	17:09
	← thiago left	17:09
	← sobersabre left	17:10
	→ ertes joined	17:10
	← SkyPatrol_ left	17:10
	→ sobersabre joined	17:12
	→ Pyrogerg joined	17:12
	← gxt left	17:12
	← Floflobel left	17:13
	← jungsubk left	17:14
	→ jungsubk joined	17:14
	← gwd left	17:14
	→ nixjdm joined	17:15
	→ e-dard_afk joined	17:15
	e-dard_afk → e-dard	17:15
	→ jceb joined	17:15
	← oojacoboo left	17:16
	→ Polylith joined	17:17
	→ oojacoboo joined	17:21
	→ hahuang65 joined	17:22
	← hahuang65 left	17:22
	→ Floflobel joined	17:22
	→ cdown joined	17:22
	→ Lyberta joined	17:22
Lyberta	is https:// more secure than git://?	17:23
	← dimi1947 left	17:23
	→ thiago joined	17:24
Seveas	yes	17:24
	git:// is unencrypted	17:24
	← surfist left	17:25
_ikke_	and unauthenticated	17:26
	→ Guest3590 joined	17:26
_ikke_	it's meant for anonymous cloning of public repos	17:26
	← phluks left	17:26
	← cdown left	17:26
	← Murr left	17:27
	← xcm left	17:27
	→ Murr joined	17:27
	→ glad_ joined	17:27
	→ xcm joined	17:28
	← glad left	17:29
	← Guest3590 left	17:30
	← Cabanossi left	17:34
	← jungsubk left	17:34
	→ Cabanossi joined	17:35
	→ akushner___ joined	17:35
	← opencw left	17:36
	← jstimm left	17:37
	→ j08nY joined	17:37
	← rtjure left	17:38
	← j08nY left	17:38
	→ j08nY joined	17:38
	← j08nY left	17:39
	← causasui left	17:39
	→ causasui joined	17:39
	→ j08nY joined	17:40
	← j08nY left	17:41
	→ dimi1947 joined	17:41
	→ j08nY joined	17:41
	→ rtjure joined	17:42
	→ surfist joined	17:42
	← achadwick left	17:44
	← orbyt_ left	17:45
	→ wootehfoot joined	17:46
	← mikecmpbll left	17:46
	→ Es0teric joined	17:47
	← torshido left	17:47
	→ jottr joined	17:48
	← mescalinum left	17:50
	← jceb left	17:52
	← j08nY left	17:52
	e-dard → e-dard_afk	17:53
	← glad_ left	17:54
	← dimi1947 left	17:56
	← akushner___ left	17:58
	→ Discovery joined	17:58
	← Discovery left	17:59
	→ theoceaniscool joined	18:00
	← manuelschneid3r left	18:00
	← Argylelabcoat left	18:01
	← ArcaTech left	18:01
	← nixjdm left	18:01
	→ mescalinum joined	18:02
	← Floflobel left	18:03
	← dcpc007 left	18:03
	→ akushner___ joined	18:05
	→ salamanderrake joined	18:05
	→ paul424 joined	18:06
	→ cdown joined	18:06
	→ phluks joined	18:07
	→ abyx joined	18:07
	→ jceb joined	18:08
	→ dsdeiz_ joined	18:08
	← rkta left	18:09
	← belmoussaoui left	18:10
	← bomb-on left	18:10
	→ Rodya_ joined	18:10
	← madewokherd left	18:11
	← dsdeiz_ left	18:13
	→ Sasazuka joined	18:14
	→ nixjdm joined	18:14
	← akushner___ left	18:15
	← debakarroy2 left	18:15
	← Rodya_ left	18:15
	← jottr left	18:15
	→ akushner___ joined	18:17
	→ jungsubk joined	18:17
	e-dard_afk → e-dard	18:18
	→ PHPanos joined	18:18
	← e-dard left	18:19
	← Anja left	18:19
	← gableroux left	18:22
	→ belmoussaoui joined	18:23
	← diogenese left	18:24
	← rtjure left	18:24
	→ diogenese joined	18:25
	← steeze left	18:26
	→ aboccia joined	18:27
	← ShekharReddy left	18:29
	→ sobersabre_ joined	18:30
	← jungsubk left	18:30
	← h12o left	18:30
	← Bock left	18:31
	→ anderson_ joined	18:32
	← anderson_ left	18:32
	→ cdg joined	18:32
	← sobersabre left	18:32
	→ bronson joined	18:32
	→ jungsubk joined	18:34
	← jleclanche left	18:34
	← cdg_ left	18:35
	→ jstimm joined	18:35
	← cdg left	18:36
	← pbandark left	18:36
	← bronson left	18:37
	→ kus_ubuntui686 joined	18:37
	← kus_ubuntui686 left	18:37
	→ Mighty_Warthog joined	18:39
	← Murii\|linux left	18:39
	← wandering_vagran left	18:40
	← Mighty_Warthog left	18:41
	→ Mighty_Warthog joined	18:41
	← Mighty_Warthog left	18:41
	→ hahuang65 joined	18:42
	→ manuelschneid3r joined	18:42
	→ sobersabre joined	18:45
	→ h12o joined	18:47
	← sobersabre_ left	18:47
	→ ivo_ joined	18:47
	→ majuk joined	18:52
	← bitmod left	18:54
	← TikityTik left	18:54
	← akushner___ left	18:54
majuk	Hey all. I'm having trouble generating/applying a patch file and I'm hoping someone can point out what I've done wrong. I git clone'd u-boot-fslc 2016.07, made edits to two files, and run 'git diff > patchfile.patch'. result -> https://pastebin.com/syczzFR4	18:55
	← mescalinum left	18:55
majuk	When I try to apply the patch to a newly cloned source, it tells me the patch does not apply.	18:55
	← tvw left	18:55
majuk	https://pastebin.com/eAxcnZdJ	18:56
	→ sbeyer joined	18:58
thiago	majuk: your patch failed	18:59
	→ Rodya_ joined	18:59
majuk	Yup	18:59
thiago	the code has changed	18:59
	fix the conflict	18:59
	→ mescalinum joined	18:59
	← Rodya_ left	19:00
	→ desnudopenguino joined	19:00
	← johnnyfive left	19:00
majuk	I literally cloned, edited and generated the patch in the last 30 minutes.	19:00
thiago	show me the git commands	19:01
	← nixjdm left	19:01
thiago	not quilt	19:01
desnudopenguino	are there any issues with merging a master branch to a different branch to test the different branch with changes in master, then once it is ready merge the different branch into master for deployment?	19:02
thiago	desnudopenguino: no, you can merge any two (or more) branches	19:02
	→ johnnyfive joined	19:02
desnudopenguino	ok, cool. my client just brought in some more devs, and their master branch has some additional stuff, but my branch isn't ready to be pushed, but I want to make sure things are still compatible between what I have and what they did	19:04
majuk	thiago: Yea, it's run through Yocto. Anyway, thanks for your input.	19:04
	→ jottr joined	19:04
thiago	majuk: you're definitely not applying the patch to the same sources	19:04
	majuk: I don't know what bitbake or quilt do to your sources. But they did something.	19:05
	majuk: that's your issue	19:05
	desnudopenguino: and if you don't push that change, you can always undo the merge and leave it for later	19:05
desnudopenguino	nice	19:06
	→ YuGiOhJCJ joined	19:06
majuk	thiago: They pull and unpack it, then this should be the first patch applied. Looking at the source, all the line numbers line up... maybe I'll try applying that patch last. I'll see if I can move the ball. Thanks again.	19:06
	← PHPanos left	19:07
	→ pandeiro joined	19:12
Borg-	https://tahoe-lafs.org/%7Ezooko/badmerge/simple.html	19:13
	interesting..	19:13
	its used in very old git.. does it still apply?	19:14
	→ nixjdm joined	19:14
	← Lyberta left	19:15
	→ aard_ joined	19:15
	→ mygan joined	19:16
	→ Acerific joined	19:18
	← Acerific left	19:18
	→ Acerific joined	19:18
	← paul424 left	19:18
Borg-	anyway.. not trivial :)	19:18
	→ roelmonnens joined	19:21
	→ steeze joined	19:22
	← roelmonnens left	19:25
	← jeffreylevesque left	19:26
	→ yourdarling joined	19:28
	← cagomez left	19:29
	→ ZyX-I joined	19:29
	← noecc left	19:29
	→ cagomez joined	19:29
majuk	thiago: Thanks for your help, I cloned the source outside Yocto and generated the patch and it applied successfully. Appreciate it.	19:30
	← Polylith left	19:31
	→ Polylith joined	19:31
	→ orbyt_ joined	19:31
	← mike_oalian left	19:31
	→ paul424 joined	19:32
	→ Darkprof08-ru joined	19:32
	← nydel07 left	19:33
	← nydel09 left	19:33
	← Darkprof08-ru left	19:33
	← hvxgr_ left	19:34
	← synthroid left	19:34
	→ bronson joined	19:35
	→ synthroid joined	19:35
	← cagomez left	19:37
	→ TheVice joined	19:38
	← yourdarling left	19:38
	← synthroid left	19:39
	→ synthroi_ joined	19:39
	← Es0teric left	19:41
	→ sarp joined	19:42
	→ lezer joined	19:44
	← lezer left	19:44
	← jstimm left	19:45
	← chrfle left	19:46
	← gugah left	19:47
	← jost left	19:47
	← snowkidind left	19:47
	→ ArcaTech joined	19:48
	→ Es0teric joined	19:49
	← ArcaTech left	19:50
	→ ArcaTech joined	19:52
	→ jstein_ joined	19:59
	← paul424 left	19:59
	jstein_ → jstein	19:59
relipse	in order to prevent merge conflicts should I do git checkout foo, git rebase master ?	19:59
_ikke_	relipse: You prevent merge conflicts by communicating	20:00
relipse	as opposed to git checkout foo; git merge origin/master	20:00
_ikke_	relipse: no git process can prevent merge conflicts	20:00
	No, you will still get merge conflicts, but you get smaller conflicts per commit, instead of one big merge conflict	20:00
relipse	if the merge conflicts get resolved early on then the person doing the release won't have to do it	20:00
_ikke_	right	20:01
	That's something different	20:01
	← Darcidride left	20:01
relipse	so they can do that by doing git merge origin/master or git rebase master right?	20:01
_ikke_	You shift who has to do the conflict resolution	20:01
	← nixjdm left	20:01
_ikke_	relipse: If they can merge, it does not matter	20:01
	but if the merging is being done by someone else, rebasing is a good idea	20:01
relipse	so git rebase master right, not git rebase -i master?	20:02
_ikke_	relipse: right, -i is mostly if you want to reorder, squash / reword / edit commits	20:02
relipse	and git rebase master will replay my branch on top of master right?	20:03
	→ cagomez joined	20:05
	← spyroboy_ left	20:05
	← Nizumzen left	20:05
	← rokups left	20:07
	→ madewokherd joined	20:07
	← cagomez left	20:09
	→ Rodya_ joined	20:10
	→ Argylelabcoat joined	20:10
	→ cdg joined	20:11
	→ bitmod joined	20:11
	→ jripke74 joined	20:14
	→ nixjdm joined	20:14
	← jripke74 left	20:15
	→ cdg_ joined	20:16
	← Rodya_ left	20:16
	→ roelmonnens joined	20:16
	← jottr left	20:17
	← cdg left	20:19
	→ akushner___ joined	20:19
	→ TXMillerTime joined	20:20
	← Mattiaslndstrm left	20:20
	← roelmonnens left	20:20
	→ Mattiaslndstrm joined	20:20
	→ raijin joined	20:24
	← gonhidi left	20:27
	← e^1 left	20:28
	← exxi left	20:28
	→ durham_ joined	20:29
	← akushner___ left	20:31
	→ jottr joined	20:32
	← durham left	20:32
	← ams__ left	20:32
	← mattcen left	20:32
	← phluks left	20:33
	← durham_ left	20:34
	→ mattcen joined	20:35
	→ Solvaring joined	20:36
	→ tvw joined	20:37
	← a3Dman left	20:39
	← jceb left	20:40
	→ durham joined	20:41
	→ veremitz joined	20:42
	← freimatz left	20:42
	→ cagedwisdom joined	20:42
	← TXMillerTime left	20:43
	← dave0x6d left	20:43
	← jstein left	20:45
	→ cagomez joined	20:45
	→ gonhidi joined	20:47
	→ King_Hual joined	20:47
	← King_Hual left	20:47
	→ King_Hual joined	20:47
	← jungsubk left	20:47
	← Es0teric left	20:47
	→ a3Dman joined	20:48
	→ jstimm joined	20:49
	→ jceb joined	20:49
	→ koell joined	20:49
	→ Es0teric joined	20:52
	← aard_ left	20:52
	→ zulutango joined	20:52
	→ klasz joined	20:53
	← abyx left	20:53
	gitinfo set mode: +v	20:53
	→ dsdeiz_ joined	20:53
	← synthroi_ left	20:55
	← Solvaring left	20:55
	← czart left	20:56
	← ntnn left	20:56
	→ Tylash joined	20:57
	→ czart joined	20:57
	← zulutango left	20:57
klasz	hello, sry ive some stupid question. i ve clone u-boot with git clone https://github.com/altera-opensource/u-boot-socfpga.git after that i checkout the tag v2017.05-rc3 and change some files and add some more board specific files. after that the version 2017.05-rc3 is working. but now how can i update to the new tags (2017.09)without loosing my changes?	20:57
	← jceb left	20:57
_ikke_	klasz: create a branch, commit, then rebase / cherry-pick those commits	20:58
	← dsdeiz_ left	20:58
	→ jnavila joined	20:58
	→ durham_ joined	20:59
	← h12o left	21:00
	→ nydel07 joined	21:00
klasz	_ikke_: create new branch -> ok, commit -> ok	21:00
	← southernirc left	21:00
	← Rhonda left	21:00
	← nixjdm left	21:01
klasz	_ikke_: but what about rebase and cherry pick? where can i found more information about that?	21:01
	← jnewt left	21:02
	→ phinxy joined	21:02
	→ ntnn joined	21:02
	→ mikecmpbll joined	21:02
	← durham left	21:02
_ikke_	man git cherry-pick	21:02
gitinfo	the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html	21:02
_ikke_	man git rebase	21:02
gitinfo	the git-rebase manpage is available at https://gitirc.eu/git-rebase.html	21:02
	→ mar77i joined	21:03
_ikke_	https://git-scm.com/book/en/v2/Git-Branching-Rebasing	21:03
	← phinxy left	21:03
	← durham_ left	21:04
klasz	k, never heard about cherry pick, i ll read some information	21:04
	→ Rodya_ joined	21:04
	← mar77i_ left	21:04
_ikke_	it's basically copying of commits	21:06
	→ LeBlaaanc joined	21:09
	← jnavila left	21:09
	← Tylash left	21:10
	→ Tylash joined	21:11
	← sarp left	21:11
	→ edvb joined	21:12
	→ jnavila joined	21:12
	→ dave0x6d joined	21:12
	→ tmsmith joined	21:12
	→ rahtgaz joined	21:12
	← jnavila left	21:13
	← LeBlaaanc left	21:13
	→ nixjdm joined	21:14
	→ h12o joined	21:14
	← montyboy left	21:15
	← orbyt_ left	21:15
	→ sobersabre_ joined	21:15
	→ denimsoft joined	21:15
	→ akushner___ joined	21:16
	← Achylles left	21:16
	→ Rhonda joined	21:17
	← sobersabre left	21:17
	← tmsmith left	21:17
	→ tmsmith joined	21:17
	→ sobersabre joined	21:19
	← madewokherd left	21:19
	→ orbyt_ joined	21:19
	→ madewokherd joined	21:20
	← koell left	21:21
	← sobersabre_ left	21:21
	← brent__ left	21:22
	← Borg- left	21:23
	← ivo_ left	21:23
	← denimsoft left	21:24
	→ sarp joined	21:25
	← rahtgaz left	21:25
	← hahuang65 left	21:25
	→ denimsoft joined	21:25
	← denimsoft left	21:26
	← jottr left	21:26
	→ Guest3590 joined	21:26
	← Murr left	21:27
	→ Murr joined	21:27
	← wootehfoot left	21:27
	→ brent__ joined	21:28
	→ morgoth88 joined	21:28
	← morgoth88 left	21:28
	→ mr_sm1th joined	21:28
	← Guest3590 left	21:31
	← raijin left	21:32
	← Cabanossi left	21:34
	← klasz left	21:35
	→ Cabanossi joined	21:35
	→ denimsoft joined	21:37
	← sarp left	21:37
	← olga left	21:38
	→ hugdru joined	21:39
	← Es0teric left	21:41
	→ raijin joined	21:42
	→ agowa338 joined	21:42
	← Eugene left	21:43
relipse	I'm trying to delete a remote branch but it says: error: unable to delete 'release/1.8.0': remote ref does not exist	21:44
	Why?	21:45
	→ Eugene joined	21:45
	→ FrostyBytes joined	21:46
	→ durham joined	21:46
	← orbyt_ left	21:46
FrostyBytes	I have branch b froked from commit c. then I pull a lot more changes from upstream. now I make branch b' and I want to port up my changes visually to make sure each is still relevant. I want to use difftool with meld, but I want to see only stuff relevant to commits from c to the tip of b, not all the stuff that was added upstream. how do I do this?	21:48
	to be clear b' is branched on a more recent commit than c and I am now on the b' branch, trying to get my changes pulled up	21:49
	← Dougie187 left	21:50
	← agowa338 left	21:51
	→ dendazen joined	21:52
thiago	you should rebase instead of pull	21:54
	← maryo_ left	21:54
	← stutter left	21:54
	→ orbyt_ joined	21:54
	→ Milijus joined	21:55
FrostyBytes	ok, how do I rebase visually? like with meld?	21:55
	→ jeffreylevesque joined	21:56
	← gonhidi left	21:58
parsnip	draw the commit graph?	21:58
	← relipse left	21:59
	← raijin left	22:00
	← nixjdm left	22:01
	← h12o left	22:02
	← chrissha_ left	22:02
	← cbonobo left	22:02
	← Argylelabcoat left	22:03
	→ m0viefreak joined	22:03
	→ cbonobo joined	22:03
	← Cabanossi left	22:03
	← schleppel left	22:04
	← cagomez left	22:05
	→ roelmonnens joined	22:05
	← ZyX-I left	22:05
	→ Cabanossi joined	22:05
	namcap → gunslinger	22:06
	← orbyt_ left	22:06
	← pandeiro left	22:06
	→ Anja joined	22:07
	→ DataComputist joined	22:07
	← cbonobo left	22:08
	→ meadmoon joined	22:08
	← jstimm left	22:08
	← roelmonnens left	22:09
	← meadmoon left	22:09
	← durham left	22:10
	→ durham joined	22:11
	← Acerific left	22:11
	→ jstimm joined	22:11
	→ cagomez joined	22:12
	← cdown left	22:12
	← FrostCandy left	22:13
	→ orbyt_ joined	22:13
	← belmoussaoui left	22:14
	← cagomez left	22:16
	← xaa left	22:17
	→ sarp joined	22:18
	← theoceaniscool left	22:19
	← denimsoft left	22:19
	→ denimsoft joined	22:20
	← denimsoft left	22:20
	→ xaa joined	22:21
	← Phylock left	22:21
	→ denimsoft joined	22:21
	← denimsoft left	22:21
	→ jost joined	22:21
	← AaronMT left	22:27
	← courrier________ left	22:29
	→ courrier________ joined	22:29
	← bronson left	22:29
	→ ToBeCloud joined	22:30
	gitinfo set mode: +v	22:30
	← King_Hual left	22:30
	← mattcen left	22:33
	→ Phylock joined	22:34
	← tvw left	22:37
	← orbyt_ left	22:37
	→ mattcen joined	22:37
	→ orbyt_ joined	22:38
	← sobersabre left	22:40
	← madewokherd left	22:41
	← sbeyer left	22:42
	→ madewokherd joined	22:42
	← mescalinum left	22:45
	← manuelschneid3r left	22:48
	← venmx left	22:49
	← venmx_ left	22:50
	→ theoceaniscool joined	22:53
	→ dsdeiz_ joined	22:54
	→ madewokherd` joined	22:55
	← Anja left	22:55
	→ chrisshattuck joined	22:55
	← madewokherd left	22:56
	→ halcyonn joined	22:56
	← mikecmpbll left	22:56
	← halcyonn left	22:57
	← hugdru left	22:57
	→ halcyonn joined	22:57
	← dsdeiz_ left	22:59
	→ JeffH_ joined	22:59
	→ akushne__ joined	23:00
	← akushne__ left	23:00
	← halcyonn left	23:01
	→ halcyonn joined	23:01
	← fahadash left	23:01
	← theoceaniscool left	23:01
	← akushner___ left	23:02
	→ feodoran_ joined	23:03
	← finalbeta left	23:03
	feodoran → Guest88892	23:04
	feodoran_ → feodoran	23:04
	← thiago left	23:04
	← feodoran left	23:05
	← dendazen left	23:05
	→ cagomez joined	23:06
	← Guest88892 left	23:06
	← JeffH_ left	23:08
	→ thiago joined	23:08
sparr	does init.templateDir have no default configuration value?	23:08
	→ snowkidind joined	23:09
	← halcyonn left	23:10
	← sarp left	23:11
	← Phylock left	23:12
	→ DSLegends joined	23:12
DSLegends	anyone with gitlab-runner experience? I'm new to it, can't find answer on the interwebs, but installing to a mac. Following documentation steps, but when I type gitlab-runner register it fails with syntax error near unexpeceted token `newline`... even if I just run gitlab-runner same error...	23:13
sparr	DSLegends: never used it, but you probably have a config option that's empty or ends prematurely, or there's an unclosed () or {} somewhere in your config or data	23:15
DSLegends	thanks, All i've done thus far, is download, set permissions then run that command gitlab-runner register. Pretty sparse so far. I'll keep looking around, I agree likely an isolated issue between my chair and keyboard!	23:18
	← chrisshattuck left	23:19
	← salamanderrake left	23:20
	← str_ left	23:20
	← bruce_lee left	23:21
	← mattcen left	23:21
	→ pandeiro joined	23:21
	→ salamanderrake joined	23:22
	→ mattcen joined	23:24
	→ sarp joined	23:26
	← pandeiro left	23:26
	← Murr left	23:27
	→ Murr joined	23:27
	→ grkblood13 joined	23:27
grkblood13	i added a license to my project from the git site and then did a git fetch thinking it would pull it to my local repo but it didnt. is this normal?	23:28
kadoban	Yes, fetch doesn't change the files in your working directory	23:29
	← overlord_tm left	23:29
grkblood13	what command should i be using to get the license to my working directory then?	23:31
	← TomyLobo left	23:32
	← Tobbi left	23:32
thiago	git doesn't have a site you can edit	23:32
	did you mean github?	23:32
	← Bobdude left	23:33
grkblood13	yea	23:33
	i added directory in github	23:33
	directly*	23:33
thiago	ok, so assuming it committed	23:34
	have you pulled?	23:34
grkblood13	yes, i tried a pull as well	23:34
thiago	did it finish with success?	23:34
	← majuk left	23:34
grkblood13	no tracking info with the current branch	23:35
	so i guess not	23:35
thiago	that's why then	23:35
	→ hfu joined	23:35
thiago	do you want to set up the tracking?	23:36
grkblood13	git pull origin master did the trick	23:36
thiago	good	23:36
	make sure your licence doesn't say "Copyright (C) 2017 The XXxx Developers"	23:37
	replace it with your name or the legal entity owning the copyright	23:37
grkblood13	XXxx developers sounds pretty good	23:39
	→ montyboy joined	23:39
thiago	but wrong	23:39
	use a person or company name	23:39
	← mel00010 left	23:40
	← webguynow left	23:40
	← beerdrop left	23:40
	→ Noodlewitt joined	23:40
	← xaa left	23:41
	→ renarc joined	23:43
	→ safe joined	23:44
	← dsdeiz left	23:45
	→ dsdeiz joined	23:45
	→ str_ joined	23:45
	← hfu left	23:45
	← brent__ left	23:46
	→ xaa joined	23:47
	← tang^ left	23:48
	→ cdg joined	23:48
	← dege left	23:49
	→ durham_ joined	23:49
	→ bcat_ joined	23:49
	← bcat_ left	23:50
	→ bcat_ joined	23:50
	← cdg_ left	23:52
	← durham left	23:52
	← cdg left	23:53
	→ beerdrop joined	23:53
	← steeze left	23:53
	→ roelmonnens joined	23:53
	← durham_ left	23:53
	← sarp left	23:55
	→ hfu joined	23:56
	← roelmonnens left	23:57
	← renarc left	23:58
	→ mel00010 joined	23:58
	← DSLegends left	23:59
	→ raynold joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation