IRCloggy #git 2019-04-23

Provider of IRC logs since 2005.

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

	2019-04-23
	← welovfree left	00:00
	→ welovfree joined	00:00
	← welovfree left	00:00
vishal	its not so much the number of files - more about workflow. If you think a branch is best suited - sure. But I don't quite follow what you mean about 'apply branch X on branch y'	00:00
	← de-facto left	00:01
vishal	I don't know of such a primitive in git :)	00:01
	← jottr left	00:01
	→ de-facto joined	00:01
	→ TJ- joined	00:01
vishal	.. but I also don't know anything about your project, and if you have a way that works for yuou, all good!	00:02
velix_home	I mean. I want to "apply" the files from backend/pdf to develop to create a new release version.	00:02
	vishal can't get his head around what 'applying'; means here	00:02
velix_home	When "develop" changes in future, I will apply backend/pdf again on it to create the new release version.	00:02
	Sorry, I'm not native.	00:03
	I want to overwrite soem files from branch "develop" with all the files from branch "backend/pdf".	00:03
vishal	no worries - is it say just a script to generate some pdfs to be included in the release?	00:03
velix_home	vishal: Sure, but I thought, I could do it with a pull request or something to keep track on it in GIT.	00:04
dodobrain_	seems to me that he just wants to merge the pdf branch into the dev	00:06
	← yyy left	00:06
dodobrain_	so whatever new pdfs have been added or existing ones that have been changed get into the eventual release from the dev branch	00:06
	velix_home, is this what you meant by 'apply' ?	00:06
velix_home	yes	00:07
	← manuelschneid3r left	00:07
velix_home	I want to mix the latest dev with the latest PDF to create a release.	00:07
vishal	ah sounds like a merge then	00:07
	xcm → Guest14056	00:16
	← Guest14056 left	00:16
	→ xcm joined	00:16
	← reactormonk left	00:19
	← bergercookie left	00:22
	→ orbyt_ joined	00:23
	→ mat001 joined	00:25
	→ scivola joined	00:30
	→ qassim joined	00:31
	→ jab416171 joined	00:33
	← mat001 left	00:33
	← dre_ left	00:34
	→ learningc joined	00:34
	→ fphilipe_ joined	00:34
	→ jottr joined	00:35
	→ ashka` joined	00:38
	← duderono_ left	00:38
	← ashka left	00:39
	ashka` → ashka	00:39
	→ keepLearning512 joined	00:43
	← al-damiri left	00:47
	← jottr left	00:47
	← orbyt_ left	00:47
	← Tawonga left	00:48
	→ Tawonga joined	00:48
	← TJ- left	00:52
	→ ferdna joined	00:53
	→ fatalhalt joined	00:54
	← keepLearning512 left	00:59
velix_home	Can I merge an orphaned branch into an existing one at all?	01:01
rafasc	You can.	01:01
	→ thiago joined	01:01
velix_home	okay, let me try it.	01:01
rafasc	git will complain about unrelated histories, because most of the time merging orphan branches isn't something you want to do.	01:02
vishal	that would create multiple root commits right	01:02
rafasc	you can bypass it with --allow-unrelated-histories	01:02
	well, not create per se, as the roots are already created.	01:03
vishal	ah true	01:03
rafasc	but yes, your history will contain more than one root.	01:03
	after the merge.	01:03
	→ thebope joined	01:04
rafasc	velix_home: may I ask why you asked that?	01:04
velix_home	rafasc: I'm having a relative stable branch "backend/pdf", which needs to get merged into "dev" to create a release.	01:05
rafasc	why is that backend an orphan?	01:06
velix_home	Because it only contains some files, which are not in dev (password files etc.)	01:06
	→ finalbeta joined	01:07
rafasc	but if you merge it, those files would be accessible from dev. Is that what you want?	01:07
velix_home	rafasc: I'm creating a "release/demo_2019-04-23" first	01:07
	← fphilipe_ left	01:07
velix_home	a new branch, were both will get combined.	01:08
	→ navidr joined	01:08
velix_home	Background is that our frontend developer works on "dev", but doesn't have access to the database.	01:08
	So he's using his own local stuff.	01:08
	I need to patch/apply/merge/update this with the final stuff before making a release.	01:08
	Seems like it worked with --allow-unrelated-histories	01:08
rafasc	I don't know what you are doing, but be aware that once you give someone access to that merged branch, they'll be able to see all commits from both branches.	01:09
	Be sure you don't leak your password branch or w/e	01:10
vishal	sensitive information in a git repo is usually a bad idea.. !deploy might be relevant	01:10
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	01:10
velix_home	rafasc: it's not bad at all. He just cannot access the DB & server physically ;)	01:10
	rafasc: also, this is only connecting to pgbouncer with very limited rights.	01:11
	← Sasazuka left	01:11
rafasc	anyways, merging credentials doesn't seems like the correct thing to do.	01:11
velix_home	rafasc: credentials only was an example.	01:11
	There are 90 SVGs, 23 PDFs and 104 templates.	01:12
	he doesn't need those for development.	01:12
	→ orbyt_ joined	01:14
velix_home	rafasc: I've just removed the credentials.	01:14
	← F0rTex left	01:17
	→ dre_ joined	01:17
velix_home	rafasc: thanks 4 your input	01:17
rafasc	it was just unclear what you were doing.	01:17
	→ F0rTex joined	01:18
	← igemnace left	01:19
	← isBEKaml left	01:22
