IRCloggy #git 2017-12-28

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-12-28
	→ Munt_ joined	00:00
	← azerus left	00:01
	← phinxy left	00:01
	← FoxRocks left	00:02
	← lep2 left	00:03
	→ leprechau joined	00:03
	← finalbeta left	00:03
	→ azerus joined	00:05
	→ luckman212 joined	00:05
	← pbrewczynski left	00:06
	→ raynold joined	00:06
	→ energizer joined	00:08
	← sanscoeur left	00:10
	← ZexaronS left	00:12
	← nidr0x left	00:13
	← goweol left	00:14
	← rorro left	00:16
	→ nidr0x joined	00:16
	→ ZexaronS joined	00:17
	lactose → polyzen	00:20
	→ raijin joined	00:22
	→ FoxRocks joined	00:24
	← jstein left	00:24
	← Elon_Satoshi left	00:27
	→ igemnace joined	00:31
	← orbyt_ left	00:32
	← danmackay left	00:33
	← bwn left	00:34
	→ hash-z3r0 joined	00:34
	→ _ADN_ joined	00:35
	→ Elon_Satoshi joined	00:36
	← hash-z3r0 left	00:40
	→ orbyt_ joined	00:41
	→ IanLiu joined	00:42
	← jottr left	00:44
	← Munt_ left	00:45
	→ m0viefreak joined	00:46
	→ danmackay joined	00:47
	← dsdeiz left	00:48
	→ dsdeiz joined	00:48
	← mda1 left	00:49
	Elon_Satoshi → Copenhagen_Bram	00:50
	← manuelschneid3r left	00:53
	→ safe joined	00:54
	→ kfoonamalik joined	00:55
	← exotime left	01:00
	← Gurkenglas left	01:00
	→ exotime joined	01:00
	← TomyLobo left	01:01
	← lyxus left	01:02
	← yohnnyjoe left	01:02
	← katiex7 left	01:08
	← raijin left	01:08
	→ pjohan_ joined	01:11
	← regedit left	01:14
	→ astrofog joined	01:15
	→ shaowei joined	01:15
	→ kupad joined	01:18
	→ g00s joined	01:20
	← Sasazuka left	01:21
	← orbyt_ left	01:23
	→ mostlybadfly joined	01:23
	qpdb → Guest38241	01:23
	→ qpdb joined	01:23
	← discopatrick left	01:26
	← pjohan_ left	01:26
	← Guest38241 left	01:26
	← shaowei left	01:27
	← kfoonamalik left	01:28
	→ kfoonamalik joined	01:29
	→ jstein_ joined	01:29
	jstein_ → jstein	01:30
	→ shaowei joined	01:30
	→ v4ult joined	01:31
	→ hash-z3r0 joined	01:35
	← solaris left	01:36
	← kfoonamalik left	01:39
	← Copenhagen_Bram left	01:39
	← Gustavo6046 left	01:43
	→ xDEC joined	01:43
	← xD3C left	01:45
	→ bwn joined	01:47
	← fission6 left	01:53
	→ fission6 joined	01:54
	→ cdg joined	01:54
	← xDEC left	01:55
	→ xD3C joined	01:55
	← dviola left	01:56
	→ neil_cn joined	01:58
	← konsolebox left	01:58
	← cdg left	01:59
	→ konsolebox joined	01:59
	→ shinnya joined	02:00
	← fission6 left	02:04
	→ orbyt_ joined	02:08
	← ZexaronS left	02:10
	← whyme left	02:13
	→ drewmcmillan joined	02:14
	← oprypin left	02:14
	→ whyme joined	02:15
	← astrofog left	02:16
	→ oprypin joined	02:16
	→ finalbeta joined	02:16
	← Tobbi left	02:18
	← jstein left	02:19
	→ Tobbi joined	02:20
	← _ADN_ left	02:20
	← Guest32854 left	02:20
	← Arcaelyx_ left	02:20
	← enckse left	02:20
	→ Copenhagen_Bram joined	02:21
	→ LBRapid joined	02:21
	LBRapid → Guest41366	02:21
	← vrishab left	02:22
	← LiftLeft left	02:22
	← shinnya left	02:23
	→ LiftLeft joined	02:23
	→ enckse joined	02:23
	← Deflate left	02:26
	→ Deflate joined	02:26
	→ BSaboia joined	02:30
	→ lyxus joined	02:30
	→ vrishab joined	02:31
	→ Aash joined	02:31
	← m0viefreak left	02:34
	← xD3C left	02:34
	← orbyt_ left	02:37
	← QualityAddict left	02:41
	← bkxd left	02:44
	← BSaboia left	02:44
	→ awkwardpenguin joined	02:46
	← roger_raymond left	02:47
	← dsdeiz left	02:48
	→ dsdeiz joined	02:48
	← dsdeiz left	02:48
	→ dsdeiz joined	02:48
	← mfiano left	02:49
	→ tunekey joined	02:49
	← markmarkmark left	02:49
	← ilbot3 left	02:50
	→ markmarkmark joined	02:50
	→ roger_raymond joined	02:52
	← Tobbi left	02:54
	← akushner left	02:55
	→ testnick123 joined	02:56
	gitinfo set mode: +v	02:56
	→ cdg joined	02:57
	← Murr left	02:57
	→ Murr joined	02:57
	→ raijin joined	02:57
Aash	Should you be VC'ing build files made form source? The repo ends up being quite large...	02:57
	The application is for business people who are familiar with using git, but not building an app from source	02:58
	→ Arcaelyx joined	02:58
	→ ilbot3 joined	02:58
	→ mfiano joined	02:59
	← KeyJoo left	03:01
igemnace	is the build fully reproducible with just the source in VC? you can just distribute a build script	03:01
	← cdg left	03:02
kadoban	Aash: Tracking compiled files is not generally a good idea, no.	03:02
	← thiago left	03:02
kadoban	Aash: Why should they be familiar with using git, but not building the app? That in general doesn't make a lot of sense. There's other ways to distribute binaries.	03:02
LiftLeft	I created a script to get the number of issues over time of a github repo. It seems that the number of github issues over time go up linearly over time. why is that? maybe there's a bug in my script	03:03
	*open issues	03:03
	→ Smarticles101 joined	03:04
	← SporkWitch left	03:04
LiftLeft	won't the number of open issues over time stay roughly the same?	03:05
	or it just that people forget about them?	03:06
	→ yohnnyjoe joined	03:06
	← nidr0x left	03:07
igemnace	have you confirmed that you're getting the right number	03:07
	← drewmcmillan left	03:08
	→ SporkWitch joined	03:09
LiftLeft	yeah, there's a bug in my script	03:11
	wait no	03:11
	I dunno	03:11
	← yohnnyjoe left	03:11
	← VoradorPT left	03:12
	← v4ult left	03:14
	← FoxRocks left	03:17
	← mulvane left	03:17
	→ mizu_no_oto joined	03:18
Aash	kadoban: Yea sure, it's actually building an exe from python source for windows, so a build script didn't come to mind at first	03:20
	kadoban: time to learn windows batch ;)	03:20
	→ schooner joined	03:21
	← ribasushi left	03:21
Aash	kadoban: Out of curiosity, when you say "there are other ways to distibute binaries"... what are the more common ones?	03:22
	← awkwardpenguin left	03:22
Aash	kadoban: I know github has a releases feature, but I'm using bitbucket	03:22
igemnace	simply provide them a download link for the binary	03:23
	if you want deterministic versioning, tag the commit where you build the binary from	03:24
Kobaz	what color config is for this line item on git add -p? Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]? ^C	03:24
	it's showing up dark blue on my black background console and it's almost impossible to read	03:25
Aash	igemnace: Ah cool, didn't know about tagging commits	03:28
	→ chachasmooth_ joined	03:28
	→ ribasushi joined	03:29
	→ akushner joined	03:30
	→ aznman joined	03:31
	← chachasmooth left	03:31
aznman	Hi, have a question - there's someone out there with a pull request for a project that i have as a dependency. it fixes an upgrade problem. https://github.com/GriddleGriddle/Griddle/pull/753 how can I merge in the changes?	03:32
	← rudi_s1 left	03:33
aznman	it's an open merge request...	03:33
	→ houami joined	03:34
igemnace	depend on the fork instead	03:34
	← akushner left	03:35
aznman	there is no fork looks like it's been deleted	03:35
	or something	03:36
	← endiruna left	03:36
igemnace	the fork the PR is coming from?	03:38
	→ mulvane joined	03:38
	← mulvane left	03:38
	→ mulvane joined	03:38
	→ phinxy joined	03:38
Kobaz	mmm, no one knows color configs? :(	03:39
	→ jtl_ joined	03:41
gxt	aznman: Not sure why GitHub does not autolink it, but you can see where the PR wants to merge from under the subject: "vakopian wants to merge 1 commit into GriddleGriddle:v0 from deepcontrast:react16", so you just go to the fork identified by deepcontrast:react16, which is https://github.com/deepcontrast/Griddle/tree/react16	03:42
aznman	thanks	03:43
	→ moei joined	03:44
	→ awkwardpenguin joined	03:46
	← mizu_no_oto left	03:46
	← awkwardpenguin left	03:46
gxt	Kobaz: Looking through man git-config real quick, it's probably color.interactive.prompt.	03:46
gitinfo	Kobaz: the git-config manpage is available at https://gitirc.eu/git-config.html	03:46
	→ awkwardpenguin joined	03:48
gxt	If it's not that one, just search the man page for <slot> and look around a bit.	03:48
Kobaz	yes!	03:49
	yay	03:49
	it's now yellow, i can see	03:49
	in all fairness the man page for git-config is 2600 lines	03:50
	if you don't know what you're looking for, it's an expedition	03:50
gxt	Well I had no idea what to look for either and just did /color :P but yeah	03:51
	Glad it works :)	03:51
Kobaz	me too	03:52
	← JoshuaD left	03:54
gxt	One of the first things I do after setting up a new box nowadays is adjust the console default colors so dark blue is light enough to be readable on black. The VGA default palette sucks for readability.	03:54
	And that way I don't have to fiddle with every program individually.	03:54
Kobaz	oooo	03:55
	right	03:55
	good idears	03:55
gxt	I think I based mine on http://dwarffortresswiki.org/index.php/DF2014:Color_scheme#Higher-visibility_scheme and tweaked it a bit so my tmux and dwm color schemes look nice together without putting a lot of work into it :P	04:00
	← testnick123 left	04:01
	← hash-z3r0 left	04:04
	→ juvenal_lunch joined	04:05
	→ hash-z3r0 joined	04:06
	→ orbyt_ joined	04:06
	← Amanas left	04:06
	→ ZyX-I joined	04:07
	← dsdeiz left	04:08
	← jcrites left	04:08
	→ dsdeiz joined	04:08
	← dsdeiz left	04:08
	→ dsdeiz joined	04:08
	→ ASP joined	04:09
	← ASP left	04:10
	→ menip joined	04:13
	← konsolebox left	04:14
	← maheshpec left	04:15
	← mmlb left	04:16
	→ konsolebox joined	04:16
	→ shripadr joined	04:18
	← Noldorin left	04:19
	→ nidr0x joined	04:25
	← upperdeck left	04:30
	→ upperdeck joined	04:33
	← ogny left	04:33
	← shaowei left	04:34
	← IanLiu left	04:34
	← noobineer left	04:42
	← ZyX-I left	04:47
	← guideline left	04:47
	→ imack joined	04:48
	→ shripadr_ joined	04:50
	→ shaowei joined	04:51
	← shripadr left	04:51
	→ katiex7 joined	04:54
	← Bigcheese left	04:56
	→ re1 joined	04:57
	← orbyt_ left	04:57
	← Murr left	04:57
	← Cabanossi left	04:57
	→ Bigcheese joined	04:57
	→ Murr joined	04:57
	→ Cabanossi joined	04:58
	← felixsanz left	05:02
	← pks left	05:02
	→ pks joined	05:04
	→ felixsanz joined	05:04
	→ dimi1947 joined	05:04
	→ yohnnyjoe joined	05:07
amosbird	Hi, what is "good first issue" ?	05:08
	← polyzen left	05:09
igemnace	if you're talking about the github label, it's simply a label for issues for people who want to try to fix their first issue and start contributing to open source	05:09
	← yohnnyjoe left	05:12
	← upperdeck left	05:14
amosbird	oh	05:14
	noob issue then	05:14
	thanks	05:14
	← Derperpe- left	05:14
	← gtristan left	05:15
	→ Derperperd joined	05:15
	→ upperdeck joined	05:15
	→ nchambers joined	05:19
nchambers	I just made a commit with a message I didn't mean to write. I haven't pushed it yet though. Is there a way to revert that commit?	05:19
	→ goweol joined	05:21
	→ polyzen joined	05:23
	← capadesu left	05:23
	→ zefferno joined	05:23
Kobaz	soooo	05:25
	what if i'm trying to make my local copy identical to remote	05:25
	and i'm doing a pull and have all kinds of merge conflicts	05:25
	but i don't care, i just want HEAD from the remote	05:26
nchambers	ah nmd found https://stackoverflow.com/a/927386/3784644	05:27
_ikke_	No need	05:27
	nchambers: git commit --amend	05:27
	→ Sarge945 joined	05:28
nchambers	oh	05:28
	I'll remember that for next time	05:28
	→ goweol1 joined	05:28
_ikke_	Kobaz: So you want to get rid of any local commits and their changes on that branch?	05:29
Kobaz	basically, yea	05:29
	→ cqi joined	05:30
	← Sarge9451 left	05:30
_ikke_	git reset --hard @{upstream} #!!! uncomitted changes will be gone and cannot be recovered through git	05:30
Kobaz	sounds good	05:30
	← goweol left	05:30
Kobaz	what if i have no upstream and it's a ssh checkout from another local repo	05:34
	ie: git pull server:foo/bar/ branch	05:34
	← goweol1 left	05:34
_ikke_	Kobaz: then git reset --hard FETCH_HEAD should work	05:35
	← nevodka left	05:39
	→ iamyask joined	05:39
	→ goweol joined	05:40
Kobaz	thanks	05:40
	another q... if i wanted to git diff my current working file (not commited) versus something upstream in remotes	05:40
_ikke_	It would be easier if you added it as an actual remote	05:41
Kobaz	if i do git diff file origin/2.0 myfile... it seems like it's doing comitted vs comitted	05:41
	← menip left	05:41
	→ Bin4ry joined	05:42
_ikke_	Kobaz: just git diff origin/2.0 myfile	05:42
Kobaz	hmm	05:42
	thyat's what i thought	05:42
_ikke_	Just tested it here, gives expected otuput	05:43
	output	05:43
	← nchambers left	05:43
Kobaz	i have local changes to filefoo	05:44
	← aznman left	05:44
Kobaz	and some of those changes are already in the remote filefoo	05:44
	← goweol left	05:44
Kobaz	if i do git diff origin/2.0 filefoo... it's showing + for changes i already have locally	05:44
_ikke_	git show origin/2.0:filefoo	05:44
Kobaz	yeah that shows the file	05:45
	i could > tmpfile and then do a local diff	05:45
	← jtl_ left	05:45
_ikke_	Kobaz: now try: git diff HEAD origin/2.0 filefoo	05:46
Kobaz	yay	05:46
	yeah that's it	05:46
_ikke_	now you are comparing to what's comitted	05:47
Kobaz	yeah i want to compare what i have that's uncommited, to what is, in the remote	05:47
_ikke_	but that's not what that last commit does	05:48
	HEAD is the current commit	05:48
Kobaz	hmm	05:48
_ikke_	sorry, last command	05:48
Kobaz	this doesn't make any sense	05:48
	if i do the diff without HEAD	05:49
	then it's showing + for stuff i already have	05:49
	oh, i need to diff the other way	05:49
	erm, reversing args doesn't like that	05:49
_ikke_	What do you want to see actually?	05:49
Kobaz	okay... so say we have two version, 1, and (2) the latest in origin... and somewhere between 1 and 2, some files got manually copied in	05:51
	and aren't comitted	05:51
	basically i want to see what's different between (2) and my local changes	05:51
	→ bkxd joined	05:51
	← bkxd left	05:51
	→ bkxd joined	05:52
Kobaz	generally what i do, is git stash	05:53
	git pull	05:53
	and fight with the resulting mess	05:53
	after a git stash pop	05:53
	← bkxd left	05:53
Kobaz	or i wind up backing up local files, and then locally diffing after	05:53
	→ bkxd joined	05:53
Kobaz	or, i make a copy of my local repo if it's going to be really bad, and then diff between the two	05:54
	→ menip joined	05:54
	→ FoxRocks joined	05:55
	→ goweol joined	05:56
_ikke_	Kobaz: When you diff your uncomitted changes to what the remote has, it's logical that you see your local changes prefixed with a +	05:57
	Because those are changes you added but the remote doesn't have yet	05:57