velix_home	I just want to split apart the workflow a bit. Right now, all the image data lies in the central "dev" branch. So whenever I'm editing an image, I'm changing the main dev branch (or I'm creating a new one and set a pull request).	01:22
	So I don't get into trouble with his work.	01:23
	The only problem now is that I can't raise pull requests between the orphaned branch and the dev	01:24
	← NightMonkey left	01:27
rafasc	state your original problem, because I am not sure how orphan branches solves a problem for you.	01:27
velix_home	There are two developers: me for backend, another guy for fronend.	01:28
rafasc	following so far.	01:29
	I am struggling but I think I can do it.	01:29
velix_home	I'm devops, so I'm doing the server administration, too.	01:29
	← kezimo left	01:29
velix_home	Right now, we're both working in branch "dev". There final product has a "demo" and a "release" version, which share the code of "dev", but have some changes.	01:30
	Those changes are always equal, f.e. different images in PDF backend, different colors etc.	01:30
	→ inkbottle joined	01:30
	→ pspace joined	01:30
pspace	Does anyone have any resources on merge methodologies for managing high volume changes into a downstream project?	01:31
velix_home	rafasc: I've created the orphaned branch to merge it with the DEV version to create the final product.	01:32
	rafasc: The DEV version only has a subset of the final backend code.	01:32
rafasc	but why an orphan branch?	01:33
	← voidSurfr left	01:33
velix_home	because it doesn't have any reference to existing code.	01:34
	I also could create a local directory and just copy & paste the stuff.	01:34
	(what I am doing right now).	01:34
	But that way, I could use "git merge" to merge it.	01:35
	→ fphilipe_ joined	01:35
rafasc	ok. I still have no idea of what you are doing.	01:35
	I hope you do.	01:35
	← lucasb left	01:36
rafasc	Because from what I've read, it gives me the impression that you want to cut out this branch at some point and "plugin" another in its place.	01:36
velix_home	I really can't understand, what you don't understand :(	01:36
rafasc	But that's not how git works.	01:36
velix_home	I'm creating a new branch from the developing branch and merging it with the data from backend/pdf	01:37
	That's the release branch.	01:37
	→ kezimo joined	01:38
velix_home	Here's an image: https://imgur.com/a/6hbC0z4	01:39
	develop is the main dev branch, then feature/area-score has been added today, where we worked on with.	01:40
	For testing, I've created a new local branch release/demo and merged content from new branch pdf/demo into.	01:40
	So I've got a release/demo branch with all the new content from latest feature of dev and the (near stable) branch release/demo.	01:41
	→ bambanx joined	01:43
	← orbyt_ left	01:45
velix_home	rafasc: ping?	01:47
	← warthog9 left	01:47
rafasc	and this pdf/demo branch is just a bunch of extra files that aren't needed anywhere else?	01:48
	← Tawonga left	01:48
rafasc	except for release(es)?	01:48
velix_home	exactly	01:48
rafasc	when you make another release, you'll merge that commit again?	01:50
velix_home	exactly	01:50
rafasc	why?	01:50
	why not leave it as part of the project then?	01:50
velix_home	Because there's lots of data in there, the frontend developer doesn't need. He can't do anything with the container processing backend for example.	01:51
	I mean, in web development it's common to split things apart and merge them for release.	01:51
	Typescript, javascript, CSS, HTML etc.	01:51
	→ wildlander joined	01:51
velix_home	it gets "built" in the final release for web when development is done.	01:52
	In the dev branch, there are several dummies right now, f.e. get_pdf is just a dummy which always sends the same PDF. Which is totally fine for development.	01:53
	I could throw in the whole backend of course, but then he needs a full stack for development.	01:53
	→ Bobdude joined	01:54
vishal	I tried to hint at separate, self contained repos before.. but I'm just glad I don't do web stuff :P	01:54
velix_home	what are "self contained repos" ?	01:55
vishal	like your front end repo will have the front end code, and anything necessary to mock things	01:55
	your backend repo, likewise	01:56
	your build/deployment system will have the things needed to pull in things from both of those, and also things like credentials	01:56
	and that will make the final deployment	01:56
	the build/deployment system could be anything from scripts, to container thingys and whatnot	01:57
rafasc	I guess pdf/demo could be a submodule.	01:58
	→ tang^ joined	01:58
rafasc	pros: you can test any revision with any backend commit you want.	01:58
velix_home	rafasc: cons?	01:59
rafasc	needs to be a subdirectory.	02:00
	requires learning how to manage submodules.	02:00
	← xcm left	02:00
	→ xcm joined	02:02
	← dpyro left	02:04
velix_home	I see. So either external in a building tool or internal as submodule.	02:04
	→ dpyro joined	02:04
	← AtumT left	02:06
	← fatalhalt left	02:09
	← fphilipe_ left	02:09
	→ fatalhalt joined	02:10
	→ azwieg103 joined	02:13
	← lagothrix left	02:15
	← kjartan left	02:15
	→ lagothrix joined	02:15
	← SpeakerToMeat left	02:15
	→ kjartan joined	02:19
	← thebope left	02:20
	→ warthog9 joined	02:21
	← tuxd00d left	02:21
	← armin left	02:22
	← jcbitter left	02:22
	← Xeago left	02:24
	→ jcbitter joined	02:25
	→ HotBeefDip joined	02:26
	→ jcbitter_ joined	02:28
	→ jungsubk joined	02:30
	← jcbitter left	02:31
	→ g00s joined	02:34
	← jungsubk left	02:41
	→ jottr joined	02:43
	→ fphilipe_ joined	02:45
	→ Xeago joined	02:45
	← noonien left	02:48
	→ Goplat joined	02:50
	→ jcbitter joined	02:50
	← jcbitter_ left	02:51
	← jcbitter left	02:53
	→ jcbitter joined	02:53
	← tang^ left	02:56
	← jottr left	02:56
	← probs left	02:56
	← jcbitter left	02:59
	→ jcbitter joined	03:00
	← dre_ left	03:05
	→ dre_ joined	03:05
	← R2robot left	03:05
	→ thebope joined	03:06
	← dre_ left	03:06
	← inkbottle left	03:07
	← mooasaurus left	03:10
	← fatalhalt left	03:10
	→ mooasaurus joined	03:10
	→ duderonomy joined	03:15
	← Beam_Inn_ left	03:15
	← navidr left	03:17
	→ inkbottle joined	03:18
	→ R2robot joined	03:19
	→ al-damiri joined	03:24
	→ envex joined	03:25
	← nic-hartley left	03:29
	← thebope left	03:36
	→ sitaram joined	03:38
	← sitaram left	03:39
	→ sitaram joined	03:39
	← boombatower left	03:44
	← pspace left	03:44
	← fphilipe_ left	03:49
	← rafasc left	03:52
	→ SkarmoutsosV joined	04:00
	→ jottr joined	04:00
	← inkbottle left	04:02
	→ pspace joined	04:03
	→ thebope joined	04:04
	← pspace left	04:04
	← zulutango left	04:05
	→ zulutango joined	04:07
	← jottr left	04:13
	← jstimm left	04:14
	← planigan left	04:20
	← bashfulshell left	04:20
	→ planigan joined	04:20
	← thiago left	04:21
	→ fphilipe_ joined	04:25
	→ igemnace joined	04:26
	← zulutango left	04:28
	← triad left	04:29
	→ zulutango joined	04:30
	→ thiago joined	04:33
	← ferdna left	04:36
	← Inline left	04:36
	← thebope left	04:37
	→ sauvin joined	04:47
	← bambanx left	05:01
	→ pks_ joined	05:03
	← pks left	05:04
	pks_ → pks	05:04
	← hofmann3900 left	05:09
	← xcm left	05:09
	→ xcm joined	05:09
	← random_yanek left	05:09
	→ random_yanek joined	05:09
	→ kapil____ joined	05:12
	→ dfee joined	05:13
	← dfee left	05:21
	← flavius left	05:25
	→ TJ- joined	05:31
	→ dfee joined	05:34
	→ velix joined	05:42
	← velix_home left	05:45
	→ spacesuitdiver joined	05:52
	→ mase-tech joined	05:55
	← HotBeefDip left	05:58
	→ mat001 joined	05:59
	← thiago left	06:00
	← mase-tech left	06:02
	← Serus left	06:03
	← mat001 left	06:04
	← victorqueiroz left	06:06
	→ Serus joined	06:07
	→ yuriii joined	06:07
	← student_A left	06:08
	→ ronskisika joined	06:08
	← SkarmoutsosV left	06:08
	→ jottr joined	06:09
	→ sahasatvik joined	06:13
	← xlued left	06:15
	← jcbitter left	06:16
	→ xlued joined	06:16
	← mud left	06:17
	→ jcbitter joined	06:17
	→ Noti joined	06:21
	← jcbitter left	06:22
	→ andrzejv joined	06:22
	→ thefatma joined	06:23
	→ jcbitter joined	06:23
	← jnewt left	06:27
	→ jnewt joined	06:28
	→ n3wborn joined	06:29
	→ Tawonga joined	06:29
	← g00s left	06:31
	← jcbitter left	06:35
	← fphilipe_ left	06:36
	→ jcbitter joined	06:37
	→ kernel-sanders joined	06:38
	← Tawonga left	06:39
	→ jcbitter_ joined	06:41
	→ gloomy joined	06:42
	← jcbitter left	06:43
	← Goplat left	06:45
	← royal_screwup21 left	06:54
	→ oxymoron93 joined	06:56
	→ fphilipe_ joined	07:00
	← lankanmon left	07:00
	→ lankanmon joined	07:01
	← dodobrain_ left	07:03
	← nowhere_man left	07:05
	→ wildermind joined	07:06
	← TJ- left	07:06
	→ TJ- joined	07:09
	ronskisika → Raging_Hog	07:11
	← Raed left	07:13
	→ shanks8080 joined	07:13
	← jcbitter_ left	07:14
	→ interrobangd joined	07:15
	→ jcbitter joined	07:16
	← gloomy left	07:16
	→ jcbitter_ joined	07:17
	← jottr left	07:19
	→ Raed joined	07:19
	← jcbitter left	07:21
	→ fstd_ joined	07:22
	← rkta left	07:22
	→ rkta joined	07:22
	→ Hi-Angel joined	07:22
	← jcbitter_ left	07:23
	→ jcbitter_ joined	07:24
	← oxymoron93 left	07:24
Hi-Angel	How can I put a custom script to my global config to make for me default commit message upon "git commit"? E.g. I found myself often writing down in git messages name of the directory where a file was changed (e.g. commit changing foo/bar.cpp gonna look like "foo: change bar"), and I want to automatize that	07:25
	← fstd left	07:25
	fstd_ → fstd	07:25
Hi-Angel	So far I only found hooks, but these are per-project, not global nor user-specific.	07:26
	→ gloomy joined	07:27
TJ-	Hi-Angel: that doesn't sound like a useful message since the commit itself contains the list of changed files. Usually the commit message would/should describe the 'reason' for the change	07:27
	→ oxymoron93 joined	07:28
Hi-Angel	TJ-, commit should describe which part of the project was changed (e.g. is it tree-wide, or was did it change shared code, or maybe some other part), and that part is usually named the same as the directory.	07:28
	← jcbitter_ left	07:29
	← shored left	07:29
TJ-	Hi-Angel: but there is a git-commit message template so there may be a way to customise that	07:29
Hi-Angel	TJ-, here's an example https://gitlab.freedesktop.org/mesa/mesa/commits/master every commit starts with part of the project that was changed, and that part is present in the list of files.	07:29
	→ shored joined	07:30
TJ-	Hi-Angel: ahhh, you mean you want to auto-determine and prefix the 'sub-system'	07:30
Hi-Angel	Yep	07:30
kernel-sanders	there's a hook called prepare-commit-msg, you could do something there	07:30
	→ jcbitter_ joined	07:30
TJ-	Hi-Angel See "man git config" and "core.hooksPath" to have global hook scripts	07:31
gitinfo	the git-config manpage is available at https://gitirc.eu/git-config.html	07:31
	→ arminhajrovic joined	07:32
Hi-Angel	TJ-, the man says I need to change "$GIT_DIR" variable. I wonder though: won't it break project local hooks?	07:34
	← dfee left	07:34
Hi-Angel	I.e. ones that usually at ./git/hooks/	07:34
TJ-	Hi-Angel: no, it doesn't say that	07:35
	Hi-Angel: it says the default value of core.hooksPath is $GIT_DIR/hooks	07:36
	← Bobdude left	07:36
TJ-	Hi-Angel: but if you set core.hooksPath to /etc/git/hooks all repositories will use that directory of common hooks	07:36
Hi-Angel	right, lol, I just figured if I change $GIT_DIR, it gonna break git because the section titled "FILES" describes that all project-local files resides at that dir (e.g. $GIT_DIR/config)	07:37
	TJ-, aah, I see, I can set the core.hooksPath	07:38
	Thanks	07:38
	Right, so I can set it to a global directory where I gonna keep my global hooks. Cool.	07:39
TJ-	Hi-Angel: Makes me wonder - in wanting ultimate flexibility - if you can declare multiple paths for core.hooksPath !	07:40
	← arminhajrovic left	07:41
	→ baako joined	07:44
baako	hi guys, I changed some files permission and git whats me to commit them. what is the commit link to make git ignore file permission changes?	07:44
	→ mimajof joined	07:45
Hi-Angel	Maybe "git config core.fileMode false" https://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-file-mode-chmod-changes	07:45
	baako,	07:46
baako	Hi-Angel: thanks	07:46
	← RustyShackleford left	07:52
	→ dege joined	07:52
	→ pd09041999 joined	07:55
	→ jottr joined	07:57
	← velix left	07:57
	← pd09041999 left	07:59
	→ pd09041999 joined	07:59
	→ bruhbruh joined	08:02
	→ polman joined	08:04
	→ Tobbi_ joined	08:07
	← jottr left	08:10
	→ jottr joined	08:12
	← TJ- left	08:13
	← spacesuitdiver left	08:15
	← jottr left	08:17
	→ yyy joined	08:19
	→ theoceaniscool joined	08:20
	→ keepLearning512 joined	08:23
	← thefatma left	08:25
	→ yyy- joined	08:26
	← yyy left	08:27
	→ thefatma joined	08:27
	← dpyro left	08:29
	← cdown left	08:30
	← Anthaas left	08:31
	← keepLearning512 left	08:32
	→ ggSo joined	08:32
	→ Anthaas joined	08:34
	← interrobangd left	08:36
	→ nabil_ joined	08:37
	← nabil left	08:37
	← nabil_ left	08:38
	→ nabil_ joined	08:38
	← nabil_ left	08:39
	→ nabil_ joined	08:39
	← nabil_ left	08:40
	← ggSo left	08:41
	→ zonixo joined	08:41
	→ voidSurfr joined	08:44
	→ floppydh joined	08:44
	→ jottr joined	08:47
	→ DasSaffe joined	08:47
DasSaffe	Hello friends, I need to store a SOCKS5 proxy in my git-config, but it doesn't work for some reason. I checked some ressources, but couldn't do it yet. Last thing I tried was: git config --global http.proxy socks5://myProxy:1080, but I'm still ending up with ssh: connect to host my-gitlab port 22: Connection timed out	08:48
	$ git config --get http.proxy yields the "correct" output, I think: socks5://myProxy:1080 - This is the exact same proxy I stored in putty and it works there	08:48
	Working with "Git for windows" if that matters	08:49
osse	DasSaffe: you're configuring a proxy for http, but using ssh to connect	08:49
DasSaffe	do I have to change the protocol? Or how can I fix this issue? I'm sorry, kinda new to tunneling	08:50
osse	DasSaffe: I guess so, which means changing the URL	08:51
DasSaffe	so with git --locale -e?	08:51
	and change HTTP:// to GIT:// ?	08:51
	on the other hand: isn't it possible to store a proxy for both types of connection? SSH and HTTP(S)?	08:52
osse	I don't follow	08:53
	what produces the "connection timed out" message?	08:54
DasSaffe	if I try ssh -T [email@hidden.address] this yields the timeout already	08:54
	so the clone isn't the problem, it is more the connection itself	08:54
osse	a http proxy won't fix that	08:55
DasSaffe	so we need a SSH-proxy, if that is a thing?	08:56
	→ reactormonk joined	08:56
	→ Xatenev joined	08:56
Xatenev	hello	08:56
	im trying to retrieve a single file that has been deleted from the git repo	08:56
	what i tried was `git checkout hash -- path/to/my/file but it says did not match any files known to git	08:57
osse	DasSaffe: that is indeed a thing, but that's usually configured in .ssh/config	08:57
Xatenev	i checked and compared the path twice	08:57
	any ideas?	08:57
osse	Xatenev: is the hash correct?	08:57
	is the path correct?	08:57
	try git show hash:path	08:57
DasSaffe	osse: I'm not even sure if windows has the .ssh/config thing, but let me check	08:57
Xatenev	osse, sorry hash was wrong	08:58
	lol	08:58
	works now	08:58
	I accidently copied the hash from the commit where the file was removed, not the one before	08:58
DasSaffe	i have the .ssh folder, but not the config-file in it. It might be that it can be fixed with just creating it. Never tried that on windows	08:59
osse	DasSaffe: Git for Windows can either use OpenSSH or Putty. If you use OpenSSH then you can do it that way. If not you need to check the putty docs because I don't know	08:59
DasSaffe	i mean, the fun thing, it works with putty	08:59
	I added the proxy-settings in Putty and can connect (via port 22) to my AWS-server	08:59
	Putty has settings for deploying a proxy. I did that and tried to connect - and it worked.	09:00
	← Xatenev left	09:00
	← Noti left	09:00
osse	DasSaffe: then configure git to use putty instead of openssh	09:01
DasSaffe	can I check what method is currently used?	09:01
	← pd09041999 left	09:02
Hi-Angel	Just wanted to share: I implemented the idea I asked about, to create default template in "git-commit" in any project https://github.com/Hi-Angel/dotfiles/commit/9e7a3e9db4713788103ccbaa4980ef0a66f290bf I almost wrote the hook in sh, but it turned out to be so awkward that I rewrote it in python.	09:03
osse	DasSaffe: I think it's as easy as: git config --global core.sshCommand plink.exe	09:03
	DasSaffe: if that doesn't work I would reinstall Git for Windows and choose Plink in the install wizard	09:04
	→ bergercookie joined	09:04
	← queip left	09:05
DasSaffe	i'll give it a shot. thank you very much, osse :-)	09:06
	← jottr left	09:08
	→ blackbaba joined	09:09
	← blackbaba left	09:09
	→ ujjain joined	09:10
	← DasSaffe left	09:15
	← bergercookie left	09:15
	→ rsrx joined	09:20
	← catsup left	09:21
	→ catsup joined	09:21
Hi-Angel	(FTR: fixed the hook in another commit to make it work with "git commit --amend")	09:22
	← catsup left	09:22
	→ catsup joined	09:22
	→ Noti joined	09:23
	→ queip joined	09:31
	← al-damiri left	09:35
	→ Lucas_Gray joined	09:42
	→ jottr joined	09:43
	← rsrx left	09:43
	← molusc left	09:50
	← Noti left	09:51
	→ YuGiOhJCJ joined	09:51
	→ rsrx joined	09:55
	← lankanmon left	10:01
	← thefatma left	10:04
	← misuto left	10:08
	→ misuto joined	10:08
	← hussam left	10:12
	← ChrisLane left	10:12
	← zonixo left	10:13
	→ ChrisLane joined	10:13
	→ zonixo joined	10:13
	← ChrisLane left	10:16
	→ paulwood joined	10:17
	← paulwood left	10:18
	→ paulwood joined	10:19
	← Raging_Hog left	10:19
	→ SkarmoutsosV joined	10:21
	→ raatiniemi joined	10:25
	← paulwood left	10:28
	← SkarmoutsosV left	10:28
	→ Tawonga joined	10:29
	→ paulwood joined	10:29
	← paulwood left	10:30
	→ figuinhas joined	10:30
	← baako left	10:34
	→ acidjnk joined	10:34
acidjnk	hello	10:35
	→ molusc joined	10:35
Hi-Angel	Hey acidjnk	10:35
acidjnk	Still the same problem in the last 4 months. Since 2 people joined the team, it happens all the time that I just do an innocent fetch and suddenly have 20, 30, 50, 100 supposedly unpushed local commits. Of stuff that actually has been pushed weeks ago.	10:35
osse	tell your coworkers to not force push all the time	10:36
acidjnk	Best explanation is that somebody does a reintegrate of already pushed commits, right?	10:36
	We also had the forced push theory, but everybody denies it.	10:36
osse	what reports that you have so many unpushed commits?	10:37
	→ Noti joined	10:37
acidjnk	usually my IDE, Intellij Idea. I'm pretty sure the command line tool would as well, though.	10:37
osse	does your IDE also rebase commits automatically or something?	10:39
	→ thefatma joined	10:39
acidjnk	No, but when there is a conflict, it often gives a choice between rebase and merge. I never rebase, but others sometimes do.	10:40
	Not a big fan of how the IDE hides what it actually does, and how it tries to unify the UI no matter if I use CSV, SVN, Git or whatever, but I think in this case it's not the IDE but someone doing something really strange.	10:42
	← voidSurfr left	10:43
osse	It's hard to tell what's going on without more info	10:44
acidjnk	I certainly won't get any information out of the other people. They stick to their story.	10:45
osse	I mean information from git	10:45
	like "git status" whenever your IDE presents you with this message	10:45
	also, how do you know which exact commits your IDE is referring to?	10:46
acidjnk	When I go into the push dialog, it first shows what it thinks should be pushed, and then I can confirm or abort. So it probably runs a git status to create the dialog, then git push, but I can't tell for sure.	10:46
	→ mowcat joined	10:47
osse	Can you take one such commit and look for it in git log to confirm it has already been pushed?	10:48
acidjnk	I and many others have done that many times, it certainly has been pushed. We even stopped trusting anything we see at our screen and have other people on their computer confirm that it has been pushed. We would be in deep trouble if the commits of sometimes 3 weeks would not have been released long ago, that would really stand out.	10:49
osse	confirm how?	10:50
acidjnk	Also it's not MY commits that show up as unpushed, but other people's commits as well. How would they get on my local clone if they had not been pushed?	10:50
osse	git log? or look at the code?	10:50
	→ SerialSmile joined	10:50
acidjnk	log? lack of 50 new blocker tickets and angry customer calls? It's really A LOT that supposedly is not pushed. And how would someone else's commit even get to MY computer if not through push and fetch?	10:51
osse	The code that was in those commit has certainly been pushed; I don't doubt that.	10:52
	But someone might have (unintentionally even) taken all the changes in 20, 30, 50, 100 commits, squashed them all into one big commit and pushed that	10:53
	→ lacrymology joined	10:53
acidjnk	Maybe it's that - how would that even be done if you wanted to?	10:54
osse	git reset --soft HEAD~100; git push --force	10:54
	or git merge --squash	10:54
	→ lankanmon joined	10:54
acidjnk	thanks, that's a good theory!	10:54
osse	or an interactive rebase in wich all commits are marked "squash"	10:55
acidjnk	Could a rebase to an "equivalent" URL do that, e. g. //githost/ instead of //githost, or //192.168.25.25 instead of //githost?	10:56
osse	I don't know what rebasing to an URL means	10:57
acidjnk	I think I mixed things up there - setting a different remote I probably meant.	10:58
	← gloomy left	11:00
	← learningc left	11:00
osse	i don't think any rebase operation could do that by its own at least	11:02
	find a change you have in one of your unpushed-but-actually-pushed commits. on a different computer run git blame on the relevant file, find out which commit Git thinks that change belongs to	11:03
	look at the author of that commit, suspend without pay	11:03
	the first part was serious	11:04
	← theoceaniscool left	11:07
acidjnk	ah thanks, finally a way to possibly catch him! :-)	11:08
	← dansan left	11:09
osse	or rather you can make a separate clone of the repo on your own machine. that way you are guaranteed to not get false results due to uncommited/unpushed changes, and you can work on your own little mueller report in peace	11:10
acidjnk	Right, even after "it happened" I can still get a clone that will certainly have no unpushed commits. Good idea.	11:11
	← fakhraee left	11:13
	→ mort joined	11:13
	→ emsjessec joined	11:13
	→ lmln joined	11:13
	← Tawonga left	11:15
lmln	git fsck reports sha1 mismatch and bad object for a abc123 object, i found original file and git hash-object returns the same abc123 hash, i run the command with -w option, but git fsck still reports this object as bad/sha1 mismatch	11:15
	→ dansan joined	11:15
lmln	any idea what am i doing wrong?	11:15
	→ ChrisLane joined	11:16
	← thefatma left	11:19
	← polman left	11:22
	→ elichai2 joined	11:24
	→ fakhraee joined	11:26
	→ learningc joined	11:27
	← nuc left	11:33
	→ nuc joined	11:36
	← emsjessec left	11:40
	→ thefatma joined	11:41
	← pks left	11:41
	← bruhbruh left	11:43
	← mowcat left	11:43
	→ pks joined	11:44
	← dansan left	11:47
	yyy- → yyy	11:50
	→ jungsubk joined	11:50
	← figuinhas left	11:53
	→ figuinhas joined	11:54
	← fakhraee left	11:56
	← millerti left	12:02
	→ Darcidride joined	12:04
	→ gloomy joined	12:06
	→ fakhraee joined	12:08
	→ victorqueiroz joined	12:15
	→ bsanford joined	12:16
	→ _0xbadc0de_ joined	12:16
	← bsanford left	12:17
_0xbadc0de_	so I have this path in my gitignore file	12:18
	Final/deps/llvm_src/*	12:18
	→ bashfulshell joined	12:19
_0xbadc0de_	but when I do git status	12:19
	I am spammed by loads of messages like this: /Final/deps/llvm_src/llvm-7.0.1.src/utils/lit/tests/Inputs/max-failures/lit.cfg	12:19
	so.. wtf?	12:19
	shouldn't this be supressed?	12:19
osse	What does git status say before all those lines?	12:19
_0xbadc0de_	I cant know, too many lines	12:20
osse	git status \| less	12:20
_0xbadc0de_	(I am using git bash on wind000ze)	12:20
	← Noti left	12:20
_0xbadc0de_	https://0bin.net/paste/lVMk32U4IJjBk7X2#934cHVKAhks4Qtp2P-4iH9vi1vG0auGc6iS5044+zRv	12:21
	there it is	12:22
Habbie	_0xbadc0de_, probably better to use a pastebin with working https	12:22
	→ nic-hartley joined	12:22
_0xbadc0de_	Habbie, why=	12:22
	?	12:22
osse	So all those files are staged for commit?	12:22
Habbie	_0xbadc0de_, because it's a lot of clicks to view your paste now	12:22
osse	Gitignore means nothing then	12:22
_0xbadc0de_	just add the certificate and be happy	12:22
	→ interrobangd joined	12:23
_0xbadc0de_	osse: I dont want to add llvm_src for commit	12:23
	and I dont want to receive all those messages	12:23
	srsly I mean wtf am I doing wrong	12:25
	how can I prevent to be spammed with hundreds of lines in git statys	12:25
	"git status"	12:25
osse	all those files are mentioned right under .gitignore ?	12:25
	→ sat-aton joined	12:26
_0xbadc0de_	I am using the ASSterisk to imply I dont want directories or subdirectories	12:27
	Final/deps/llvm_src/*	12:27
osse	just answer the question	12:28
_0xbadc0de_	I just did	12:28
	I dont know	12:28
	← satifant left	12:28
osse	then make a pastebin of the whole git status	12:29
	← interrobangd left	12:29
osse	My guess is these files are part of the repo, and in that case gitignore is irrelevant	12:29
	!ignore_tr	12:29
gitinfo	[!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	12:29
	← azwieg103 left	12:30
	← thefatma left	12:30
	← rewt left	12:31
	→ rewt`` joined	12:31
	→ thebope joined	12:32
	rewt`` → rewt	12:32
	→ Noti joined	12:32
	← thebope left	12:36
	← learningc left	12:37
	← jungsubk left	12:37
	→ learningc joined	12:39
	→ angelo_ts joined	12:41
angelo_ts	hi all,	12:41
	i am getting the "fatal: index-pack failed" on a clone, by yocto	12:41
	(fatal: The remote end hung up unexpectedly)	12:42
	i read around for some workaround on the net, nothing worked for me	12:42
	← YuGiOhJCJ left	12:43
	→ thefatma joined	12:43
	← acidjnk left	12:47
	← _0xbadc0de_ left	12:47
	← learningc left	12:48
	→ emsjessec joined	12:49
	→ savolla joined	12:50
	→ interrobangd joined	12:51
	→ isBEKaml joined	12:53
	→ howell joined	12:58
	← macaronus left	13:00
	→ robertparkerx joined	13:07
robertparkerx	I'm trying to understand my workflow a bit more. Sometimes there are merge conflicts but they are not normal how the video shows that you all suggest watching -- shows HEAD. Sometimes mine will show <<<< Upstream and <<<< stash	13:08
osse	robertparkerx: the words after <<<< or >>>>> just indicate where those changes come from	13:10
	robertparkerx: in the cases you mention they are conflicts arising from rebasing or popping a stash	13:10
	Other than that it's the same	13:11
robertparkerx	sometimes the blocks don't contain all of what it should	13:11
	osse, I am applying a stash sometimes and merge a feature branch	13:11
	merge a feature branch into dev*	13:11
	→ hussam joined	13:13
	→ keepLearning512 joined	13:14
	→ CodeSlingerPaul joined	13:15
	← nic-hartley left	13:16
osse	Hmm is there a question here?	13:16
	If something is missing from the <<< >>> then git managed to resolve that by itself, so the contents are outside	13:17
	→ StucKman joined	13:17
	← howdoi left	13:18
	→ bluezone joined	13:18
	← StucKman left	13:18
robertparkerx	Shouldn't the blocks <<<< >>>> contain the code that it should for me to choose from? I was told sometimes it could be a combination of two	13:19
	of the two*	13:19
	← silverballz left	13:19
	→ jungsubk joined	13:20
	← keepLearning512 left	13:20
robertparkerx	sometimes I found it was missing vital pieces.	13:21
	→ silverballz joined	13:21
osse	hard to tell without seeing an actual example	13:21
	what was missing?	13:21
robertparkerx	Just some markup and blocks of the javascript	13:22
osse	were they not present before the <<<< or after the >>>> ?	13:22
robertparkerx	No	13:22
igemnace	are you sure they don't already exist outside the <<< >>>?	13:22
robertparkerx	NNot that I remember	13:22
igemnace	git only does that for things it can't merge on its own	13:22
	→ pd09041999 joined	13:23
robertparkerx	It might have. I'm just trying to learn more about it. Sorry.	13:23
	I don't have a example here in front of me. I managed to fix the conflicts before. I just thought I would ask you all.	13:23
igemnace	nothing to apologize for	13:24
	← gxt left	13:27
	← pd09041999 left	13:29
	→ pd09041999 joined	13:30
	← pd09041999 left	13:34
	→ pd09041999 joined	13:34
	→ RoriconKnight joined	13:39
	← pd09041999 left	13:42
	→ howdoi joined	13:42
	← jungsubk left	13:45
	→ junon joined	13:46
	→ foist joined	13:50
	→ rafasc joined	13:50
	← yonder left	13:52
	← reactormonk left	13:54
	→ Atlenohen joined	13:56
	← kjartan left	13:56
	→ thiago joined	13:58
	→ isBEKaml_ joined	14:00
	← isBEKaml left	14:00
	→ kjartan joined	14:01
	→ boombatower joined	14:03
	→ spaceone joined	14:03
spaceone	hi, what is wrong with:	14:03
	bl = "!bl () { ~/git/depot_tools/git_hyper_blame.py --ignore-file ~/.ignore_blame_commits \"$1\"; }; bl"	14:03
	git alias	14:03
	it says: fatal: no such path __init__.py in 7ab05c7b75cd1830f1a68f577f8275e58fd1d57a	14:03
	if i call it on the CLI directly it works	14:04
	← foo left	14:04
	← Lucas_Gray left	14:04
	→ thebope joined	14:04
	→ Lucas_Gray joined	14:06
	→ greggerz joined	14:07
	isBEKaml_ → isBEKaml	14:07
	→ Tawonga joined	14:08
	→ reactormonk joined	14:08
rafasc	what is 7ab05c7b75cd1830f1a68f577f8275e58fd1d57a?	14:08
	← thebope left	14:09
rafasc	$git show <hash>;	14:09
spaceone	rafasc: e regular commit	14:10
rafasc	spaceone: does $git ls-tree -r <hash>; show the __init__.py?	14:11
spaceone	but yes that commit doesn't have that path. but hmm	14:11
	rafasc: no	14:11
	oh it does	14:11
rafasc	maybe it cares from where you are running the alias?	14:12
	← interrobangd left	14:12
spaceone	seems there is some difference	14:12
rafasc	because alias are always ran from the top-level	14:13
spaceone	https://bpaste.net/show/e4af422ece2f	14:14
	oh hmm	14:14
	can i disable that?	14:14
	okay it works with an absolute path	14:14
	→ Inline joined	14:15
rafasc	ahh!!	14:15
	I know.	14:15
	git is expanding your 'bl' alias.	14:16
	← duderonomy left	14:16
rafasc	spaceone: instead of using bl() {...}; bl; use f(){...};f;	14:17
spaceone	renaming bl() into f()?	14:18
	← junon left	14:19
	← gloomy left	14:19
spaceone	rafasc: i don't understand	14:19
	how would the correct line be?	14:19
rafasc	on your paste: at line 16:12:21.491732 run-command.c:209 ...	14:20
	looks like your alias is being expanded twice?	14:20
	← justanotheruser left	14:23
	→ spacesuitdiver joined	14:26
	← andrzejv left	14:28
rafasc	spaceone: what does your $ git config --get-all alias.bl; say?	14:30
	and what version of git are you using?	14:30
spaceone	rafasc: !f(){ ~/git/depot_tools/git_hyper_blame.py --ignore-file ~/.ignore_blame_commits "$@";};f	14:31
	git version 2.11.0	14:31
rafasc	but in the above line you mentioned $@, did you change it?	14:33
	→ al-damiri joined	14:34
spaceone	rafasc: i testes $1 and \"$@\"	14:34
	both don't work	14:34
rafasc	are you using windows?	14:34
	← Darcidride left	14:34
rafasc	because my trace output is slightly different from yours.	14:34
spaceone	nooo	14:34
	→ interrobangd joined	14:35
rafasc	is your __init__.py at the root?	14:38
	→ Siecje joined	14:38
	→ csd_ joined	14:39
Siecje	I am resolving a merge conflict. How do I keep a file that says deleted by us?	14:39
_ikke_	git checkout --theirs <filename> I believe	14:39
rafasc	Siecje: git checkout --theirs	14:39
	_ikke_'s version	14:40
Siecje	Thanks.	14:40
	← lmln left	14:42
	→ justanotheruser joined	14:42
	thomasross → Guest97737	14:42
	→ thomasross_ joined	14:42
	← Guest97737 left	14:42
	thomasross_ → thomasross	14:42
rafasc	spaceone: tried on 2.11, and the trace output matches yours. So I guess the alias is correct. Where in the hierarchy of the repository is the file you are trying to blame?	14:43
csd_	Our project has directories ./src/main/antlr and ./src/main/common/src/main. We'd like to move the former to ./src/main/antlr4 and the latter to ./src/main and preserve the commit log history on the individual files. As a wrinkle, we used to have files of similar names at ./src/main/... and when we do "git mv", we are losing log history. Git seems to be getting confused. I think this is possible with git filter-branch, but I'm not exactly c	14:44
	Note that we're looking to do this as a new repo, not to rewrite the entire existing repo.	14:44
spaceone	rafasc: it's in a subdirectory doc/	14:45
	← interrobangd left	14:45
rafasc	spaceone: try git bl :/doc/__init__.py	14:45
	→ rohit[m] joined	14:45
spaceone	rafasc: doesn't work, same error	14:46
	← savolla left	14:46
rafasc	is doc a submodule?	14:47
spaceone	no	14:47
rafasc	can you call git_hyper_blame.py from your top-level directory? and see if it behaves the same?	14:48
	→ RustyShackleford joined	14:49
	→ Phylock joined	14:49
spaceone	rafasc: calling it directly behaves fine	14:50
rafasc	doesn't make sense.. Can you paste the entire thing you tried?	14:51
	→ SpeakerToMeat joined	14:51
	← rohit[m] left	14:53
nezZario	Really stupid question but I dont'[ see it in the docs anywhere. How do I even use 'recursive-ours' (not just 'ours', but recursive->ours) merge ?	14:53
	git merge -s recursive-ours does not work	14:53
spaceone	rafasc: https://bpaste.net/show/8beeff6afafe	14:53
rafasc	nezZario: -s recursive -Xours;	14:54
	→ rohit[m] joined	14:54
	← goiko left	14:54
	→ mowcat joined	14:54
rafasc	or just -Xours, because -s recursive is the default. But being explicit doesn't hurt.	14:54
	→ inkbottle joined	14:55
rafasc	spaceone: it works correctly on line 2. Experiment saying ./__init__.py	14:56
	rafasc is not sure if the ./ is expanded after or before.	14:57
Siecje	How can I diff the current branch with another branch so that I can modify the current branch?	14:57
	I did git difftool --dir-diff branch..master but when I modified the side which is the current branch there were no changes.	14:58
spaceone	rafasc: ./file → same error	14:58
	← xcm left	14:58
	→ xcm joined	14:59
	← bashfulshell left	15:00
	← iam730 left	15:00
	→ royal_screwup21 joined	15:00
nezZario	thanks	15:01
	→ AbleBacon joined	15:01
	→ nic-hartley joined	15:01
	→ gloomy joined	15:01
nezZario	i don't know why but this designer we have, he isn't very adept with git, but somehow he constantly creates merge conflicts, and there is only 1 other person working on the repo, i have no idea wtf he could be doing	15:01
	→ triad joined	15:02
kernel-sanders	lol	15:02
	← thiago left	15:02
kernel-sanders	probably because you're working on the same files	15:02
	split them up	15:02
csd_	does anyone have any insight regarding my question at 10:44 ?	15:02
rafasc	don't shame the designer if you are not able to figure what he is doing wrong. https://www.youtube.com/watch?v=4S3h5L21KlA	15:03
kernel-sanders	csd_, yeah I did something similar with filter branch	15:03
csd_	nezZario: maybe try to talking to him and helping him get better	15:03
	← Noti left	15:03
rafasc	csd_++	15:03
_ikke_	csd_: We live probably in a different timezone	15:04
	csd_: So that time reference is kind of ambiguous	15:04
csd_	_ikke_: should have provided UTC :)	15:04
	20 minutes ago	15:04
rafasc	csd_: git doesn't have renames. Renames are shown heuristically.	15:05
	← zonixo left	15:05
rafasc	the best you can do is to move the directories on separate commits, with no additional changes.	15:05
kernel-sanders	you absolutely can rewrite the history with git filter-branch	15:06
rafasc	So that later you can tell tools like git log to follow renames and give it a high threshold to prevent false positives.	15:06
	→ Revan- joined	15:06
	← Revan- left	15:06
kernel-sanders	if you simply move the directory git blame won't be informative	15:06
	→ pd09041999 joined	15:06
csd_	the problem is that in 2013 we had a file at <new-path> of the same name as the file we want to move now. so we're losing like 5 years of log history on that particular file. is that just unavoidable?	15:07
rafasc	assuming you can rewrite the entire history, sure. but !rewrite	15:07
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	15:07
	← pd09041999 left	15:08
rafasc	csd_: you are not losing history. git doesn't loose history.	15:08
	lose*	15:08
csd_	rafasc: it's not available in "git log <file>"	15:08
	→ Sasazuka joined	15:08
	→ pd09041999 joined	15:09
rafasc	csd_: have you tried asking git to follow renames?	15:09
csd_	yes	15:09
rafasc	changing the threshold with -C and -M ?	15:09
csd_	hm, no	15:09
	→ czart joined	15:09
ThiefMaster	is there any reason there's no short option for --force-with-lease in git-push? normal --force has -f and as a lazy person i'm VERY MUCH inclined to use -f instead of the (usually better!) alternative that's more to write	15:10
kernel-sanders	does git log --follow actually work though?	15:10
csd_	rafasc: will have to look into that	15:10
rafasc	yea, --folow as well.	15:11
	but follow is not perfect, it has some weird corner cases if I remember correctly.	15:12
	→ goiko joined	15:12
csd_	rafasc: seems not to work. not sure if i need to tune -M perhaps	15:13
sphalerite	Hi folks, I want to make sure a commit consists only of moving chunks of code around. Can I somehow apply the rename detection at a more granular level to detect moving stuff within files?	15:14
	(all these chunks consist of complete lines only)	15:15
bin_bash	wait what	15:15
	← reactormonk left	15:16
	→ Emperor_Earth joined	15:16
rafasc	ThiefMaster: replacing the default -f to mean --force-with-lease has been suggested before, but breaks backwards compatibility.And it isn't as safe as people think: https://public-inbox.org/git/xmqqvan8jdje.fsf@gitster.mtv.corp.google.com/	15:19
	and by the sounds of it, --force-with-lease without arguments might even be removed in the future :O	15:21
	← wildermind left	15:25
	→ orbyt_ joined	15:28
rafasc	ThiefMaster: https://public-inbox.org/git/xmqqy3rngeg5.fsf@gitster.mtv.corp.google.com/	15:31
	→ dpyro joined	15:31
rafasc	sphalerite: git doesn't track individual changes. It makes snapshots of the project as a whole.	15:32
	→ Xeago_ joined	15:32
sphalerite	rafasc: yes. And it can detect when file a was removed, and file b was created with the exact same contents as a used to have, that this is a rename.	15:33
rafasc	sphalerite: things like diff --color-moved, can show you lines moved, but the 'moves' aren't recorded as 'moves'.	15:33
sphalerite	rafasc: ah, that sounds like what I want!	15:33
	← Xeago left	15:35
	Xeago_ → Xeago	15:35
	← inkbottle left	15:35
sphalerite	rafasc: yep, looks good. Now I just need to understand the colours :D thanks!	15:36
rafasc	sphalerite: there are various color modes you can try.	15:36
	→ reactormonk joined	15:37
	→ wildermind joined	15:37
	← oxymoron93 left	15:37
	→ foo joined	15:38
foo	Trying to set up my second repo on gitolite. It's been a minute since I originally set that up. In following http://gitolite.com/gitolite/fool_proof_setup ... everything seems to work except "This will automatically create a brand new repo called "foo" on the server, and alice will be able to clone from it, or push anything to it." - it seems like modifying gitolite-admin repo, committing, and pushing, isn't	15:39
	automatically creating the repo on the server. Any tips on troubleshooting? Thank you	15:39
	→ Regon joined	15:41
rafasc	foo: perhaps #gitolite	15:42
foo	rafasc: oh, didn't realize that was a thing - thank you	15:42
	← rohit[m] left	15:43
rafasc	so much for "fool_proof_setup" hehe	15:43
	→ rohit[m] joined	15:44
	→ ricekrispie joined	15:44
	← orbyt_ left	15:45
	→ theoceaniscool joined	15:45
	← khisanth_ left	15:45
	← fphilipe_ left	15:46
rafasc	foo: I think its two things: You need to commit the changes to the admin repo, and 'alice' will be able to push pull from said repo.	15:46
	in that case, the 'foo' repo.	15:47
	← ricekrispie2 left	15:47
foo	rafasc: lol.	15:47
	rafasc: I wonder if it gets created on first pull... I was trying to push to the new repo	15:47
	foo tries	15:47
foo	rafasc: ... wait, are you calling me the fool?! haha. delayed	15:47
	→ thiago joined	15:48
rafasc	foo: I wasn't, but maybe the gitolite folks are.	15:48
	→ Envil joined	15:49
	← dpyro left	15:49
	← hqdruxn08 left	15:49
foo	:)	15:49
rafasc	and technically, it would be worse than fool, because the guide is 'fool-proof'. hehe	15:50
	→ acercle joined	15:50
foo	haha, nice	15:51
	→ dpyro joined	15:51
	→ impermanence joined	15:51
	← Mattiasl_ left	15:52
rafasc	they say: "clone from it, or push anything to it."	15:52
Habbie	i'm pretty sure that gitolite allows wildcard permissions, in which case it cannot reasonably create all repos for you beforehand	15:53
	so it would make sense if it also requires a pull/push to create a singular one	15:53
rafasc	so, if you were trying to push and it didn't work, you either did something wrong along the way, or the guide is incomplete.	15:53
Habbie	yes	15:53
	i'd recommend against checking on the filesystem - instead check for the right behaviour	15:54
	→ wootehfoot joined	15:54
	→ dfee joined	15:54
rafasc	http://gitolite.com/gitolite/wild/ used to be thing	15:55
foo	rafasc: thanks, yeah - I try to push to it and I get an error which I've tried to google. More here: https://paste.ofcode.org/BWFnjxSWESDzrqgpRkEWnG - the error "Please make sure you have the correct access rights and the repository exists" - the repo doesn't exist, when I do ls on the server end, I expect this to create it.	15:56
	rafasc / Habbie - mind you, I have another repo that's been working fine, simply hitting this adding a second repo	15:57
Habbie	ignore line 40 and 41	15:57
	that's your local git client making assumptions about how things work	15:57
foo	aha! ok	15:57
Habbie	instead, focus on 36-37	15:57
	those are from gitolite	15:57
	and i think they are telling you that you matched none of your explicit rules	15:57
foo	user, repo name, all match from what I can see. Unless my key ... no, can't be that, since the same key works on another repo	15:58
	→ khisanth_ joined	15:59
Habbie	for the same user name?	15:59
foo	yup, I've triple checked this stuff now too	16:00
	... which is why I'm so confused	16:01
	← thiago left	16:01
	foo pushes something in his other gitolite repo just to make sure that worked fine, it dtoes	16:01
tabakhase	foo new branch? need "C"	16:02
foo	tabakhase: on master, hmm	16:02
	tabakhase: It's a new repo, to be clear	16:02
	"p" per https://paste.ofcode.org/BWFnjxSWESDzrqgpRkEWnG	16:02
tabakhase	if its currently an "empty bare repo" .- it would be a "new" branch yea...	16:04
	← howell left	16:04
	→ thiago joined	16:05
	→ howell joined	16:05
	→ Mr__Anderson joined	16:06
	← Lucas_Gray left	16:07
foo	tabakhase: ok, so I believe per my conf, it's all good. I did do a git init . in a dir, then I basically ran git push --set-upstream origin master and got the error	16:07
tabakhase	also, "ssh to it" - afaik it should kick you after nicely giving you a list what user you are and what you have access too	16:09
	and maybe try the whole thing with a clone before permission-shuffeling...	16:09
	→ mud joined	16:09
Habbie	oh, indeed it does that here	16:09
	the list when you just ssh	16:09
foo	Habbie / tabakhase - ah yes, I didn't include that piece of the puzzle but I did do that. It actually DOES NOT show me the latest repo (p) I added... as if it's not seeing my latest config	16:11
Habbie	are you sure you pushed it?	16:11
foo	yes, triple checked. I get the sense whatever happens here I am going to facepalm. But I just, within the past hour, cloned the gitolite repo locally, edited the config, git commit -a -m "Added new repo"; git push ... all seemed to push conf back fine	16:12
	→ Piraty joined	16:12
foo	(appreciate you guys talking this through, I'm baffled myself) What I know to be true: 1) when I push I get the error: FATAL: W any p m DENIED by fallthru ... and when I ssh git@b ... it doesn't show the latest repo I add	16:12
	as if I need to restart a gitolite service or such, but I don't think that's a thing	16:12
tabakhase	yea not a thing - (no service at all, all just push-hooks and authorized_keys files magic ;D)	16:14
Piraty	hi. i have the unfortunate situation to have to jiggle with repositories imported from svn, and i have an initial import (big and uggly) but alot of (local) branches and now i invested some time to make a proper import from svn via git-svn clone ...	16:14
	now how would i import the branches from repo1 to repo2 with the least hazzle (both having a very similar codebase since originating both from the same svn repo)	16:14
	?	16:14
	→ mikecmpbll joined	16:15
foo	tabakhase: that's what I thought	16:15
	foo tries to modify conf again and push for kicks	16:15
foo	did that, tried to ssh git@b ... still doesn't show the latest repo. So why isn't gitolite picking up my latest repo from the conf. hmm	16:16
tabakhase	Piraty export as patches and replay? -- could even pull "both trees" into the same git-repo, and then use casual rebase --onto...	16:16
foo	... unless there is a permission issue on the server and it's not actually writing?	16:17
Piraty	export as patch? git show <id> > /tmp/patch1 seems hard with many commits	16:17
tabakhase	(note that this is NOT worktree or submodule im talking about)	16:17
	→ Puffball joined	16:17
foo	I did migrate this from one system to another many months ago	16:17
	foo double checks	16:17
	← sahasatvik left	16:17
foo	I do have multiple gitolite-admin repos frmo different system's I admin'd it from but I can't imagine that's the issue	16:18
Piraty	thanks tabakhase	16:18
	→ mven joined	16:20
	← mven left	16:20
	← thefatma left	16:20
tabakhase	Piraty in very "rough" - potential workflow would be smth like "git clone oldrepo; cd oldrepo; git remote add newreo; git fetch newrepo; git rebase XYZ --onto newrepo-master-sha1"	16:20
	← csd_ left	16:20
Piraty	tabakhase: https://stackoverflow.com/a/42802061 mentions something like this, but that "squashes" all commits into one patch, thus loosing my comments	16:21
foo	I tried http://gitolite.com/gitolite/emergencies.html#fixing-botched-repos - no go.	16:21
vishal	Piraty: something like this might work: git format-patch base..branch1 --stdout > patch.mbox; git am -3 patch.mbox	16:22
	that will preserve all commits	16:22
tabakhase	Piraty thats "ugly" as that patchgen is "just diff" in that strupid stackoverfail post ;D -- if you use actual git to make those patches commits are retained	16:22
	→ dermoth_ joined	16:23
	← dermoth left	16:23
Piraty	note both repos share no history (from git's view in terms of hashes)	16:23
	dermoth_ → dermoth	16:23
	← Puffball left	16:24
vishal	if patches apply cleanly, format-patch + am won't care	16:24
	→ kh31d4r joined	16:24
	→ Mattiaslndstrm joined	16:24
	→ mat001 joined	16:25
	→ renich joined	16:26
	→ tang^ joined	16:27
tabakhase	yea thats "fine" (ive done a very similar workflw when "cutting" repositorys in the past - (example usecase here https://git-scm.com/book/en/v2/Git-Tools-Replace )	16:27
	doesnt apply 1:1 to your case, but should be fairly similar ((the "how and what" - not the actual "replace" part, you wont need that at all i guess))	16:28
	so, the """echo 'get history from blah blah blah' \| git commit-tree 9c68fdc^{tree}"""" step is replaced with "using your other repo"	16:30
Piraty	thanks. format-patch and am seem to be the tools i need to start	16:30
	→ theoceaniscool_ joined	16:31
	→ dansan joined	16:31
	← SerialSmile left	16:31
	← theoceaniscool left	16:31
	→ Puffball joined	16:36
	← Hi-Angel left	16:37
	→ duderonomy joined	16:37
	← mikecmpbll left	16:37
	→ orbyt_ joined	16:38
	→ lucasb joined	16:39
	← dpyro left	16:41
	→ dpyro joined	16:42
	← Puffball left	16:42
	→ sahasatvik joined	16:44
	← kreyren left	16:45
	← duderonomy left	16:46
	→ vavkamil joined	16:49
	→ pupsikov joined	16:50
	← rohit[m] left	16:50
	→ rohit[m] joined	16:51
	→ Sonderblade joined	16:52
	← Sonderblade left	16:52
	jokajak3 → jokajak	16:53
	← Mattiaslndstrm left	16:58
	→ Sonderblade joined	16:59
	← pupsikov left	17:01
	→ Mattiaslndstrm joined	17:01
	← nic-hartley left	17:02
	← rohit[m] left	17:03
	→ rohit[m] joined	17:03
	→ nowhere_man joined	17:04
	→ thebope joined	17:06
	→ Noti joined	17:06
	← Noti left	17:08
	← steven left	17:11
	→ steven joined	17:13
foo	rafasc / tabakhase - FYI, my gitolite issue was a perms issue. Simply doing chown -R git.git * in my home directory made everything worked properly. Remnants of an old server move, apparently	17:13
	→ AtumT joined	17:13
foo	rafasc / tabakhase - appreciate the guidance nonetheless	17:13
tabakhase	how odd ;D - but cool cool	17:13
rafasc	:conffetti:	17:14
	← tanuki_ left	17:15
	← jottr left	17:18
	← sahasatvik left	17:19
	← dansan left	17:19
	← orcainbox left	17:20
	→ Tibian joined	17:21
	→ plexigras joined	17:24
	→ dansan joined	17:27
	→ Revan- joined	17:29
	← rsrx left	17:29
	← triad left	17:31
	← sauvin left	17:32
	→ SkarmoutsosV joined	17:33
	← Revan- left	17:34
	→ apoos_maximus joined	17:37
	← mimajof left	17:38
	← thebope left	17:39
	→ orcainbox joined	17:48
	→ jottr joined	17:49
	→ jungsubk joined	17:50
	← foist left	17:52
	← figuinhas left	17:52
	← galaxie left	17:52
	→ galaxie joined	17:54
	→ HotBeefDip joined	17:55
	→ hofmann3900 joined	17:57
	→ duderonomy joined	17:59
	→ tm007 joined	18:03
	← jottr left	18:03
	← orbyt_ left	18:03
	← Copenhagen_Bram left	18:06
	→ Elon_Satoshi joined	18:06
	← nowhere_man left	18:07
	← duderonomy left	18:09
	← kjartan left	18:09
	→ Revan- joined	18:11
	→ courrier joined	18:12
	→ orbyt_ joined	18:13
	← Elon_Satoshi left	18:14
	→ kjartan joined	18:14
	→ Elon_Satoshi joined	18:14
	→ thefatma joined	18:16
	→ kreyren joined	18:17
	→ Ignacy joined	18:17
	→ jottr joined	18:18
	→ duderonomy joined	18:18
	← Tibian left	18:19
	→ Tibian joined	18:19
	← duderonomy left	18:19
	← HotBeefDip left	18:21
	→ fphilipe_ joined	18:23
	→ cousteau joined	18:28
cousteau	I added git notes to a commit, amended the commit, and lost the notes. Any way to recover them?	18:28
Habbie	cousteau, use 'git reflog' to find the pre-amend commit id, then git notes show <id>? i have not tried this	18:29
cousteau	Maybe I should've seen this coming, it made sense that it could happen since the commit changed.	18:29
	Habbie: well I'll be damned, that worked as a charm	18:30
Habbie	yay	18:30
	veegee_ → veegee	18:30
cousteau	Best part, the notes were a TO DO that I just did, so I guess I can delete the note	18:31
Habbie	hah	18:31
	perfect	18:31
	You can therefore inspect the	18:32
	history of the notes by invoking, e.g., git log -p notes/commits.	18:32
cousteau	TODO: test that this actually works because it's Friday night and I want to go home	18:32
Habbie	otherwise apparently there would have been this	18:32
cousteau	(pretty much, not with those words though)	18:33
rafasc	cousteau: in the manpage of notes, there is a section where it instructs how to make notes persist amends and rewrites in general.	18:34
cousteau	Oh	18:34
Habbie	which, apparently, happens by default, unless somebody changed that	18:34
cousteau	Says it defaults to true though	18:35
Habbie	yes, so that's interesting	18:35
cousteau	Does notes.rewrite.amend apply to git commit --amend though?	18:38
rafasc	but notes.rewriteRef doesn't have a default value.	18:39
cousteau	rafasc: oh I see	18:39
Habbie	oh, right	18:41
	→ blackandblue joined	18:43
	← orbyt_ left	18:43
	← rkta left	18:44
	→ rkta joined	18:45
	← Sonderblade left	18:48
	→ Sonderblade joined	18:51
	← thefatma left	18:52
	→ hqdruxn08 joined	18:55
	← spacesuitdiver left	18:56
	← bookworm left	18:56
	→ bookworm joined	18:56
	← jungsubk left	18:58
	← bvdw6 left	18:59
kreyren	can i make a new release on github using git?	19:01
_ikke_	kreyren: no, but there is a tool called hub from github which can do it	19:01
kreyren	_ikke_, ty	19:01
	→ thunderbirdtr joined	19:02
	← cousteau left	19:02
	← kapil____ left	19:02
Habbie	note that just pushing a tag, with git, will cause an entry to appear on the github releases page	19:04
	but it's not an actual release	19:04
	← RoriconKnight left	19:04
	→ Achylles joined	19:06
kreyren	Habbie, elaborate pushing tag? I need a method for end-user to download compiled version of said software which i want to fork and transfer on rolling release	19:06
_ikke_	Then you need an actual release	19:06
Habbie	^ that	19:06
kreyren	noted	19:07
	or can end-user download .zip/tar.gz from tag?	19:07
_ikke_	Yes, but that's just the source tar	19:08
	Nothing pre-compiled	19:08
kreyren	i see, ty	19:08
	← apoos_maximus left	19:08
vishal	I think github creates tarballs for simple tags too (without going through the github draft a release process)	19:09
	https://github.com/torvalds/linux/releases	19:09
Habbie	depending on your needs, you may want to look at doing the compiling in something like travis-ci or circleci, and have them make the release	19:09
	vishal, yes - that's what i meant, but it's just a tree dump	19:09
	← rohit[m] left	19:10
kreyren	Habbie, the compilation is not resource heavy so i want to do it locally .	19:10
Habbie	kreyren, ok :)	19:10
	→ orbyt_ joined	19:10
vishal	ah yeah I see	19:10
	→ rohit[m] joined	19:11
	→ mven joined	19:15
	← Tibian left	19:15
	← rohit[m] left	19:15
	← AtumT left	19:16
	→ AtumT joined	19:16
	→ paulwood joined	19:18
	→ borkr joined	19:18
	→ mikecmpbll joined	19:21
	← czart left	19:21
	← borkr left	19:22
	← xcm left	19:23
	→ xcm joined	19:23
	← AtumT left	19:23
	→ lomex joined	19:24
	→ AtumT joined	19:24
	→ gxt joined	19:27
	← jubal left	19:30
	→ apoos_maximus joined	19:32
	← galaxie left	19:33
	→ nowhere_man joined	19:34
	→ galaxie joined	19:36
	← SkarmoutsosV left	19:37
	← emsjessec left	19:43
	→ CryptoDavid joined	19:43
	→ duderonomy joined	19:46
	← n3wborn left	19:48
	← theoceaniscool_ left	19:48
	← lomex left	19:49
	← Envil left	19:49
	→ n3wborn joined	19:49
	→ theoceaniscool_ joined	19:50
	← blackandblue left	19:53
	← Piraty left	19:53
	← lacrymology left	19:55
	→ acidjnk joined	19:55
	← dviola left	19:56
	→ nly joined	19:58
	← floppydh left	19:58
	→ voidSurfr joined	19:58
	→ jungsubk joined	19:58
	→ inkbottle joined	20:00
	← mven left	20:03
	→ Oatmeal joined	20:07
	→ m0viefreak joined	20:08
	← elichai2 left	20:11
	← jungsubk left	20:12
	← AmShaegar_ left	20:14
	→ AmShaegar joined	20:15
	→ Lucas_Gray joined	20:16
	← AtumT left	20:16
nly	I have project/master which is the latest release of <project> and a feature branch that is kind of old <feature>, How can I pull the specific commits I want from <feature> to master?	20:17
	← dpyro left	20:17
	→ dpyro joined	20:17
moritz	nly: if you want to copy over just some selected commits, cherry-pick is your weapon of choice	20:18
nly	Thanks	20:19
_ikke_	if you want to move the branch, git rebase is more appropriate	20:19
nly	_ikke rebase sounds like the thing i am trying to achieve	20:20
_ikke_	git rebase master <brachname>	20:20
	→ Kaedenn joined	20:21
Kaedenn	What's the .gitignore syntax to re-include a file after excluding a pattern?	20:21
_ikke_	!<pattern>	20:21
Kaedenn	ignore: *.lis, include: headers.lis	20:21
	Thanks	20:21
	→ morganq joined	20:21
nly	Thanks	20:22
_ikke_	double thanks :-)	20:22
gitinfo	_ikki: thanks!	20:22
_ikke_	ha	20:22
	!botsnack	20:22
gitinfo	Om nom nom	20:22
	*_ikke_. Shame I can't type. Metal fingers and all.	20:23
_ikke_	excuses	20:23
nly	Ahhh, it's bringing in changes and merge conflicts i didn't expect	20:23
_ikke_	yup, that's the consequence	20:23
nly	The other option, I could manually make changes from the logs?	20:25
	← wildermind left	20:25
_ikke_	Depends on how difficult the conflicts are	20:27
	← Kaedenn left	20:28
nly	Thanks	20:28
	← orbyt_ left	20:31
	→ orbyt_ joined	20:35
	← Ignacy left	20:37
	← plexigras left	20:37
	← roflin left	20:38
	← mowcat left	20:39
	→ pupsikov joined	20:44
nly	Ah shit, branch's head is pointing to somewhere entirely different than just a while ago	20:45
	→ bashfulshell joined	20:46
	← mikecmpbll left	20:47
	← molusc left	20:48
	← Shentino left	20:49
nly	Nvm, found the commit	20:51
	saved :)	20:51
	← orbyt_ left	20:52
	← pupsikov left	20:54
	← Siecje left	20:57
	← AbleBacon left	20:57
	← fphilipe_ left	20:57
	→ greatgatsby joined	20:58
	→ Shentino joined	20:58
	→ orbyt_ joined	20:58
	← Regon left	20:59
	→ durham joined	21:03
	→ thebope joined	21:06
	← howdoi left	21:08
	→ The_Letter_M joined	21:11
	← thebope left	21:11
	← Oatmeal left	21:13
	→ dviola joined	21:16
	← isBEKaml left	21:17
	← wootehfoot left	21:19
	← Lucas_Gray left	21:20
	← arecaceae left	21:22
	→ arecaceae joined	21:22
	→ mven joined	21:24
	← Mr__Anderson left	21:25
	← theoceaniscool_ left	21:27
	→ jubal joined	21:27
	← orbyt_ left	21:28
	→ aruns joined	21:30
aruns	OCODOBOBODOAOB	21:31
avu	Gesundheit	21:31
aruns	Hey guys, somewhat stupid question incoming: I am working on a Git submodule for a bunch of useful hook scripts I can plug into some of our work projects. I have a pre-commit file, for e.g, whose contents are a Bash shebang and the command php scripts/pre-commit.php - the scripts folder being in the same location as the pre-commit file.	21:32
	← analogical left	21:32
aruns	What is the best way of having it read scripts/pre-commit.php as relative to the script location, in both Windows and Linux?	21:33
	← Sonderblade left	21:34
	← finalbeta left	21:34
aruns	As otherwise it would look for scripts/pre-commit within my current working directory.	21:34
	← acercle left	21:34
	→ acercle joined	21:34
	← royal_screwup21 left	21:38
	→ royal_screwup21 joined	21:38
	→ ash_worksi joined	21:38
	→ roflin joined	21:39
ash_worksi	I remember accidentally doing a pull and loosing my work... right now I have changes and I WANT to override them but git is telling me no	21:39
	→ Samian joined	21:39
ash_worksi	I guess I _have_ to stash before pulling?	21:39
Samian	something funky happened to my local repo. What's the best way to get everything over again from the remote server? Do I just delete the source code folder and redo the command to copy remote repo to local?	21:40
rafasc	Samian: if you truly want to discard everything, you can reset --hard <something>;	21:42
	← inkbottle left	21:43
	→ inkbottle joined	21:44
	← st-gourichon-f left	21:46
	← yyy left	21:47
	vavkamil → __infinity	21:47
ash_worksi	doesn'	21:48
	doesn't an empty .gitignore file mean 'ignore everything here'	21:48
	?	21:48
Zarthus	no	21:49
mud	No. It means nothing	21:49
ash_worksi	hmm... wonder where I got that impression	21:49
	¯\_(ツ)_/¯	21:50
Zarthus	if you see an empty folder with an empty gitignore in it, it's probably just there to mark the directory as present	21:50
ash_worksi	so just throw in a / ?	21:50
	I see	21:50
mud	A / would ignore everything, yeah	21:50
Zarthus	personally i would suggest keeping your ignores at the root of your project	21:50
	splitting up gitignores sometimes adds to complexity rather than reducing it	21:50
mud	Usually good advice ^	21:51
	← foo left	21:51
tang^	using a gitignore just to keep a directory implies that you don't know how to separate build and runtime directories	21:51
	→ Fernando-Basso joined	21:52
mud	git makes a fairly arbitrary choice that empty directories aren't content, but empty files are. I wouldn't read too much into the assumption going the other way being convenient.	21:53
	← gloomy left	21:54
	→ datasmurf joined	21:55
datasmurf	Hello	21:55
gitinfo	datasmurf: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	21:55
	← n-st left	21:56
	← tang^ left	21:57
	→ n-st joined	21:59
	← mven left	22:02
ash_worksi	damn it	22:02
	← durham left	22:02
ash_worksi	I accidentally committed files before using the .gitignore /	22:02
	← howell left	22:02
	← roflin left	22:03
ash_worksi	I how do I fix that?	22:03
vishal	ash_worksi: has the commit been pushed anywhere (or do you care about history)	22:05
	→ miczac joined	22:05
	← miczac left	22:06
	← greggerz left	22:07
	← nly left	22:08
	→ st-gourichon-fid joined	22:08
jimender2	How would I go about changing the repository url? I am trying to upload an old version of a git project but it wont let me	22:09
	← PacKetSlayer left	22:11
	→ PacKetSlayer joined	22:11
jimender2	never mind, I figured it out	22:12
rafasc	jimender2: btw, that question isn't git specific.	22:13
	it will depend where you are hosting your git repo.	22:13
jimender2	is git and github not the same thing?	22:13
rafasc	no.	22:13
	!github	22:13
gitinfo	GitHub is a !3rdparty commercial service offering freemium !hosting services for repositories & projects. https://github.com/features	22:13
	← dmiles left	22:14
rafasc	!github_vs_git	22:14
gitinfo	github.com is not git; it's a hosting platform for git. There are alternative hosting offers (you can even host repositories yourself, or work on something on your own without any hosting whatsoever), and the range of features on the corresponding websites may differ. Git has little influence on what happens in github's web interface.	22:14
jimender2	ok then. Sorry about that	22:15
	→ libertyprime joined	22:15
ash_worksi	vishal: yes and no	22:15
	yes it has, no I don't care	22:15
vishal	ash_worksi: git rm --cached <files>; git commit --amend (assuming this is the top commit).	22:16
	Then you will need to push --force(-with-lease)	22:16
	If it is not the top commit, rebase -i	22:17
	← aruns left	22:17
ash_worksi	k, I'll look into rebase -i	22:17
vishal	ok you will want the 'edit' option int he todo list. It will pause at that commit. Perform the above rm, commit --amend steps	22:18
	then rebase --continue	22:18
	(and maybe with 'edit' you don't need to commit --amend) git status at that point should tell you	22:19
	maybe you can just rebase --continue after updating the index	22:20
	vishal forgets	22:20
	← courrier left	22:23
	← kjartan left	22:23
	← jubal left	22:24
	← duckonomy left	22:26
	→ kjartan joined	22:27
	→ roflin joined	22:29
	← dege left	22:29
	→ jubal joined	22:31
	← apoos_maximus left	22:32
	→ orbyt_ joined	22:34
	← jubal left	22:35
	→ jubal joined	22:36
	← dviola left	22:36
	← jubal left	22:36
	→ jubal joined	22:38
	← queip left	22:42
	← causa_sui left	22:45
	← brethil left	22:48
	← lucasb left	22:48
	← Achylles left	22:48
	← The_Letter_M left	22:51
	← edwardly left	22:53
	→ queip joined	22:54
	← Revan- left	22:54
	→ fphilipe_ joined	22:55
	→ edwardly joined	22:56
	← CryptoDavid left	22:57
	→ cfoch joined	22:57
	← fphilipe_ left	23:01
	→ fatalhalt joined	23:01
	← m0viefreak left	23:04
	← sat-aton left	23:05
	← ChrisLane left	23:08
	→ jstimm joined	23:13
	← greatgatsby left	23:15
	→ oatmealraisin joined	23:21
	→ dodobrain joined	23:24
	→ yonder joined	23:29
	← n3wborn left	23:34
	← acercle left	23:34
	← thiago left	23:42
	← cd left	23:43
	← royal_screwup21 left	23:43
	→ navidr joined	23:44
	← Atlenohen left	23:45
	→ Noldorin joined	23:55
	← CodeSlingerPaul left	23:58

Logs Search ←Prev date Next date→

Channels Documentation