Kobaz	i was looking for the reverse direction	05:57
_ikke_	That would just show your local changes as removed, is that what you want?	05:58
Kobaz	yeah basically... what will my local files look like after the pull if nothing was merged	05:58
_ikke_	Kobaz: git diff -R origin/2.0 filefoo	06:00
Kobaz	oh cool so you can reverse it without going nuts with the ref paths	06:00
	← dsdeiz left	06:00
	→ nevodka joined	06:00
	→ dsdeiz joined	06:01
	← dsdeiz left	06:01
	→ dsdeiz joined	06:01
	→ regedit joined	06:01
	← upperdeck left	06:01
	→ upperdeck joined	06:02
	← schooner left	06:05
	← re1 left	06:06
	→ solaris joined	06:07
	← shaowei left	06:07
	→ shaowei joined	06:08
	→ schooner joined	06:08
	← dimi1947 left	06:10
	← matoro left	06:11
	→ matoro joined	06:11
	→ rajat joined	06:16
	← solaris left	06:17
	→ akushner joined	06:17
	← bkxd left	06:18
	→ solaris joined	06:19
	→ LocaMocha joined	06:20
	← menip left	06:22
	→ goweol1 joined	06:23
	← goweol left	06:24
	← madewokherd left	06:25
	← konsolebox left	06:25
	→ konsolebox joined	06:27
	← goweol1 left	06:28
	← solaris left	06:28
	← rajat left	06:29
	McKraken → McKraken_zzzzz	06:31
	→ ogny joined	06:31
	→ pirocks joined	06:33
	→ goweol joined	06:35
	→ KeyJoo joined	06:36
	← goweol left	06:37
	→ naiveai joined	06:37
	→ goweol joined	06:37
	← Wetmelon left	06:38
	→ bedouin joined	06:38
	← Bin4ry left	06:40
	→ oojacoboo joined	06:40
	← goweol left	06:42
	→ t0adst00l joined	06:44
	← ahrs left	06:47
	→ ahrs joined	06:48
	→ goweol joined	06:48
	→ ilyaigpetrov joined	06:50
	→ re1 joined	06:50
	← re1 left	06:51
	← t0adst00l left	06:52
	→ re1 joined	06:52
	→ bkxd joined	06:52
	→ meesles joined	06:53
	← bkxd left	06:53
	→ bkxd joined	06:54
	bedouin → megeve	06:54
	← bkxd left	06:54
	→ dimi1947 joined	06:55
	← pirocks left	06:55
	← dimi1947 left	06:56
	← Murr left	06:57
	→ Murr joined	06:57
	→ dimi1947 joined	06:57
	← shaowei left	06:58
	→ wxg joined	07:02
	← awkwardpenguin left	07:03
	→ awkwardpenguin joined	07:04
	→ bkxd joined	07:05
	→ solaris joined	07:06
	← tango_ left	07:06
	→ t0adst00l joined	07:07
	← goweol left	07:07
	→ yohnnyjoe joined	07:08
	→ tango_ joined	07:09
	← awkwardpenguin left	07:09
	← dave0x6d left	07:09
	← Arcaelyx left	07:10
	← bkxd left	07:10
	→ goweol joined	07:13
	← yohnnyjoe left	07:13
	← nidr0x left	07:13
	← g00s left	07:14
	← Copenhagen_Bram left	07:15
	→ dec0n joined	07:19
	← Cabanossi left	07:26
	← wxg left	07:27
	→ shaowei joined	07:28
	→ Cabanossi joined	07:28
	→ schleppel joined	07:29
	→ Wetmelon joined	07:31
	→ Silmarilion joined	07:31
	← schooner left	07:34
	→ tkore joined	07:35
	← solaris left	07:38
	→ elsevero joined	07:41
	→ abba joined	07:41
	← elsevero left	07:42
	→ bkxd joined	07:42
	← FoxRocks left	07:44
	→ marian1235813 joined	07:45
	→ ok91 joined	07:48
	← moei left	07:48
	→ ppang joined	07:48
	→ MACscr joined	07:49
	→ almighty joined	07:52
	← neil_cn left	07:52
	← ok91 left	07:53
	→ duderono_ joined	07:53
	← almighty left	07:53
	← duderonomy left	07:53
	← hash-z3r0 left	07:54
	→ dave0x6d joined	07:57
	→ chaosruler joined	07:58
	← t0adst00l left	08:00
	→ akkuvijay joined	08:00
	← howdoi left	08:00
	→ t0adst00l joined	08:01
	→ Copenhagen_Bram joined	08:02
	→ hash-z3r0 joined	08:03
	← Copenhagen_Bram left	08:04
	← mdk left	08:04
	→ xcm joined	08:04
	← MoziM_ left	08:05
	← akkuvijay left	08:06
	→ sz0 joined	08:06
	→ dviola joined	08:07
	← hash-z3r0 left	08:10
	→ Copenhagen_Bram joined	08:10
	→ hash-z3r0 joined	08:17
	→ JoshuaD joined	08:18
	← mooasaurus left	08:19
	→ mooasaurus joined	08:19
	← iamyask left	08:19
	→ CheckDavid joined	08:19
	← robattil1 left	08:26
	→ robattila256 joined	08:26
	← exotime left	08:28
	← hash-z3r0 left	08:28
	→ exotime joined	08:29
	→ hash-z3r0 joined	08:31
	→ wxg joined	08:31
	→ iamyask joined	08:32
	→ ma5ter joined	08:32
	← fatalhalt left	08:33
	← ma5ter left	08:33
	← meesles left	08:34
	→ rts-sander joined	08:36
rts-sander	hey how to have the git commit hash inside a comment of the commit itself?	08:37
grawity	you don't	08:37
	it's mathematically damn-near-impossible	08:37
	→ discopatrick joined	08:37
_ikke_	grawity: There is this gif that shows it's own MD5 hash :P	08:38
	→ masuberu joined	08:38
	← t0adst00l left	08:38
_ikke_	rts-sander: To elaborate: that commit hash is based on the contents of the commit, including the commit message	08:38
rts-sander	ah thought it would be cool but I guess it isn't easy	08:38
_ikke_	rts-sander: If you add the hash to the commit message, the hash would be different, invalidating the hash you added	08:39
rts-sander	yes so putting the commit hash in the code will change the commit hash	08:39
_ikke_	yes	08:39
grawity	"fixed point" looks like a relevant term	08:40
	https://stackoverflow.com/questions/235785/is-there-an-md5-fixed-point-where-md5x-x	08:40
	probably much easier with MD5	08:40
	→ _ADN_ joined	08:41
	→ cdown joined	08:42
	→ mdk joined	08:42
	← cqi left	08:43
_ikke_	grawity: I'm not sure if it's a fixed point	08:43
	grawity: because md5(x) == x is more narrow	08:43
grawity	yeah, it's not, since there's a lot of gif junk (or git junk) in the input	08:44
_ikke_	grawity: http://www.rogdham.net/2017/03/12/gif-md5-hashquine.en	08:44
	Section 3 shows it	08:44
	https://shells.aachen.ccc.de/~spq/md5.gif	08:45
	→ Bucciarati joined	08:47
	← safe left	08:48
	← chaosruler left	08:48
	→ chaosruler joined	08:49
	← xennn left	08:49
	← wxg left	08:51
	← kadoban left	08:53
	→ t0adst00l joined	08:54
	→ overlord_tm joined	08:56
	→ DevAntoine joined	08:58
	→ czart joined	09:00
	← hash-z3r0 left	09:00
	← xcm left	09:01
	← duderono_ left	09:02
	→ hash-z3r0 joined	09:04
	→ xcm joined	09:05
	→ tkore\work joined	09:05
	← dimi1947 left	09:05
	→ coumbole joined	09:06
	→ awkwardpenguin joined	09:06
	← hash-z3r0 left	09:06
	← shaowei left	09:06
	→ duderonomy joined	09:06
	← cdown left	09:07
	→ bbear joined	09:07
bbear	hello	09:07
	← chaosruler left	09:07
	→ chaosruler joined	09:08
	→ oxymoron93 joined	09:08
igemnace	o/	09:09
	→ yohnnyjoe joined	09:09
	← tkore left	09:09
	← awkwardpenguin left	09:10
	→ cdown joined	09:11
	← t0adst00l left	09:13
	← yohnnyjoe left	09:13
	← duderonomy left	09:14
	← imack left	09:14
	→ drewmcmillan joined	09:15
	→ duderonomy joined	09:16
_ikke_	ohai	09:17
	← drewmcmillan left	09:18
	← zefferno left	09:19
	→ Repox joined	09:19
	→ zefferno joined	09:20
	→ hash-z3r0 joined	09:20
	→ Darcidride joined	09:20
	← hash-z3r0 left	09:21
	← cdown left	09:23
	→ abba_ joined	09:25
	→ wxg joined	09:26
	→ Lyqyd joined	09:27
	→ Floflobel joined	09:27
	→ cdown joined	09:27
	← houami left	09:31
	← masuberu left	09:33
	→ mar77i joined	09:33
	← d-fence_ left	09:34
	→ d-fence joined	09:36
	→ imack joined	09:38
	← LichtMacher left	09:39
	← raijin left	09:40
kozy	I mistakenly amend previous commit, how can I split commit? any idea?	09:40
	→ ceda joined	09:40
	← ceda left	09:41
oxymoron93	git reset HEAD~ kozy	09:41
_ikke_	No	09:41
	git reset HEAD@{1}	09:41
	The former will just reset the commit, you have to redo both commits	09:41
kozy	very unfortunately previous commit also edit same file	09:41
	→ ok91 joined	09:41
kozy	correct anser THX!!!! _ikke_!!!!	09:42
	← Impaloo left	09:42
	→ Impaloo joined	09:43
	→ LichtMacher joined	09:43
	← Lyqyd left	09:44
	← wxg left	09:45
	← lyxus left	09:46
	← serialoverflow left	09:46
	→ serialoverflow joined	09:52
	→ pbrewczynski joined	09:52
	→ StOBlind joined	09:54
	← StOBlind left	09:55
	→ StOBlind joined	09:56
	← ppang left	09:56
	→ drewmcmillan joined	09:58
	← energizer left	09:58
	← igemnace left	10:06
	→ manuelschneid3r joined	10:07
	← megeve left	10:07
	← goweol left	10:07
	← dave0x6d left	10:09
	→ igemnace joined	10:10
	← chaosruler left	10:13
	→ chaosruler joined	10:14
	← chaosruler left	10:20
	→ chaosruler joined	10:20
	→ staafl_ joined	10:25
	← staafl left	10:26
	← shripadr_ left	10:27
	← regedit left	10:30
	→ thiago joined	10:32
	← a3Dman left	10:34
	→ MarioBranco joined	10:34
	← imack left	10:35
	→ a3Dman joined	10:37
	← jleclanche left	10:37
	→ jleclanche joined	10:38
	→ SteffanW joined	10:39
	→ imack joined	10:41
	→ Claw_wolf joined	10:41
	→ TomyLobo joined	10:42
	← zefferno left	10:44
	← vush left	10:47
	← iamyask left	10:49
	← a3Dman left	10:50
	← LichtMacher left	10:50
	← _ADN_ left	10:50
	← chaosruler left	10:51
	→ chaosruler joined	10:52
	← exotime left	10:57
	→ exotime joined	10:58
	← jleclanche left	10:58
	→ IanLiu joined	11:00
	→ marcelofr joined	11:01
	→ xaa joined	11:02
	→ yohnnyjoe joined	11:10
	→ tvw joined	11:11
	← tvw left	11:12
	→ tvw joined	11:12
	← yohnnyjoe left	11:15
	→ BSaboia joined	11:15
	← Kaisyu7 left	11:18
	← dviola left	11:18
	← ok91 left	11:20
	→ xD3C joined	11:21
	→ gyorb joined	11:21
	← exotime left	11:30
	→ exotime joined	11:31
	→ TheTachyon joined	11:35
TheTachyon	what would be the causes of git not being able to create a directory ? I'm trying to add a submodule to a private repo and it complains	11:36
	https://gist.github.com/xTachyon/7311f033d57f08f7ea7e82f0091ce4ee (ignore the folder name, it's just a test and I screwed it up a little)	11:37
	← tvw left	11:37
TheTachyon	nvm	11:39
	I screwed it up big	11:39
	← jimmyrcom left	11:39
TheTachyon	the syntax is submodule add url folder, but I was putting folder url	11:39
	← chaosruler left	11:40
	→ chaosruler joined	11:40
	→ houami joined	11:43
	→ wandering_vagran joined	11:45
	← cbreak left	11:46
	→ moei joined	11:49
	→ cur8or joined	11:49
	← xD3C left	11:51
	→ a3Dman joined	11:52
	← bluepixel left	11:54
	← sz0 left	11:57
	← MarioBranco left	12:01
	→ cbreak joined	12:03
	← beerdrop left	12:04
	→ masuberu joined	12:06
	→ LichtMacher joined	12:07
	← nanga left	12:08
	→ shripadr joined	12:09
	→ nanga joined	12:11
	← manuelschneid3r left	12:12
	← raynold left	12:15
	← mrBen2k2k2k left	12:16
	← bergice_ left	12:17
	→ Gurkenglas joined	12:21
	→ BSab joined	12:31
	← houami left	12:34
	← BSaboia left	12:36
	→ pylove joined	12:36
	→ beerdrop joined	12:40
	← ogny left	12:40
	← cdown left	12:42
	→ xD3C joined	12:45
	← CheckDavid left	12:48
	→ wxg joined	12:48
	← Repox left	12:52
	← katiex7 left	12:54
	→ m0viefreak joined	12:57
	← sunri5e left	12:58
	→ sunri5e joined	12:59
	← bkxd left	13:01
	→ schooner joined	13:07
	← Ionic left	13:07
	→ shinnya joined	13:08
	→ awkwardpenguin joined	13:09
	→ eduardas_m joined	13:10
	→ yohnnyjoe joined	13:11
	→ jcapinc joined	13:13
	→ Tobbi joined	13:13
	← awkwardpenguin left	13:14
	← yohnnyjoe left	13:15
	→ manuelschneid3r joined	13:16
	→ Phylock joined	13:19
	→ mrBen2k2k2k joined	13:19
	← sim590 left	13:23
	→ sim590 joined	13:25
	→ Gustavo6046 joined	13:27
	← naiveai left	13:31
	→ checkItOut_ joined	13:37
	→ fission6 joined	13:39
	← jcapinc left	13:43
	← coumbole left	13:45
	→ metts joined	13:54
	→ ok91 joined	13:55
	→ jnavila joined	13:56
	← xD3C left	13:57
	→ Es0teric joined	13:57
	← gxt left	13:59
	→ Amanas joined	14:01
	→ gxt joined	14:01
	→ phluks joined	14:04
	→ zarzar joined	14:08
	→ MeiR` joined	14:08
	← MeiR left	14:09
	← chrysa left	14:10
	→ guideline joined	14:11
	← Impaloo left	14:13
	→ Impaloo joined	14:13
	← wandering_vagran left	14:17
	← ok91 left	14:21
	← chaosruler left	14:23
	← Es0teric left	14:28
	→ xxMatiasxx joined	14:29
	→ Es0teric joined	14:30
	→ MarioBranco joined	14:31
	← jokajak left	14:35
	← xaa left	14:39
	McKraken_zzzzz → McKraken	14:43
	← overlord_tm left	14:44
	→ sammyo joined	14:45
	→ jokajak joined	14:47
	→ PioneerAxon joined	14:47
	← TheTachyon left	14:48
	← PioneerAxon left	14:48
	→ TheTachyon joined	14:48
	→ PioneerAxon joined	14:48
	← PioneerAxon left	14:49
	→ cdown joined	14:49
	→ PioneerAxon joined	14:49
	← PioneerAxon left	14:49
	→ boutcher joined	14:50
	→ PioneerAxon joined	14:50
	← PioneerAxon left	14:50
	→ PioneerAxon joined	14:50
	← sammyo left	14:53
	← pylove left	14:54
	← shinnya left	14:56
	← imack left	14:57
	← Murr left	14:57
	→ Murr joined	14:57
	← cdown left	15:02
	← xxMatiasxx left	15:03
	← cur8or left	15:05
	→ menip joined	15:05
	→ xxMatiasxx joined	15:06
	← xxMatiasxx left	15:06
	← Gurkenglas left	15:08
	← esc left	15:09
	→ esc joined	15:10
	← Aash left	15:11
	→ yohnnyjoe joined	15:12
	← wxg left	15:13
	→ BSabo joined	15:13
	← oxymoron93 left	15:14
	→ cdown joined	15:14
	← yohnnyjoe left	15:16
	← BSab left	15:17
	← rkta left	15:23
	→ wxg joined	15:24
	← abba left	15:26
	→ ResidentBiscuit joined	15:27
	→ rkta joined	15:28
	→ coumbole joined	15:28
	→ linuxmodder joined	15:28
	← abba_ left	15:30
	→ VoradorPT joined	15:31
	← jnavila left	15:35
	← KeyJoo left	15:37
	→ cdg joined	15:37
	← coumbole left	15:38
	→ jnavila joined	15:38
	→ coumbole joined	15:38
	← rkta left	15:38
	← PioneerAxon left	15:40
	→ imack joined	15:41
	← masuberu left	15:41
	← imack left	15:41
	→ rkta joined	15:44
	→ PioneerAxon joined	15:45
	→ wandering_vagran joined	15:46
	→ imack joined	15:46
	← wxg left	15:47
	→ Arcaelyx joined	15:49
	← menip left	15:49
	← schooner left	15:50
	← coumbole left	15:52
	→ eshlox joined	15:53
	→ tvw joined	15:55
	← imack left	15:55
	→ schooner joined	15:56
	→ db8093246 joined	15:56
	→ Praxi joined	15:56
	→ linuxmodder- joined	15:57
	← linuxmodder- left	15:57
	→ linuxmodder- joined	15:57
	← dec0n left	15:58
	← linuxmodder- left	15:59
	→ linuxmodder- joined	15:59
	→ Byteflux joined	16:00
	← linuxmodder- left	16:00
	→ _ADN_ joined	16:00
	← linuxmodder left	16:00
	→ linuxmodder- joined	16:01
	← linuxmodder- left	16:01
	→ linuxmodder- joined	16:01
	← linuxmodder- left	16:01
	← StOBlind left	16:06
	← cdown left	16:06
	← checkItOut_ left	16:07
	← gyorb left	16:07
	→ gyorb joined	16:09
	← tvw left	16:09
	← tkore\work left	16:13
	→ unreal joined	16:13
	← enkrypt left	16:14
	→ BSab joined	16:16
	→ cdown joined	16:16
	→ pkx2 joined	16:17
	← Byteflux left	16:17
	← TheTachyon left	16:17
	← _ADN_ left	16:19
	→ houami joined	16:19
	← BSabo left	16:20
	← xcm left	16:20
	→ xcm joined	16:21
	→ imack joined	16:22
	← clickjack left	16:23
	← ghost43 left	16:25
	→ clickjack joined	16:26
	← eduardas_m left	16:27
	→ enkrypt joined	16:28
	→ ghost43 joined	16:28
	← pkx2 left	16:31
	← cdown left	16:32
	← Tobbi left	16:33
	→ Puffball_ joined	16:34
	→ Tobbi joined	16:34
	← Puffball left	16:34
	← Es0teric left	16:35
	← marcelofr left	16:36
	← duckydan left	16:36
	→ kadoban joined	16:37
	→ menip joined	16:38
	→ skinux joined	16:39
skinux	This is probably a dumb question, but it there any way to make git verify which branch is intended when doing a commit?	16:39
_ikke_	skinux: verify in what way?	16:39
	skinux: How would git know what branch was intended?	16:40
skinux	Like, ask for key input confirmation that it's being commited to the right branch.	16:40
	→ vampire_vorador joined	16:40
skinux	Well, whichever was checked out last or whatever.	16:40
_ikke_	skinux: Is it that big of an issue?	16:40
skinux	For me it could be, I've lost a ton of changes before by committing/pushing to the wrong branch.	16:41
	So, if not, I'm gonna have to create another git repo	16:41
	← vampire_vorador left	16:41
	→ madewokherd joined	16:41
kadoban	skinux: That kind of thing doesn't tend to actually save you any mistakes. You'll just get used to hitting 'y' immediately every time.	16:41
skinux	Hmm.	16:42
	I don't do commits/pushes that often.	16:42
	I mean, it's not necessary that often for me.	16:42
_ikke_	skinux: How do you loose changes that way?	16:42
	← menip left	16:43
skinux	For example, I'm considering trying Vue for a project. However, I don't want to over-write React branch by mistake.	16:43
_ikke_	skinux: When just pushing, you never overwrite a branch	16:43
kadoban	skinux: Sure, but at worst after you realize you commited to the wrong branch, you can just cherry-pick the changes onto the correct one and revert it (or change history) on the "wrong" branch.	16:44
skinux	Oh, shit duh. I just need to learn how to revert.	16:44
	← VoradorPT left	16:45
skinux	Thank you.	16:45
	← skinux left	16:45
	→ xD3C joined	16:45
	→ tac-tics joined	16:46
	→ VoradorPT joined	16:48
	→ xxMatiasxx joined	16:49
	→ cdown joined	16:50
	← db8093246 left	16:51
throstur	does anyone here know how I can add a deploy key to an entire group in Gitlab? Instead of per-project?	16:53
	→ pkx2 joined	16:54
	→ overlord_tm joined	16:55
	→ Es0teric joined	16:55
	← cdg left	16:56
	← houami left	16:56
	← Es0teric left	17:01
	← Silmarilion left	17:01
	→ noobineer joined	17:02
	← noobineer left	17:02
	→ noobineer joined	17:03
	← noobineer left	17:03
	→ houami joined	17:03
	→ noobineer joined	17:03
	← leah2 left	17:05
	→ duckydan joined	17:06
	→ cdg joined	17:06
	→ dave0x6d joined	17:07
	← xxMatiasxx left	17:07
	→ xxMatiasxx joined	17:08
	← cdg left	17:10
	→ invisbl joined	17:11
	← xxMatiasxx left	17:12
	← imack left	17:12
	→ yohnnyjoe joined	17:13
	← akushner left	17:13
	← ShapeShifter499 left	17:13
	← shripadr left	17:14
	→ solaris joined	17:14
	→ leah2 joined	17:15
	→ xxMatiasxx joined	17:15
	→ cdg joined	17:17
	← yohnnyjoe left	17:17
	→ orbyt_ joined	17:20
ResidentBiscuit	#gitlab	17:21
	← cdg left	17:22
	→ Darcidride_ joined	17:22
	→ meesles joined	17:23
	← xxMatiasxx left	17:25
	→ xxMatiasxx joined	17:25
	→ cdg joined	17:26
	← qqx left	17:26
	→ qqx joined	17:26
	← SteffanW left	17:27
	→ oxymoron93 joined	17:28
	← xxMatiasxx left	17:28
	→ bluepixel joined	17:28
	→ xxMatiasxx joined	17:28
	← ResidentBiscuit left	17:28
	← planigan left	17:30
	← cdg left	17:30
	→ cdg joined	17:30
	→ cdg_ joined	17:30
	← xxMatiasxx left	17:30
	→ xxMatiasxx joined	17:31
	← tunekey left	17:31
	→ planigan joined	17:31
	← lagothri1 left	17:32
	← cdg left	17:34
	→ Cavallari joined	17:34
	← noobineer left	17:35
	← xxMatiasxx left	17:35
	→ xxMatiasxx joined	17:35
	← solaris left	17:38
	→ BSabo joined	17:40
	← houami left	17:42
	← BSab left	17:43
	← Kaisyu left	17:44
	→ _ADN_ joined	17:44
	→ Es0teric joined	17:44
	→ BSab joined	17:46
	← Claw_wolf left	17:46
	← BSab left	17:46
	← BSabo left	17:47
	← xxMatiasxx left	17:47
	→ BSab joined	17:48
	→ akushner joined	17:48
	← akushner left	17:49
	→ akushner joined	17:49
	→ [ADN] joined	17:50
	← BSab left	17:53
	← _ADN_ left	17:54
	→ mdugas joined	17:54
	→ lagothri1 joined	17:55
	← diogenese left	17:56
	← neunon left	17:56
	← LichtMacher left	17:58
	→ abhishekr700 joined	17:59
	← oxymoron93 left	18:00
abhishekr700	hi	18:01
	can we use GitHub gist to write small guides?	18:01
	→ neunon joined	18:01
	→ houami joined	18:03
	← houami left	18:08
	← Floflobel left	18:14
	← MarioBranco left	18:15
	→ KeyJoo joined	18:16
	→ raynold joined	18:18
	← cdown left	18:19
	→ houami joined	18:19
	→ notnull joined	18:20
	← [ADN] left	18:20
	→ Lyqyd joined	18:22
	← houami left	18:23
	brainpro1 → brainproxy	18:26
	→ ResidentBiscuit joined	18:26
oprypin	abhishekr700, yes. #github	18:27
	← overlord_tm left	18:29
	← Tobbi left	18:29
	→ dviola joined	18:29
	→ Tobbi joined	18:31
	← zarzar left	18:32
	← Copenhagen_Bram left	18:32
	← beerdrop left	18:34
	→ houami joined	18:34
	→ Copenhagen_Bram joined	18:38
	→ HElephant joined	18:38
	← Darcidride left	18:38
	← houami left	18:39
	→ ARoxdale joined	18:40
	← xeno left	18:40
	← phluks left	18:42
ARoxdale	I'd like to merge a very old branch while retaining the old branches history. I previously made a very messy commit in which the old branch was "merged", but using "git reset --hard" and this appears to have delted the old branch history completely.	18:43
	Is there any way of merging the head of the old branch in such a way that it will now point to this new commit while still remembering its own history?	18:43
	(I still have the old branch history as the merging was done on a temp branch) (This is my current story after some recovery)	18:44
madewokherd	you don't want any changes from the old branch, just the history?	18:44
ARoxdale	I think that is what I want. I'm not sure if this is possible.	18:45
madewokherd	git merge --strategy=ours	18:45
ARoxdale	My understanding is that git reset --hard makes the branch forget anything it knew previously and just points it to a totally new commit with its own history	18:45
oprypin	pretty much	18:46
ARoxdale	So I would: "git checkout newerbranch; git merge --strategy=ours olderbranch;"	18:46
madewokherd	yep	18:47
	→ nd_ joined	18:47
j416	ARoxdale: a branch is a pointer to a commit. git-reset merely moves that pointer, with optional side-effects.	18:47
	← because left	18:47
	→ beerdrop joined	18:47
ARoxdale	j416: I did some reading on that. I get it up to a point. But the process by which the history of a commit or a branch is recorded is opaque to me.	18:48
	→ because joined	18:48
j416	each commit has a reference to its parent commit(s).	18:49
	← nd left	18:49
oprypin	and branch is just a reference to a commit	18:49
j416	so a reference to a single commit is enough to get all commits leading up to that one.	18:49
ARoxdale	So a merge will create a new commit regardless?	18:50
j416	maybe.	18:50
	→ houami joined	18:50
ARoxdale	As in, I am merging at a point which is not the current head of the newer branch.	18:50
j416	if it creates a commit, that commit will be a regular commit except with two parent commits.	18:50
ARoxdale	I mean, that is what I'm trying to do.	18:51
j416	if the history is linear, i.e. not diverged, the merge (unless --no-ff is given) will simply be a reset to the tipnof the branch being merged, a so-called fast-forward merge.	18:51
	s/tipnof/tip of/	18:52
	→ boombatower joined	18:52
j416	sorry, I’m on a phone keyboard	18:52
ARoxdale	And if it's not linear?	18:52
	→ LichtMacher joined	18:52
j416	then there will be a commit	18:52
	that records the result of the merge	18:52
	← because left	18:52
ARoxdale	How do you then reintegrate a commit like that into a linear history which started at the newer branch head. I mean I have made (linear edits AFTER the point at which I wish to merge. How do I integrate the newer commit into this?	18:54
	← houami left	18:54
ARoxdale	The merge commit is like a grass blade at the bottom of a pole of commits.	18:55
	→ al-damiri joined	18:55
j416	has your history diverged?	18:55
ARoxdale	Could I just merge it with the branch at the top of the pole? (Sorry, I'm not clear on the proper git terminology)	18:55
	The history did not diverge from the point at which I wish to merge the old branch into. ... Let me try to come up with some proper names.	18:56
	I have a very old (> 6 month) branch "oldbranch"	18:56
	I created a new branch "newbranch" about 2 weeks ago and "git --reset" oldbranch to point to it.	18:57
	I later made edits to the newbranch.	18:58
	But the reset seems to have left newbranch with no idea of oldbranches history.	18:58
	→ because joined	18:58
ARoxdale	(oldbranch and newbranch actually had the same name when I originally did this)	18:58
	I'd like to create a proper history in the git log. As in, I want to properly merge (not reset) oldbranch into this newbranch.	18:59
	At the original point I made the manual insertion.	19:00
	→ raffo joined	19:00
ARoxdale	right now, I have a branch "mergepoint" whose head points to the commit at which I made the (git --reset) merge	19:00
	If I merge "oldbranch" into "mergepoint", can I then reintegrate the resulting commit into the linear history between "mergepoint" and "newbranch"?	19:01
j416	I’m not quite following, sorry	19:02
	draw an example?	19:02
	also, !backup	19:02
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	19:02
	→ fatalhalt joined	19:02
	← meesles left	19:02
ARoxdale	j416: How do I draw one and post it here?	19:03
	← ghost43 left	19:03
	→ frederfred joined	19:04
j416	draw an image, post a link?	19:05
	or draw ascii art arrows, post a link	19:05
	→ houami joined	19:05
j416	sorry for the hassle, just seems an image would explain this much easier	19:06
	→ dp joined	19:07
	→ ghost43 joined	19:08
	← wandering_vagran left	19:08
dp	Is there a way for "git diff" to only show me the difference between the files, and not show me the "--- a/current.txt +++ b/current.txt" portions (without resorting to piping to grep, etc) ?	19:08
j416	dp: --name-only or --stat	19:09
	oh, sorry, I think I misinterpreted that.	19:10
	← houami left	19:10
jrm	Does `git svn dcommit` read .subversion/config? I don't see anything in the git-svn man page, but I just did a dcommit to an svn repo and I'm not sure how the svn properties were set.	19:10
j416	dp: then it would be an incomplete diff — I doubt git will produce such a diff	19:10
dp	j416: possibly; I just want to see the changes without any status information.	19:11
ARoxdale	j416: https://gitirc.eu	19:11
	umm	19:11
j416	what for?	19:11
	@dp	19:11
ARoxdale	j416: http://pastebin.com/PRHkPC5C	19:12
dp	j416: I'm trying to display a change for a single file, in a way that someone who doesn't care about the rest of that information would use it.	19:12
ResidentBiscuit	A gui diff viewer might be better	19:12
j416	dp: hm. I would just give the diff as-is.	19:13
	→ yohnnyjoe joined	19:13
dp	--no-prefix does part of the work, but that only removes the "a/ b/" portions. I really just want no headers at all.	19:13
j416	ARoxdale: so you want to change the history so that oldbranch was merged in earlier?	19:14
ARoxdale	Yes	19:15
dp	j416: this will never be used for a patch or anything else. It is literally only to show the difference between the file and it's previous version. I guess I'm gonna have to go the grep route.	19:15
	→ SteffanW joined	19:15
	← invisbl left	19:15
j416	ARoxdale: possible of course, but you would have all commits after the mege point rewritten, and anyone with the current version of newbranch would have to rebase. Is that ok?	19:16
	mege -> merge*	19:16
	→ dimi1947 joined	19:17
	← exotime left	19:18
	→ exotime joined	19:18
	← yohnnyjoe left	19:18
	← xPucTu4 left	19:19
	← raffo left	19:19
	→ endiruna joined	19:21
	→ houami joined	19:21
	→ xPucTu4 joined	19:21
j416	ARoxdale: there are faster ways, but perhaps this is a pedagogical one: Create a branch pointing to the commit on newbranch into which you want fo merge oldbranch (git checkout -b branch-x <commit>). Merge oldbranch into this branch, fix the commit message to say the correct branch name.	19:22
	→ raffo joined	19:22
j416	check out newbranch and rebase it on branch-x. Fix any conflicts and make sure things still look good.	19:22
	← Darcidride_ left	19:22
j416	remove branch-x.	19:22
	→ cdown joined	19:23
j416	if newbranch exists on some remote, push. Since tvis alters history, you need to force push (git push --force). Be aware of the consequences if you do.	19:24
	ARoxdale: simple as cake?	19:24
	← houami left	19:26
ARoxdale	j416: It sounds reasonable. But the history of newbranch (since the merge) is itself deleted?	19:26
j416	Define deleted	19:26
ARoxdale	newbranch will not remember the commits made since the merge, though it will have the changes.	19:27
	It won't have a proper historical graph	19:27
	← cdg_ left	19:28
j416	what do you mean by proper?	19:28
	it will look as in you example, ”step 1”.	19:28
	your*	19:28
	← dp left	19:28
ARoxdale	It will? I propbably don't understand rebasing then. I thought rebasing was like a reset?	19:29
	← ghost43 left	19:29
	→ ghost43 joined	19:29
j416	take a backup, then try and see	19:29
	← endiruna left	19:30
ARoxdale	Oh. Rebasing is like pruning and regrafting on a different commit?	19:30
	← LocaMocha left	19:30
ARoxdale	I will try this	19:30
j416	be careful though, the result of a rebase always needs to be checked for semantic conflicts.	19:31
ARoxdale	semantic conflicts?	19:31
	→ sanscoeur joined	19:31
ARoxdale	As in, what is semantic?	19:31
	tags and such?	19:32
j416	prune and graft means something else in git terminology, but if I understand you correctly, then yes.	19:32
	do you know what a merge conflict looks like?	19:32
ARoxdale	To be honest, all I know is that it inserts the "<<<<<<<<" and ">>>>>>>" markers everywhere and breaks visual studio until the merge is aborted. I thinki i've fixed a conflict once or twice. But since the merge used "--ours", surely the rebase won't give rise to any issues?	19:34
j416	that is a syntactic conflict. Semantic conflicts can still exist even though git thought a merge (or rebase) went well. Syntactically everything may check out fine, ut semantically things may have changed, causing compilation errors or other more subtle errors.	19:34
	→ paul424 joined	19:34
j416	be sure to check, anyway.	19:34
	doesn’t hurt.	19:34
ARoxdale	I'll make new branch points and diff the results.	19:35
	branches	19:35
j416	I make it a habit to inspect every single commit after rebasing, and I run the test suite on each commit.	19:35
ARoxdale	make new branches. Placeholders.	19:35
j416	Rebase is handy, but needs caution.	19:35
	perhaps in your case it’ll be fine. But the more reason to check then — it’ll be a very quick check.	19:36
	→ houami joined	19:36
	→ endiruna joined	19:37
	→ xxMatiasxx joined	19:37
	← Cavallari left	19:38
ARoxdale	OK. I ran the first merge. A new commit was created and branch "mergepoint" now points to it. But "oldbranch" is still pointing to where it was.	19:38
j416	just reset that to newbranch	19:38
ARoxdale	Because mergepoint is remembering the history?	19:39
	Commits/whatever	19:39
j416	mergepoint is a commit	19:39
	it knows its parents.	19:39
ARoxdale	It's a branch actually. Sorry about the confusion. I'm using that as a temporary branch	19:39
	I though merge made both branches end up pointing to the same commit?	19:40
	Oh. It doesn't. Never mind.	19:41
	(git is very confusing)	19:41
	I will try the rebase now.	19:41
j416	Merge only affects the branch you are currently on.	19:41
ARoxdale	(after I make placeholder branches)	19:41
	← houami left	19:42
j416	This is the default in most git commands.	19:42
ARoxdale	So you need to do a merge from the old branch to really get them to point to the same commit?	19:42
	← Es0teric left	19:42
ARoxdale	This is an aside question, but how would you get them to both point to the same commit?	19:42
	→ Es0teric joined	19:42
j416	I told you above.	19:43
ARoxdale	No, I mean for a very generic merge. Not in this case. Just in general. Is there a "proper" way to do it, or should you not actually bother?	19:43
	← drewmcmillan left	19:44
	→ Mike11 joined	19:45
	← cdown left	19:45
	← discopatrick left	19:46
	→ bergice_ joined	19:47
ARoxdale	Considering the awkwardness of a rebase, should I just merge the current merge into the head of newbranch? I take it that newbranch will then "remember" the oldbranch commits somewhere far down in its history?	19:48
j416	depends on what result you want ¯\_(ツ)_/¯	19:49
ARoxdale	I really just want the commits to appear in roughly chronological order	19:50
	When you run "git log newbranch"	19:51
	At the moment, that log doesn't contain anything on oldbranch	19:51
ResidentBiscuit	Merging gives you the "truest" history. Though it's going to lead to a history riddled with merge commits. The approach I've used at every job has been to rebase dev branches onto master/whatever branches while working to pull in the latest changes, then merge when from dev branches into master when done	19:51
	→ houami joined	19:52
	← schleppel left	19:53
ARoxdale	It's a "true" history I suppose, but only of git merging screwups.	19:54
	← Lyqyd left	19:54
ResidentBiscuit	I don't think there's any way to interleave commits from different branches in such a way that they appear in chronological order	19:55
	At least not easily	19:55
ARoxdale	What way do commits appear in the log? When you get down to a commit with two parents, which backbranch gets displayed?	19:56
	→ npgm joined	19:56
	← houami left	19:56
	→ cdg joined	19:57
	← endiruna left	19:57
	→ energizer joined	19:57
ARoxdale	I'll just merge. I've already pushed the history I'm trying to rebase anyway. Really the main thing is to integrate the oldbranch history properly.	19:58
	Really just integrate it at all.	19:58
ResidentBiscuit	What is "proper"?	19:59
ARoxdale	(Really I just need to call time on this, and leave it in the annals as a question for git technical interviews)	19:59
ResidentBiscuit	I missed most of the beginning of this conversation so I don't know what exactly you're after	19:59
ARoxdale	ResidentBiscuit: I am not fully sure, but certainly one factor is that the commits in oldbranch should appear somewhere in the git log of the newbranch.	20:00
	Hang on	20:00
	ResidentBiscuit: : http://pastebin.com/PRHkPC5C	20:00
ResidentBiscuit	`git checkout oldbranch; git rebase newbranch; git checkout new branch; git merge oldbranch`	20:00
	← ilyaigpetrov left	20:00
	← xcm left	20:03
	→ xcm joined	20:04
ResidentBiscuit	https://pastebin.com/RQenwcrn Is this not ok?	20:04
	→ katiex7 joined	20:04
	→ sanscoeu_ joined	20:05
ARoxdale	ResidentBiscuit: ....No. The mergepoint was a very manual edit which required additional changes to the newbranch("master" branch). The oldbranch edits can't be applied after the mergepoint.	20:05
	→ raijin joined	20:05
	→ Enphuego joined	20:06
ResidentBiscuit	This makes no sense. Why does old branch need to be merged right there? According to this diagram, it has no relationship to any of these commits.	20:06
	Can newbranch be messed with at will?	20:07
	→ houami joined	20:07
	← sanscoeur left	20:08
	← sanscoeu_ left	20:08
	→ fstd_ joined	20:08
	→ sanscoeur joined	20:08
ARoxdale	On the git log, oldbranch indeed has no realtionship. But facturally that is incorrect. The mergepoint was a manual integration of the oldbranch changes into the newbranch. It was manual because the dealing with merge conflicts was too big a step for me at the time. (I'm working on visual studio, and effectively it hates git)	20:09
ResidentBiscuit	Oh, so you've purposefully gimped yourself. Someday people will learn that the git cli is not some scary beast. Every git issue I've ever dealt with has been the cause of GUIs.	20:10
	What exactly is mergepoint then?	20:10
	Have all the changes from oldbranch been integrated at that point?	20:10
	→ Shah1 joined	20:11
ResidentBiscuit	Just manually, so no git log to keep track of it	20:11
	← fstd left	20:11
	fstd_ → fstd	20:11
	→ Forlorn joined	20:12
	← houami left	20:12
Forlorn	Hi, is it possible to change the root repository directory for git-shell via ssh?	20:12
	← rkta left	20:12
Forlorn	git clone git@server:test.git , should clone from /home/git/repositories/test.git and not /home/git/test.git.	20:13
	→ eikhorst joined	20:14
	→ pirocks joined	20:15
	→ rkta joined	20:15
Forlorn	the server's user named git is setup with git-shell, and has two directories in its home dir, namely repositories and git-shell-commands.	20:15
	I have migrated from gitolite to plain git-server	20:16
ResidentBiscuit	ARoxdale: https://pastebin.com/UuGWxBy7 ?	20:16
bremner	Forlorn: why?	20:16
Forlorn	bremner, to what?	20:17
bremner	the migration, out of curiousity	20:17
	← jokajak left	20:17
	← eikhorst left	20:17
Forlorn	bremner, more control	20:17
	→ db8093246 joined	20:17
	← Gustavo6046 left	20:18
ARoxdale	ResidentBiscuit: It was a very old branch. It was branched off master at an older commit. The edits were a brand new directory in the codebase mostly, but it was using the older code directories for the most part, with a few alterations. There were hundreds of merge conflicts. I made an executive decision at the time.	20:18
ResidentBiscuit	Then why do you even care about the commit history of that branch?	20:18
Forlorn	bremner, now I can simply do: `ssh git@server init new_repo_name`, or `ssh git@server init fork new_repo_name fork_of_repo_name`.	20:18
ARoxdale	(which I now (somewheat) regret)	20:19
ResidentBiscuit	If you're going to manual merge, you've decided that you don't want git to keep track of the changes	20:19
Forlorn	bremner, s/init fork/fork/	20:19
	← Copenhagen_Bram left	20:19
ARoxdale	Because I thought at the time that you could remerge or rebase or something.	20:19
	Actually at the time I didn't really care about the commit history, but now it's something which is bothering me.	20:20
	git merging is not easy.	20:20
ResidentBiscuit	No merging is ever easy when you wait months to do it and resctructure the code	20:20
ARoxdale	Also I use the command line exclusively.	20:20
	← tac-tics left	20:21
	← nanga left	20:21
j416	it actually is simple.	20:21
ARoxdale	ResidentBiscuit: That was literally the way the old branch had to be done.	20:21
	It was originally based off a 3+ year old commit.	20:21
ResidentBiscuit	That is the issue	20:21
	You should never have 3 year old branches sitting around that you expect to merge	20:22
	In any vcs	20:22
j416	the issue is that you are trhing to save time by taking shortcuts to learning. Then you spend many times more time trying to fix issues along the way.	20:22
ARoxdale	The branch is only six months old. The commit was 3 years old. But that was the only place the feature could be developed on.	20:22
	→ jokajak joined	20:22
	→ Copenhagen_Bram joined	20:22
j416	spend two full really learning git, if you plan to use it daily. time well spent. I promise.	20:22
	er, two full days*	20:23
	→ nanga joined	20:23
	← nanga left	20:23
	→ nanga joined	20:23
ResidentBiscuit	https://git-scm.com/book/en/v2 Read the first three chapters	20:23
ARoxdale	Surely this is a fairly common occurance. An atrophied feature branch needing to be reintegrated into an updated master branch or something	20:23
j416	phone kbd not optimal	20:23
ResidentBiscuit	Covers everything you need to know day to day	20:23
ARoxdale	j416: Any good tips for learnign rresources?	20:23
	ResidentBiscuit: Thanks	20:23
j416	ARoxdale: what ResidentBiscuit linked is good.	20:23
ResidentBiscuit	If I ever come across a branch that's been sitting around for months and it needs to be reintegrated, I expect a lot of work to make that happen	20:24
	That's why I reintegrate often	20:24
	→ drewmcmillan joined	20:24
ARoxdale	It's a distributed project.	20:24
ResidentBiscuit	Meaning what?	20:25
j416	if you are a video kind of person, look for "git happens" by Jessica Kerr. There are at least two. Pick the one where she uses post-its. Apartfrom when she says each commit is represented as a patch (or something like this), it is a great intro video.	20:25
ARoxdale	ResidentBiscuit: Lots of people work on in, on the projects its based on, on and off, coming and going.	20:26
ResidentBiscuit	So, totally normal development?	20:27
	← Shah1 left	20:27
ResidentBiscuit	Doesn't mean you can't reintegrate often. The start to my day everyday is rebase my code onto whatever branch I'm based on	20:27
ARoxdale	The component I was working into the project is 20 years old.	20:28
j416	^ this I do several times per day. Sometimes several timrs per hour, depending on the project.	20:28
ResidentBiscuit	I don't understand how age of the project matters. I've worked on stuff that age and older	20:28
	→ aielima joined	20:29
	← mdugas left	20:32
	→ Shah2 joined	20:34
	← hdon left	20:34
	← fission6 left	20:34
	→ hdon joined	20:34
ARoxdale	I could only integrate it in at the time at an older commit of the master branch. No-one else was able to get the then current head to compile. It's a very, very long story. It involves Visual Studio, makefile scripts, submodules, server issues, debug builds, and a hard disc failure at one point. It suffices to say that it was required to reintegrate a very "old" branch back into the master branch recently, and	20:36
	the task of doing this was made much easier by not involving version control intitially. I know that sounds foolish, but version control doesn't really "agree" with the kind of merge I was doing. Probably if I knew a lot more git, but here I am. I'll do the merge instead of the rebase. It still allows people to figure out what went on.	20:36
	← skylite left	20:36
	→ skylite joined	20:38
	→ houami joined	20:39
ARoxdale	When I merged the merge, git reported "Already up to date!" "Merge made by the 'recursive' strategy". Is this likely to be good or bad?	20:40
	← azerus left	20:41
	← paul424 left	20:42
	← houami left	20:43
	← raffo left	20:43
	→ azerus joined	20:45
	← czart left	20:46
	→ tac-tics joined	20:48
	← pirocks left	20:50
	← aielima left	20:51
	→ ZyX-I joined	20:51
	→ aielima joined	20:51
	→ discopatrick joined	20:54
	→ houami joined	20:54
	→ concerti joined	20:55
	→ raffo joined	20:56
	→ jimmyrcom joined	20:59
	← houami left	20:59
	← akushner left	21:04
	← SteffanW left	21:04
	→ cdown joined	21:05
	→ pirocks joined	21:07
	→ houami joined	21:10
	← houami left	21:14
	→ yohnnyjoe joined	21:14
	← manuelschneid3r left	21:16
j416	ARoxdale: check log.	21:17
	← orbyt_ left	21:18
	← yohnnyjoe left	21:19
	→ bkxd joined	21:19
	→ henriquev joined	21:21
	→ xeno joined	21:24
	→ houami joined	21:25
	← exotime left	21:26
	← dimi1947 left	21:26
	← schooner left	21:26
	→ exotime joined	21:26
ARoxdale	j416: It behaves more or less as expected. The git gui graph is not what I'd prefer, but that's not an essential issue right now.	21:26
j416	how is it wrong?	21:27
	← M6HZ left	21:27
	→ M6HZ joined	21:28
	→ manuelschneid3r joined	21:29
	← BenderRodriguez left	21:29
	← houami left	21:30
	← abhishekr700 left	21:32
	→ chaosruler joined	21:32
	← enkrypt left	21:34
	→ akushner joined	21:35
	← WhitePhosphorus left	21:37
	→ schooner joined	21:38
	← frederfred left	21:39
	→ the_f0ster joined	21:39
	← giraffe left	21:39
	← midnightmagic left	21:39
	← blackwell left	21:39
	← cjohnson left	21:39
	← parsnip left	21:39
	← ses1984 left	21:39
	← brainproxy left	21:40
	→ cjohnson joined	21:40
	→ parsnip joined	21:40
	→ houami joined	21:41
	← schooner left	21:41
	→ WhitePhosphorus joined	21:43
	→ blackwell joined	21:43
	→ ses1984 joined	21:43
	← houami left	21:45
	→ midnightmagic joined	21:45
	→ schooner joined	21:46
	← cdown left	21:46
	→ giraffe joined	21:47
	→ enkrypt joined	21:47
	→ brainproxy joined	21:50
	→ xaxxon joined	21:54
ARoxdale	j416: The graph isn't wrong. It just puts the older commits higher up on the tree. It's not an issue. The git log is in chronological order and hass the older commits.	21:54
	← Tobbi left	21:55
	← metts left	21:56
	→ schleppel joined	21:56
	→ houami joined	21:56
	← houami left	22:01
	→ CheckDavid joined	22:02
	← schooner left	22:08
	→ QualityAddict joined	22:08
	→ IanLiu_ joined	22:10
	→ masuberu joined	22:10
j416	ARoxdale: when viewing a flat log, you can choose whether to sort it topologically (--topo-order) or chronologically (--date-order)	22:11
	← jnavila left	22:11
	→ houami joined	22:12
	← IanLiu left	22:12
	IanLiu_ → IanLiu	22:12
	← Es0teric left	22:14
	→ orbyt_ joined	22:15
	← nevodka left	22:16
	← houami left	22:16
	→ nevodka joined	22:16
	→ fxfitz joined	22:20
fxfitz	Does anyone know of a way to search the git history of a file to find the revision where that file has a certain hash?	22:20
	→ TheWild joined	22:21
	→ dege joined	22:22
henriquev	Say I have a git repository on "/project". Also, a second git repository on "/project/foo". I want to add a file on "/projects/foo/bar/xyz", but I get the error message (check_embedded_repo) about submodules. Is there a way to overcome this and force git to add?	22:23
	PS: I am abusing git as a transport layer and create/remove my git repository fast. And I am using GIT_DIR. I wouldn't like to copy files to a temporary directory to overcome this issue as it would create others. Is there a way for me to force adding a file even though there is an inner .git on the way?	22:23
	← Copenhagen_Bram left	22:26
	← Praxi left	22:26
	→ pirx joined	22:26
m0viefreak	--no-warn-embedded-repo ?	22:26
	→ Gustavo6046 joined	22:27
	→ houami joined	22:27
henriquev	@m0viefreak, the problem is that I need to have the contents of the file commited. Not a reference like "+Subproject commit 862a4d2b1aee49867c4cfb2f1879342510cec48c".	22:28
	→ metts joined	22:28
	← mattcen left	22:29
	← houami left	22:32
m0viefreak	if "foo" is already a submodule, you can't add files in that directory to the outer repo	22:32
	if "foo" is just another completely independent repo that happens to be located there, adding files to the outer repo will work just fine	22:32
	→ lyxus joined	22:34
	← lyxus left	22:34
	→ Copenhagen_Bram joined	22:35
j416	fxfitz: for rev in $(git rev-list HEAD); do git ls-tree -r $rev \| grep -q <blob hash goes here> && git log -1 --oneline $rev; done	22:35
	maybe.	22:35
	← bkxd left	22:35
	← ixian left	22:35
fxfitz	j416: nice! I'll give it a shot and adjust as/if needed! Thanks!	22:36
j416	\^^/	22:36
fxfitz	Note: I'm doing this on the linux repo, sooooo tons of history	22:36
j416	it should be quite fast	22:36
	→ shinnya joined	22:37
	→ mattcen joined	22:38
m0viefreak	if you know the path you could use git log --format %H --follow <path>	22:38
	instead of just git-rev-list	22:39
	should be a bit faster	22:39
fxfitz	Hmm `fatal: ambiguous argument '%H': unknown revision or path not in the working tree.`	22:40
	← thiago left	22:40
j416	you need to say --format=%H	22:40
	I think	22:40
fxfitz	That was it!	22:41
m0viefreak	oh, yeah	22:41
j416	skipping merges could also be sane	22:41
	→ houami joined	22:43
	← xaxxon left	22:43
	→ xaxxon joined	22:44
	→ brainpro1 joined	22:44
	← gyorb left	22:45
	← brainproxy left	22:46
	← houami left	22:48
	→ goweol joined	22:53
	← ResidentBiscuit left	22:53
	→ goweol1 joined	22:54
henriquev	@m0viefreak the weird thing is... If I create a new repository inside it, it works like a charm. However, if I clone a repository (say, from GitHub) and do it, I get this error.	22:55
	← xxMatiasxx left	22:56
	← goweol left	22:57
	← Murr left	22:57
	→ Murr joined	22:57
	→ houami joined	22:58
	← chaosruler left	23:01
	→ webdev007 joined	23:01
	→ thiago joined	23:02
	← webdev007 left	23:02
	→ webdev007 joined	23:03
	→ jstein_ joined	23:03
	← houami left	23:03
	jstein_ → jstein	23:03
	→ cdown joined	23:06
henriquev	Example: https://gist.github.com/henvic/09ae8d959d389d8ad2997f9de7838d6d	23:07
	← raijin left	23:08
	← xD3C left	23:10
	→ xD3C joined	23:10
	← a3Dman left	23:11
	← azerus left	23:12
	→ xxMatiasxx joined	23:12
	→ houami joined	23:14
	→ daemon joined	23:15
	→ g00s joined	23:15
	→ yohnnyjoe joined	23:15
	← cdg left	23:15
daemon	hey all could anyone explain to me why my git is adament I must enter my username and password everytime I clone or commit any changes to a github repo (the ssh -T [email@hidden.address] test returns): Hi <MYUSERNAME>! You've successfully authenticated, but GitHub does not provide shell access.	23:16
	so my pubkey is write and my global email and username is correct also	23:16
	i.e. matches my profile	23:16
	→ azerus joined	23:16
	→ ok91 joined	23:16
daemon	right* even	23:16
	I also ntpdate'd the system incase that was an issue, it was only 6 seconds out; but even so yes all correct too	23:17
	→ YuGiOhJCJ joined	23:17
daemon	git was compiled with the following options: https://i.itsosticky.com/11ilw1m.png	23:18
	← YuGiOhJCJ left	23:19
	← houami left	23:19
	← mattcen left	23:19
	← schleppel left	23:21
	← ok91 left	23:21
tang^	daemon: you cloned with an SSH URL?	23:21
daemon	tang^, indeed	23:21
	not the https	23:21
	same as I do on a bunch of other systems and its just this ONE system demanding I give a username and password	23:21
	→ a3Dman joined	23:22
	→ Kaisyu joined	23:22
	→ awkwardpenguin joined	23:22
tang^	correct ownership and permissions on ~/.ssh and its contents?	23:22
	→ mattcen joined	23:23
daemon	tang^, indeed, the ssh -T [email@hidden.address] would fail other wise	23:23
	or at least warn	23:23
tang^	hmm, there is a switch you can use inline to increase verbosity of ssh while git is connecting	23:24
	don't recall off the top of my head, though	23:24
daemon	its fine I rarely send anything from that machine its more a deployment target so does more pulls than pushes	23:25
	just seems really weird	23:25
tang^	that it does	23:26
thiago	daemon: pastebin the output of GIT_TRACE=1 git fetch	23:26
	you can Ctrl+C the moment it asks for the password	23:26
	← sentriz left	23:27
daemon	https://paste.ee/p/wm8gX	23:27
thiago	daemon: https	23:27
tang^	https	23:27
daemon	https	23:27
	what I am sure I cloned it using ssh	23:28
thiago	git remote -v. Does it list two different URLs?	23:28
daemon	and no terminal history fantastic	23:28
	← TheWild left	23:28
	← db8093246 left	23:28
tang^	you can always change the remote to ssh though	23:28
daemon	thiago, it does I wonder if I added it twice or something	23:28
thiago	right, git remote set-url origin <new url>	23:28
	the same URL twice or two different URLs?	23:29
daemon	tang^, my apologies for that, I honest to god thought I had only added the ssh	23:29
	← awkwardpenguin left	23:29
daemon	thiago, two different	23:29
	← notnull left	23:29
tang^	daemon: no big deal	23:29
thiago	ok, so either you set up two different URLs or you have a URL rewrite on	23:29
tang^	it happens	23:29
thiago	check the output of git config --global --lit	23:29
daemon	thiago, its ok I will just flatten it and re clone it correctly	23:29
tang^	--list	23:29
	→ tvw joined	23:30
tang^	meh, just use remote set-url to change both to ssh	23:30
daemon	thank you for the help you two :) once again my apologies for such a silly mistake	23:30
thiago	setting the URL won't help if there's a rewrite on	23:30
	← cdown left	23:31
tang^	oh? okay	23:31
	never had it on myself, then	23:31
daemon	it worked this time, all good ;)	23:31
thiago	ok, great	23:32
daemon	there is a chance something weird happened to this one once upon a time; its a long running project and this particular dusty old machine has been sat since the start of it	23:32
	mainly because its only usage is for testing perl/poe scripts on freebsd and the project is c#/python (sometimes you just need perl to do something in a pinch) ;)	23:33
	← Gustavo6046 left	23:34
	→ Gustavo6046 joined	23:34
	→ current_user joined	23:36
	← Copenhagen_Bram left	23:37
	→ Noldorin joined	23:38
	← __main__ left	23:40
	→ Copenhagen_Bram joined	23:40
	← a3Dman left	23:40
	← Phylock left	23:41
	← metts left	23:41
	← the_f0ster left	23:41
	← ARoxdale left	23:41
	← pbrewczynski left	23:42
	← xxMatiasxx left	23:42
	← cliluw left	23:43
	→ xxMatiasxx joined	23:43
	← Noldorin left	23:44
	→ cliluw joined	23:45
	← KeyJoo left	23:45
	→ houami joined	23:45
	→ sanscoeu_ joined	23:46
	← xxMatiasxx left	23:47
	→ Cheeky-Celery joined	23:49
	→ Noldorin joined	23:49
	← houami left	23:49
	← sanscoeur left	23:50
	← sanscoeu_ left	23:51
	→ xxMatiasxx joined	23:51
	← xaxxon left	23:54
	→ xaxxon joined	23:55
	← al-damiri left	23:55
	← masuberu left	23:57
	→ houami joined	23:57
	→ bkxd joined	23:58
	→ a3Dman joined	23:58
	← bkxd left	23:59

Logs Search ←Prev date Next date→

Channels Documentation