IRCloggy #git 2017-11-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-11-28
	← jrabe left	00:00
ojacobson	or git-shell but gitolite's a bit more capable if you have more than a single user+repo pair	00:00
	← jstein left	00:01
	→ jrabe joined	00:02
foo	ojacobson: got it, appreciate it!	00:02
	← akushner left	00:02
	→ tmsmith joined	00:02
	→ DaGoaty joined	00:02
	← Jskal left	00:03
	← ghost43 left	00:03
	← Cabanossi left	00:03
	← finalbeta left	00:04
	→ ghost43 joined	00:04
	→ Cabanossi joined	00:06
	→ anli joined	00:06
	← upperdeck left	00:07
	← DaGoaty left	00:07
	← TomyLobo left	00:08
	→ DaGoaty joined	00:08
	→ upperdeck joined	00:10
	← ghost43 left	00:10
	→ nowhere_man joined	00:10
	→ ghost43 joined	00:10
	← hanna left	00:12
	← rosa left	00:12
	← DaGoaty left	00:13
	← anli left	00:13
	→ rosa joined	00:13
	→ converge joined	00:14
	← upperdeck left	00:14
	← aielima left	00:14
	→ upperdeck joined	00:16
	← simg01 left	00:18
	→ dsdeiz joined	00:18
	→ DaGoaty joined	00:20
	← rosa left	00:20
	→ rosa joined	00:20
	← upperdeck left	00:20
	← rosa left	00:21
	→ rosa joined	00:21
	→ Slayer joined	00:21
	← rosa left	00:22
	→ upperdeck joined	00:22
	→ rosa joined	00:23
	← Gustavo6046 left	00:24
	← rosa left	00:24
	→ rosa joined	00:24
	← rosa left	00:25
	← manuelschneid3r left	00:25
	→ ljc joined	00:26
	← upperdeck left	00:29
	→ upperdeck joined	00:30
	← jottr left	00:31
	→ akushner joined	00:32
	← DaGoaty left	00:33
	← orbyt_ left	00:33
	→ DaGoaty joined	00:33
	← matsaman left	00:33
	→ jameser joined	00:34
	← DaGoaty left	00:38
	← upperdeck left	00:38
	→ upperdeck joined	00:39
	→ sosheskaz joined	00:39
	← thiago left	00:42
	→ nowhereman_ joined	00:43
	→ hanna joined	00:43
	← sosheskaz left	00:44
	← tymczenko left	00:46
	← nowhere_man left	00:47
	← tmsmith left	00:48
	← xaa left	00:51
	→ cdg joined	00:51
	← Slayer left	00:51
	← upperdeck left	00:52
	→ upperdeck joined	00:53
	← sea-gull left	00:54
	← cdg_ left	00:55
	→ beta169 joined	00:55
	← cdg left	00:56
	→ tymczenko joined	00:56
	→ dviola joined	00:56
	← because left	00:57
	→ Jskal joined	00:57
	→ ResidentBiscuit joined	00:57
	← tymczenko left	00:58
	← upperdeck left	00:58
	→ because joined	00:58
	→ upperdeck joined	00:58
	← Murr left	00:59
	← sim590 left	00:59
	→ Murr joined	01:00
	← PaulCapestany left	01:00
	← in1t3r left	01:00
	→ mar77i joined	01:00
	← converge left	01:01
	← akushner left	01:01
	← lupine left	01:01
	→ converge joined	01:01
	→ in1t3r joined	01:01
	← MaekSo left	01:01
	← ResidentBiscuit left	01:01
	→ sim590 joined	01:01
	→ PaulCapestany joined	01:01
	→ lupine joined	01:02
	← svm_invictvs left	01:03
	← upperdeck left	01:03
	→ manuelschneid3r joined	01:04
	→ MaekSo joined	01:04
	→ svm_invictvs joined	01:04
	→ tymczenko_ joined	01:05
	← rorro left	01:05
	→ upperdeck joined	01:05
	← tymczenko_ left	01:07
	← beta169 left	01:09
	→ jomo2205 joined	01:10
	← manuelschneid3r left	01:11
	→ tymczenko_ joined	01:12
	← tymczenko_ left	01:12
	→ tymczenko__ joined	01:13
	→ cqi joined	01:13
	← mumux left	01:13
	← upperdeck left	01:14
	← fscala left	01:14
	→ durham_ joined	01:14
	← str left	01:15
	→ upperdeck joined	01:15
	← Trel left	01:16
	→ step joined	01:17
	← durham left	01:17
	← tymczenko__ left	01:19
	→ Feral_Cat joined	01:19
	← durham_ left	01:20
	→ nd_ joined	01:20
	← upperdeck left	01:22
	← nd left	01:23
	→ upperdeck joined	01:23
	← ljc left	01:25
	→ nd joined	01:25
	← airdisa left	01:26
	→ tymczenko_ joined	01:26
	← shinnya left	01:26
raynold	ahh it's a wonderful day	01:27
	← nd_ left	01:27
	→ Arcaelyx_ joined	01:27
	→ ljc joined	01:28
	→ nd_ joined	01:29
	← mooasaurus left	01:30
	→ paulg joined	01:30
	→ rofl_ joined	01:30
	← nd left	01:31
	→ mooasaurus joined	01:31
	← Arcaelyx left	01:31
	→ nd joined	01:32
	← rofl_ left	01:32
	→ rofl_ joined	01:32
	← jcarpenter2 left	01:32
	← converge left	01:32
	→ Kiruwa joined	01:34
	← nd_ left	01:35
	→ tymczenko joined	01:36
	rofl_ → jcarpenter2	01:36
	← gopar left	01:37
	→ gopar joined	01:37
	← eijk left	01:38
	→ nd_ joined	01:38
	← nd left	01:39
	→ thiago joined	01:39
	← cagomez left	01:40
paulg	Found an interesting inconsistency. A sanity check I wrote compares a backported patch to the parent, looking at the @@ lines to ensure they both patch the same function...	01:40
	But if you use a bare repo, you get the most recent jump label in the @@ line and not the function name.	01:41
	https://pastebin.com/gQDCwfBA	01:41
	← Bercik left	01:42
	→ nd joined	01:43
	← nd_ left	01:43
	→ Bercik joined	01:44
	→ madewokherd joined	01:47
	← tymczenko_ left	01:47
	← qpdb left	01:51
	→ qpdb joined	01:51
	← upperdeck left	01:54
	→ byte512 joined	01:55
	→ upperdeck joined	01:55
	→ tmsmith joined	01:58
	→ converge joined	01:59
	→ Trel joined	02:01
	← gopar left	02:02
	→ finalbeta joined	02:02
	→ in1t3r_ joined	02:03
	→ gopar joined	02:03
	← leeN left	02:03
	← ljc left	02:03
	→ Lyqyd joined	02:04
	← gopar left	02:04
	← tunekey left	02:04
	→ texinwien_ joined	02:04
	→ gopar joined	02:05
	← in1t3r left	02:05
	← converge left	02:08
	← Feral_Cat left	02:09
	← tvw left	02:10
	← perrier-jouet left	02:10
	→ ResidentBiscuit joined	02:14
	← tmsmith left	02:14
	← gopar left	02:17
	→ gopar joined	02:18
	← Zamerick left	02:18
	→ Elon_Satoshi joined	02:18
	← ResidentBiscuit left	02:19
	← Cabanossi left	02:19
	← dsdeiz left	02:20
	→ dsdeiz joined	02:21
	← dsdeiz left	02:21
	→ dsdeiz joined	02:21
	→ Cabanossi joined	02:21
	← step left	02:21
	← markmarkmark left	02:23
	← brent__ left	02:23
	← justanotheruser left	02:24
	→ ResidentBiscuit joined	02:26
	→ justanotheruser joined	02:26
	← justanotheruser left	02:27
	← ResidentBiscuit left	02:27
	→ justanotheruser joined	02:27
	→ durham joined	02:27
	→ orbyt_ joined	02:29
	→ bambams joined	02:32
	← bambams left	02:32
	→ bambams joined	02:32
	→ dreiss joined	02:32
	→ fscala joined	02:32
	→ Nizumzen joined	02:35
	← nevodka left	02:37
	→ markmarkmark joined	02:39
	← ilbot3 left	02:46
	← dave0x6d left	02:46
	← Jskal left	02:47
	→ ResidentBiscuit joined	02:47
	← dreiss left	02:48
	← gopar left	02:49
	→ nevodka joined	02:50
	→ Jskal joined	02:52
	← Tobbi left	02:52
	← pks left	02:57
	→ ilbot3 joined	02:58
	→ pks joined	02:59
	← Murr left	02:59
	→ Murr joined	03:00
	← d^sh left	03:00
	→ d^sh joined	03:01
	→ snowkidind joined	03:02
	← Cabanossi left	03:03
	→ Cabanossi joined	03:06
	→ codyw joined	03:08
	→ Rothschild_666 joined	03:11
	→ lagothri1 joined	03:11
Rothschild_666	sup my git dawgs!	03:11
	how come when i run git remote fetch after git remote add origin path_to_project	03:13
	← lagothrix left	03:13
Rothschild_666	all of the files from the remot repo are marked as deleted?	03:14
	but not staged for delete?	03:14
mmattice	remote fetch doesn't do anything with the working copy, just pulls down commits	03:14
	→ igemnace joined	03:15
Rothschild_666	so i need to merge them into the working copy?	03:16
	← svm_invictvs left	03:17
	← ResidentBiscuit left	03:22
	← jnewt left	03:26
	← Elon_Satoshi left	03:27
	← sunri5e left	03:29
	→ sunri5e joined	03:29
	→ neel joined	03:30
	← Rothschild_666 left	03:30
	neel → Guest27261	03:30
	→ Elon_Satoshi joined	03:30
	← pks left	03:31
	→ sarp joined	03:35
	→ pks joined	03:35
	← dviola left	03:35
	← [Brain] left	03:37
	← durham left	03:38
	→ durham joined	03:39
	→ scientes joined	03:41
	← scientes left	03:41
	→ scientes joined	03:41
	→ xaxxon joined	03:42
	← jomo2205 left	03:43
	→ ResidentBiscuit joined	03:44
	→ cqi_ joined	03:46
	← cqi left	03:47
	→ rjsalts joined	03:47
	→ bruz_ joined	03:48
	→ chachasmooth_ joined	03:49
	← chachasmooth left	03:49
	← JackFruh left	03:50
	← xaxxon left	03:52
rjsalts	I have a project that's been going since 1989 or thereabouts. There is a home grown version control system that makes RCS look highly advanced. I'm wanting to import the history into git.	03:53
	← ResidentBiscuit left	03:54
rjsalts	The way it works is that it has a directory which has entire copies of the old versions of a file. e.g. if it was foo.c there is an FCS/.foo.c.1.000 and a FCS/.foo.c.log with commit messages	03:55
	Are there any tools that could help import such a history?	03:57
	← bruz_ left	04:01
	← Munt left	04:01
	← pks left	04:03
	→ pks joined	04:05
mmattice	I wrote a script to import a visual source safe repo into subversion years ago. It essentially checked out every revision, copied that over the working copy, and checked it in. It was ugly, but it worked.	04:05
	→ cdg joined	04:06
	← mulvane left	04:07
rjsalts	does vss track commits per file, or have multiple files in a commit?	04:08
	← _Vi left	04:08
	→ _Vi joined	04:09
rewt	if you're doing checkout from one vcs and commit to another, that shouldn't really matter	04:09
rjsalts	It's not a VCS perse, it's backups of files with a file that contains descriptions of changes	04:10
	per se even	04:11
	← Enphuego left	04:11
rjsalts	there are also a large number of files which are "version controlled"	04:11
	although I don't think that's a big deal	04:12
	→ mulvane joined	04:12
	← mulvane left	04:12
	→ mulvane joined	04:12
	← rafasc left	04:15
	→ Bobguy joined	04:18
	← Cabanossi left	04:18
	→ svm_invictvs joined	04:19
	→ Cabanossi joined	04:20
	← Bobdude left	04:22
	→ dreiss joined	04:30
	← durham left	04:32
	← overlord_tm left	04:35
	← Puffball left	04:37
	← snowkidind left	04:38
	→ Puffball joined	04:40
	→ noobineer joined	04:41
	← noobineer left	04:41
	→ Rr4sT joined	04:44
	→ mizu_no_oto joined	04:45
	← upperdeck left	04:47
	→ xaxxon joined	04:47
	← cdg left	04:48
	→ cdg joined	04:48
	→ upperdeck joined	04:49
	← cdg left	04:53
	← Bajax left	04:56
	← orbyt_ left	04:56
	→ imack joined	04:58
	← Murr left	04:59
	→ Murr joined	05:00
	→ Bajax joined	05:03
	← qqx left	05:04
	→ dirtyroshi__ joined	05:04
	← swift1 left	05:04
	→ niax joined	05:04
	← dirtyroshi__ left	05:05
	→ qqx joined	05:05
	→ CustosLimen joined	05:05
	→ anh joined	05:05
	← Guest27261 left	05:05
	→ swift1 joined	05:05
	← anh left	05:06
	← dreiss left	05:06
	← nephyrin left	05:09
	→ govg joined	05:11
	→ nephyrin joined	05:12
	← sarp left	05:13
	← Bajax left	05:15
	← dre_ left	05:19
	→ MACscr joined	05:19
	→ Bajax joined	05:24
	← reallycooldude left	05:30
	→ day__ joined	05:31
	→ reallycooldude joined	05:32
	← daey left	05:34
	day__ → daey	05:35
	← xlegoman left	05:35
	← cqi_ left	05:36
	→ sarp joined	05:36
	→ freimatz joined	05:36
	← ZexaronS left	05:38
	→ xaxxon_ joined	05:40
	← xaxxon left	05:40
	xaxxon_ → xaxxon	05:40
	← reallycooldude left	05:43
	→ philosaur joined	05:44
	← luckman212 left	05:49
	← ghost43 left	05:50
	→ ghost43 joined	05:50
	→ darktemprary joined	05:52
	→ jj995 joined	05:52
	→ re1 joined	05:52
jj995	I'm trying to change a git-crypt key, and all attempts to do so seem to lead to fatal git diff errors. Is there an alternative to git-crypt? How can anyone responsibly use git-crypt without the ability to rotate keys?	05:53
	← netj left	05:53
	→ netj joined	05:53
	← xaxxon left	05:54
	→ luckman212 joined	05:55
	→ xaxxon joined	05:56
	← mizu_no_oto left	05:57
	← xaxxon left	05:57
	← yohnnyjoe left	05:58
	→ xaxxon joined	05:58
	→ cqi joined	05:58
binary106	hi my git branch -vv says a non-checked out branch is "behind 1004".. how do i pull this so it's up to date?	06:01
	← xaxxon left	06:02
	→ reallycooldude joined	06:02
	→ xaxxon joined	06:03
	← Jskal left	06:04
	← boombatower left	06:07
	→ re1_ joined	06:10
	← darktemprary left	06:11
_ikke_	binary106: check out that branch and then either git merge or git rebase	06:12
binary106	that's suprising that i can't do --all	06:13
	→ darktemprary joined	06:13
binary106	so if i'm working on a feature branch, and i want to pull latest changes from master.. do i have to checkout master && pull first	06:14
thiago	binary106: --all what	06:15
	?	06:15
	← re1 left	06:15
	→ neil_cn joined	06:15
thiago	you used "master" in that sentence twice but I think you meant two different branches called master	06:15
binary106	git fetch --all	06:15
thiago	the first "master" you probably meant "origin/master"	06:16
binary106	well i did git checkout master && git checkout -b my-branch	06:16
	but i forgot to pull latest from master	06:16
thiago	the first command was useless	06:16
binary106	ah	06:16
thiago	oh, it set up the tracking	06:16
	← felixsanz left	06:16
thiago	you could have done: git checkout -b my-branch master	06:16
	you don't need to update the local master. You can simply merge/rebase on top of origin/master	06:17
	as for git fetch, you can do git fetch --all	06:17
	→ re1 joined	06:17
thiago	but git fetch never updates local branches	06:17
	→ BULUT35 joined	06:17
binary106	but git fetch -all didn't do anything when i was on my-branch	06:17
	--all	06:17
thiago	that's because git fetch doesn't do anything to any branch	06:17
	← BULUT35 left	06:18
binary106	well i also tried git pull --all	06:18
	← codyw left	06:18
	→ codyw joined	06:18
thiago	that's a misleading option	06:18
	don't use it	06:18
binary106	well it's what i want	06:18
thiago	no, it's not	06:18
binary106	git pull *	06:18
	it is :D	06:18
thiago	git pull --all == git fetch --all && git merge @{u}	06:18
	← cur8or left	06:18
binary106	i was on my-branch, and git branch -vv shows master is behind..	06:19
thiago	it does not do what you want	06:19
	→ felixsanz joined	06:19
binary106	sure but the language "all" is what i want	06:19
thiago	I understand what you want	06:19
	that's not git pull --all	06:19
binary106	so do i have to go back to master, pull that, then checkout my-branch again	06:20
	thx for this help btw, i'm so dumb	06:20
thiago	no, you don't	06:20
	you don't need to update the local master	06:20
	← nydel07 left	06:20
binary106	but i just branched from an old master	06:20
	by mistake	06:20
thiago	yeah, so?	06:21
	→ sosheskaz joined	06:21
binary106	how do i bring my-branch up to date with master	06:21
thiago	you can update the branch after you've created to the latest upstream	06:21
	again using "master" to mean two things	06:21
	it is up to date with master (the local branch)	06:21
binary106	oh	06:21
	→ jceb joined	06:21
	← re1_ left	06:21
thiago	it's not up to date with remote master	06:21
binary106	so if i had done checkout -b my-feature origin/master, it'd have worked?	06:21
thiago	yes	06:22
	and it would have set up the tracking branch too	06:22
binary106	and fetch updates the origin/ bit?	06:22
thiago	yes	06:22
	→ LocaMocha joined	06:23
binary106	so i do git checkout master && git fetch --all && git pull && git branch -d my-feature && git checkout my-feature origin/master	06:24
	→ Guest27261 joined	06:24
	→ SuperHacker joined	06:24
thiago	no	06:24
	→ aoscott joined	06:24
thiago	first of all, you don't need git fetch before git pull. Pull will fetch.	06:25
	second, if you don't specify -b when calling checkout, you can't pass the branch to start from	06:25
	← sosheskaz left	06:25
binary106	oops, thx, i added the -b	06:25
	→ happymeal joined	06:25
thiago	so more simply: git checkout master && git pull && git checkout -b my-feature origin/master	06:25
binary106	it worked! thank you	06:26
thiago	finally, note that the branch creation does not depend on the local master	06:26
	→ anli joined	06:26
thiago	so the first checkout isn't necessary. You can just do: git fetch && git checkout -b my-feature origin/master	06:26
binary106	even if i didnt have master locally, that's cool	06:26
thiago	or: git checkout -b my-feature origin/master && git pull	06:26
binary106	now, this branch wont touch anything that gets edited on master, so when master updates next, what command do i type	06:26
	← jameser left	06:27
binary106	something like git pull --rebase --ff-only ?	06:27
thiago	command to do what?	06:27
binary106	rebase updates to master onto my-feature	06:27
thiago	git pull --rebase	06:27
binary106	(atm i'm paranoid i'm going to get master/my-branch the wrong way around haha)	06:27
	→ VolcanoMan joined	06:27
binary106	but not from my-feature, but from master	06:28
	→ jameser joined	06:28
	← SuperHacker left	06:28
thiago	git checkout my-feature && git pull --rebase	06:28
	the local master branch is irrelevant	06:28
	→ SuperHacker joined	06:29
	← SuperHacker left	06:29
binary106	okay so i'm on my-feature branch	06:29
	and origin/master has updated	06:29
	← Puffball left	06:29
thiago	ok	06:29
	→ Jskal joined	06:31
	→ pgupta joined	06:31
	← darktemprary left	06:31
	→ Puffball joined	06:32
	→ darktemprary joined	06:32
	← pgupta left	06:32
	← Lyqyd left	06:33
binary106	will git pull --rebase only take from origin/my-branch. To pull changes from origin/master, do i execute "git rebase origin/master" ?	06:33
	← mooasaurus left	06:35
	← ghost43 left	06:36
binary106	ooh	06:36
	→ ghost43 joined	06:37
binary106	so this tracking thing has linked my-branch to origin/master, i see, so when i git pull it comes from master instead of my-branch?	06:37
	origin/master*	06:37
thiago	git pull --rebase == git fetch && git rebase @{u}	06:37
	← mentalita left	06:37
binary106	what is @{u}	06:38
	have i created a local branch only? i wanted it to appear in bitbucket, too	06:39
	← Puffball left	06:40
binary106	in phpstorm, next to my-branch it says origin/master, but a previous branch i created a while ago says "origin/my-other-branch"	06:40
	→ Puffball joined	06:40
thiago	@{u} is your upstream branch	06:40
	it's a literal thing. Git replaces it with the upstream branch	06:40
	yes, you have only created a local branch	06:41
	if you want it to appear ina remote, push it	06:41
binary106	but i'm worried it's going to push to origin/master	06:42
thiago	git push origin my-feature:my-feature	06:42
	the first time you push, you may need to write refs/heads/my-feature for the second part	06:43
	← happymeal left	06:43
	→ ZyX-I joined	06:43
	→ hellux joined	06:44
	→ zefferno joined	06:46
	→ shripadr joined	06:46
	→ muelleme joined	06:47
	→ mooasaurus joined	06:47
	← jceb left	06:51
	→ dreiss joined	06:52
	→ mooasaur1s joined	06:53
	← Rr4sT left	06:54
	← mooasaurus left	06:54
	→ jost joined	06:56
	→ mentalita joined	06:56
binary106	thanks, it worked =]	06:58
	← Murr left	06:59
	→ Murr joined	07:00
	← dsdeiz left	07:00
	→ Raging_Hog joined	07:00
	→ nydel07 joined	07:00
	→ dsdeiz joined	07:01
	← dsdeiz left	07:01
	→ dsdeiz joined	07:01
	← VolcanoMan left	07:01
	→ VolcanoMan joined	07:02
	← freimatz left	07:02
	→ freimatz joined	07:02
	→ rscata joined	07:04
	→ dec0n joined	07:04
	→ MrMojit0 joined	07:06
	← darktemprary left	07:08
	← VolcanoMan left	07:08
	→ cur8or joined	07:09
	→ Repox joined	07:18
	← chachasmooth_ left	07:19
	→ chachasmooth joined	07:19
	→ jameser_ joined	07:20
	← paulg left	07:20
	→ happymeal joined	07:20
	← lupine left	07:20
	→ SuperHacker joined	07:20
	→ dave0x6d joined	07:20
	→ darktemprary joined	07:21
	→ lupine joined	07:22
	← SuperHacker left	07:22
	← Garen left	07:22
	← jameser left	07:23
	→ VolcanoMan joined	07:24
	→ SuperHacker joined	07:24
	← SuperHacker left	07:24
	← muelleme left	07:24
	→ ocds joined	07:25
	→ devbaka joined	07:25
	→ Garen joined	07:25
	← happymeal left	07:25
	→ happymeal joined	07:26
	→ schleppel joined	07:26
	→ abba joined	07:27
	← VolcanoMan left	07:27
	→ VolcanoMan joined	07:28
	← anli left	07:31
	→ Dreadnaught joined	07:31
	← Dreadnaught left	07:31
	→ Dreadnaught joined	07:31
	← jameser_ left	07:32
	← Cabanossi left	07:33
	← darktemprary left	07:33
	→ jameser joined	07:34
	← Kulrak left	07:34
	→ VanlindtMarc1979 joined	07:34
	→ Cabanossi joined	07:35
	→ tkore\work joined	07:35
	→ darktemprary joined	07:37
	→ in1t3r joined	07:38
	→ JeroenT joined	07:39
	← JeroenT left	07:39
	→ yohnnyjoe joined	07:39
	→ JeroenT joined	07:39
	← in1t3r_ left	07:41
	← ocds left	07:43
	→ xaxxon_ joined	07:43
	→ bruce_lee joined	07:43
	← xaxxon left	07:44
	← yohnnyjoe left	07:44
	→ oojacoboo joined	07:46
	← dreiss left	07:48
	→ BR5C003Y_D00 joined	07:48
	→ cdg joined	07:49
	→ wandering_vagran joined	07:51
	← BR5C003Y_D00 left	07:51
	← MaekSo left	07:52
	→ MaekSo joined	07:52
	← guideline left	07:53
	← cdg left	07:53
	→ Silmarilion joined	07:54
	← jameser left	07:55
	→ jameser joined	07:55
	→ eshlox joined	07:56
	← jrabe left	08:00
	→ chele joined	08:01
	→ jrabe joined	08:02
	→ dre_ joined	08:03
	→ seschwar joined	08:04
	→ hs366 joined	08:05
	← VolcanoMan left	08:05
	← happymeal left	08:05
	→ happymeal joined	08:05
	→ VolcanoMan joined	08:05
	→ theoceaniscool joined	08:05
	→ senaps joined	08:06
	→ guideline joined	08:06
	← guideline left	08:07
	← sclarkso left	08:07
	← happymeal left	08:08
	→ happymeal joined	08:08
	→ sclarkso joined	08:08
	→ bauruine joined	08:09
	← texinwien_ left	08:10
	→ yohnnyjoe joined	08:11
	→ texinwien_ joined	08:12
	→ cdown joined	08:13
	← thiago left	08:14
	→ dlf42 joined	08:14
	← yohnnyjoe left	08:15
	← scientes left	08:16
	→ murii_ joined	08:17
	← jost left	08:18
	→ sea-gull joined	08:18
	← ZyX-I left	08:18
	← kculpis left	08:21
	→ thierryp joined	08:22
	→ TomyWork joined	08:22
	→ flaviodesousa joined	08:23
	← thierryp left	08:24
	→ ResidentBiscuit joined	08:25
	ketas → ketas--	08:25
	← texinwien_ left	08:27
	→ texinwien_ joined	08:28
	← VolcanoMan left	08:29
	→ dege joined	08:30
	← ResidentBiscuit left	08:30
	ketas- → ketas	08:30
	← dsdeiz left	08:30
	← devbaka left	08:30
	→ dsdeiz joined	08:31
	← dsdeiz left	08:31
	→ dsdeiz joined	08:31
	→ thierryp joined	08:31
	← Jskal left	08:31
	← Cabanossi left	08:32
	→ VolcanoMan joined	08:33
	→ basteh joined	08:33
	← madewokherd left	08:34
	→ Cabanossi joined	08:35
	→ guideline joined	08:36
	→ kurkale6ka joined	08:37
	→ mikedd joined	08:37
	→ diqidoq joined	08:41
	← kurkale6ka left	08:42
	→ xaa joined	08:43
	→ howdoi joined	08:45
	← VolcanoMan left	08:46
	→ VolcanoMan joined	08:47
	← dsop left	08:47
	← darktemprary left	08:49
	→ madknight joined	08:49
	→ matthiaskrgr joined	08:49
	matthiaskrgr → Guest63406	08:49
	→ Darcidride joined	08:50
	← cdown left	08:50
	→ darktemprary joined	08:50
	→ hio joined	08:51
	→ Munt joined	08:51
hio	hi, I just did git pull. Can I revert that somehow?	08:51
	→ eijk joined	08:51
grawity	git reset [probably with --hard] @{1}	08:51
	if the merge was successful	08:51
	if it wasn't successful, just do `git merge --abort` instead	08:51
hio	i think it was	08:52
	→ kurkale6ka joined	08:52
	→ dsop joined	08:54
	← Raed left	08:55
hio	grawity, it removed my local changes but it didnt go back to where it was before	08:56
	← ketas-- left	08:56
	→ Raed joined	08:57
	→ floppydh joined	08:57
	← Anja_ left	08:57
	→ f2k joined	08:59
	← Murr left	08:59
	→ Murr joined	09:00
	→ jstein_ joined	09:01
	jstein_ → jstein	09:01
	→ oxymoron93 joined	09:01
	← Cabanossi left	09:02
	← whitby left	09:04
	← Barrt left	09:04
	→ Barrt joined	09:05
	→ whitby joined	09:05
	→ Cabanossi joined	09:05
	← permalac left	09:06
	→ overlord_tm joined	09:07
	← kurkale6ka left	09:08
	← freimatz left	09:10
	→ kurkale6ka joined	09:10
	→ cousteau joined	09:11
tobiasvl	hio: where did it go then?	09:12
cousteau	Hi. I have a repo with a "master" branch, a "style" branch a few commits ahead of "master", and a "style2" branch in the same commit as "style". I want to remove "style2" without removing "style".	09:13
	however when I do `git branch -d style2` I get a warning about it not being merged... is it ok to remove it?	09:14
oxymoron93	git checkout master && git branch -D style2	09:14
cousteau	or should I checkout to "style" just in case?	09:14
osse	cousteau: yes	09:14
cousteau	...ok but I'm gonna checkout style first just in case	09:14
osse	cousteau: Checking out style will silence the warning	09:14
jast	'git branch -d' compares to the currenty checked out branch, so once you're on 'style' it'll find that everything is "merged" :)	09:15
cousteau	yep, it did :) I therefore assume it was safe	09:15
	← dsop left	09:15
	← diqidoq left	09:15
oxymoron93	it is always safe, it is just a name	09:15
	→ anli joined	09:15
oxymoron93	imo	09:15
cousteau	I always prefer not having warnings to ignoring warnings	09:15
	oxymoron93, yeah but I'm kinda new to git and I really didn't want to lose that whole commit string	09:16
	→ dsop joined	09:16
cousteau	...btw, off-topic: how often do you think of time-traveling movies while learning / using / developing with git?	09:16
jast	seems like you have yet to meet the reflog, git's mighty guardian against losing commits	09:16
cousteau	because I'm thinking of "parallel dimensions" and "alternate realities" all the time :\|	09:17
jast	never. sorry to disappoint. :)	09:17
cousteau	ouch	09:17
	← VolcanoMan left	09:17
cousteau	...so when you switch to another branch you just think "I'm going to switch to another branch", not "I'm going to travel to an alternate reality where X never happened"?	09:18
tobiasvl	haha	09:18
	→ VolcanoMan joined	09:18
	← codyw left	09:18
jast	that's right	09:18
cousteau	there really should be a git-based sci-fi movie about time travel	09:18
tobiasvl	the time travelling paradigm	09:18
jast	I'm still looking for that alternate reality in which the last five years of web development don't exist	09:19
	make it ten just to be safe	09:19
cousteau	but social networks!	09:19
jast	does IRC count? :)	09:20
	cousteau and 3 others have liked jast's idea	09:20
	→ navidr joined	09:20
jast	utter fabrication, nobody ever likes my ideas	09:20
cousteau	I'll be honest, all this social network stuff is annoying	09:20
	← anli left	09:21
cousteau	also, traveling 10 years back in time might mean convincing Nokia to keep on with their GNU/Linux-based phone idea	09:21
osse	Hmm, I've seen messages like "not merged to master, but is merged in origin/whatever" but maybe it just compares the branch to its own upstream	09:22
	← Guest27261 left	09:22
	→ jnavila joined	09:22
	→ diqidoq joined	09:23
	← upperdeck left	09:24
	→ Jskal joined	09:26
	← Munt left	09:26
	→ Floflobel joined	09:26
	→ _ADN_ joined	09:26
	→ upperdeck joined	09:26
osse	cousteau: there's the emoji movie, so why not the repo movie	09:27
cousteau	no! NO! I was talking about a serious movie	09:27
	→ cteqpan[work] joined	09:27
cousteau	like, about time traveling itself, no mention of git, but lots of git-related terminology	09:27
	"I'm gonna checkout an alternate reality!"	09:28
	"the universes have merged!"	09:28
	← dave0x6d left	09:30
cousteau	"I'm sorry Mr. Dwight, but you're the only conflict across these realities, you must be terminated"	09:31
	welp, gotta go... thanks for the help!	09:31
	← Barrt left	09:31
	← cousteau left	09:31
	← energizer left	09:34
	← Cabanossi left	09:34
	→ clmsy joined	09:34
	→ Cabanossi joined	09:35
	← senaps left	09:35
	← VolcanoMan left	09:35
	→ VolcanoMan joined	09:37
	→ TheVice joined	09:38
	→ Xrayez joined	09:40
	← theoceaniscool left	09:41
	← floppydh left	09:42
	→ andrbmgi joined	09:43
	→ floppydh joined	09:43
	→ xaxxon joined	09:43
	← Nizumzen left	09:44
	← TheVice left	09:44
	← JeroenT left	09:45
	→ Barrt joined	09:46
	→ JeroenT joined	09:46
	← sarp left	09:46
	← xaxxon_ left	09:47
	← dsdeiz left	09:48
	→ dsdeiz joined	09:48
	← dsdeiz left	09:48
	→ dsdeiz joined	09:48
	gitinfo set mode: +v	09:48
andrbmgi	Hi, I cannot rebase my branch anymore, no error message, it just says it starts applying patches then falls back to console. No changes to branch whatsoever. I also cannot replay my changes onto another branch, same behaviour. I made a new branch from master and copied in my changes basically sqashing everything into one commit throwing away all the history but the new branch has the same problem. Any ideas?	09:48
	← darktemprary left	09:49
moritz	andrbmgi: it sounds to me like your rebase target is already in your branch	09:50
jast	it wouldn't start applying patches in that case, would it?	09:50
	← JeroenT left	09:50
	→ darktemprary joined	09:50
andrbmgi	It worked for quite a while, I don't see that anything major changed	09:51
moritz	why not? I think it would apply the patches 1:1	09:51
jast	but then the branch would be changed	09:51
	← xaxxon left	09:51
jast	due to the commit IDs changing	09:51
andrbmgi	can you detail what is meant by "target is already in the branch"?	09:51
moritz	andrbmgi: that HEAD is a descendent of the commit you pass to 'git rebase'	09:52
	→ xaxxon joined	09:52
jast	basically if you're rebasing against something that is already fully contained in your checked out branch	09:53
andrbmgi	definitely not the case, the whole reason I am trying to do the rebase is to get the changes on master in	09:54
	→ theoceaniscool joined	09:54
	← happymeal left	09:54
	→ happymeal joined	09:54
	→ fmgt joined	09:54
	→ Plorntus joined	09:54
moritz	andrbmgi: just for checking, can you merge that branch in?	09:54
jast	can you share a copy of your repo, or is it too secret? :)	09:54
	← fmgt left	09:54
andrbmgi	hmm its a company repo, nothing too secret about it but I am not sure if I can share it	09:55
Plorntus	Is it possible to have 2 people working on the same merge conflicts (on the same branch) at the same time?	09:55
jast	right, so probably not	09:55
moritz	Plorntus: if they share a screen and a keyboard, why not?	09:55
Plorntus	Haha on 2 different computers	09:55
jast	Plorntus: well, there's no special tool to synchronize their efforts	09:56
andrbmgi	no we are doing a developer academy thing, basically the master branch contains exercise files and everyone is solving them on their own branch	09:56
jast	they could do it manually	09:56
oxymoron93	well why not, if they have same history and are doing same thing	09:56
Plorntus	Have a guy here adamant its possible and committing one file at a time. Obviously this does not work for me and therefore trying to figure out if this is actually a thing	09:56
jast	well, you can't commit if there are unmerged entries in the index	09:56
Plorntus	No idea what I am doing wrong if it is possible	09:56
	Thats the thing, some how they're able to commit	09:56
jast	so, the only way to actually do it would be terrible	09:57
	→ sarp joined	09:57
jast	i.e. by marking the files as resolved even though they still have conflict markers all over them	09:57
andrbmgi	moritz yes merging works without problems	09:57
moritz	there are other ways, though they require some managment overhead	09:57
	← ivan left	09:57
jast	the result is terrible unhelpful diffs and a pile of junk commits	09:58
Plorntus	They've not committed the unmerged versions of the files, they literally stage the one file and then commit	09:58
jast	that doesn't actually work	09:58
Plorntus	Exactly what I was thinking	09:58
moritz	for example if your goal it merge foo into master, you can merge master into foo instead, resolve some of the conflicts and stash the result away somehow, abort the merge, and then re-created the resolved versions of the files in branch foo	09:58
Plorntus	but some how it does for them.	09:58
	Thats why I am so confused	09:58
moritz	and different people can do the same thing for different files	09:58
	and when you've done that for all conflicting files, you can do a git checkout master; git merge -X theirs foo	09:59
	→ leeN joined	09:59
	← mud left	10:00
jast	you could, in theory, work your way around unmerged entries, and perhaps some third-party git client/GUI does that	10:00
	but the official 'git' won't let you commit if there are any unmerged entries left	10:00
	← VolcanoMan left	10:01
jast	and working around it isn't too easy, you have to construct a temporary index file and all	10:01
Plorntus	Ahhh, maybe that is it. They use Sourcetree (or something like that)	10:01
	→ cstratak joined	10:01
Plorntus	I use git from the command line	10:01
jast	if any GUI does this, it's bad and deserves to be cleansed by fire :}	10:01
andrbmgi	brb I have to reboot	10:01
	← andrbmgi left	10:02
	← ShalokShalom left	10:02
Plorntus	Yeah... It wouldnt suprise me. Atlassian has some really backwards ideology about everything	10:03
	→ VolcanoMan joined	10:03
jast	there isn't really any way to implement this that makes sense	10:03
	→ andrbmgi joined	10:04
moritz	.oO( Dropbox for git-rerere )	10:04
	gitinfo set mode: +v	10:04
jast	moritz: thank you for volunteering for our "cleansing in fire" programme	10:04
	→ dimi1947 joined	10:04
	← jnavila left	10:05
	→ jnavila joined	10:05
	← LichtMacher left	10:05
	→ JeroenT joined	10:07
	← happymeal left	10:07
	→ devbaka joined	10:07
	→ tunekey joined	10:08
	← dre_ left	10:08
	→ achadwick joined	10:10
	← darktemprary left	10:12
	→ yohnnyjoe joined	10:12
	← kurkale6ka left	10:13
	→ darktemprary joined	10:13
	→ kurkale6ka joined	10:13
	→ perrier-jouet joined	10:15
	← nanga left	10:16
	← sclarkso left	10:16
	← yohnnyjoe left	10:16
	→ nanga joined	10:17
	← nanga left	10:17
	→ nanga joined	10:17
	← Darcidride left	10:17
	→ Darcidride joined	10:18
	→ vish93 joined	10:20
	← sarp left	10:20
	→ cdown joined	10:20
	→ sosheskaz joined	10:21
	← upperdeck left	10:22
	← jnavila left	10:23
andrbmgi	Oh great, I tried de-installing and reinstalling Git and now it just hangs and after quite a while (minutes!) gives that: "/bin/sh: warning: shell level (1000) too high, resetting to 1	10:23
	"	10:23
	BTW I am using git bash on Win7 Pro	10:24
	← VolcanoMan left	10:24
jast	sounds like endless recursion	10:24
andrbmgi	Google says that means its opening subshells	10:24
	yeah but why?	10:24
jast	you probably found some kind of bug :)	10:24
andrbmgi	oh noes	10:24
	→ upperdeck joined	10:25
jast	reproducing it will probably need a copy of the repo, though	10:25
	→ kurkale61 joined	10:25
	← sosheskaz left	10:25
	← cqi left	10:26
	→ cqi joined	10:27
	← kurkale6ka left	10:27
	→ VolcanoMan joined	10:27
	→ jottr joined	10:28
	← jameser left	10:28
	← darktemprary left	10:28
	→ darktemprary joined	10:31
andrbmgi	Is there a way to make git spit out debug output of some sort?	10:31
jast	for some of it	10:32
	as a starting point, GIT_TRACE=1 git rebase [...]	10:32
	→ cur8or_ joined	10:32
andrbmgi	ty trying	10:33
	← cur8or left	10:33
andrbmgi	11:33:13.317063 git.c:576 trace: exec: 'git-rebase' 'master'	10:34
	11:33:13.321064 run-command.c:626 trace: run_command: 'git-rebase' 'master'	10:34
	11:33:13.928098 git.c:344 trace: built-in: git 'rev-parse' '--git-dir'	10:34
	11:33:13.978101 git.c:344 trace: built-in: git 'rev-parse' '--git-path' 'objects'	10:34
	11:33:14.007103 git.c:344 trace: built-in: git 'rev-parse' '--is-bare-repository'	10:34
	11:33:14.035104 git.c:344 trace: built-in: git 'rev-parse' '--show-toplevel'	10:34
	11:33:14.075107 git.c:344 trace: built-in: git 'config' '--bool' 'rebase.stat'	10:34
	11:33:14.114109 git.c:344 trace: built-in: git 'config' '--bool' 'rebase.autostash'	10:34
	11:33:14.152111 git.c:344 trace: built-in: git 'config' '--bool' 'rebase.autosquash'	10:34
	11:33:14.191113 git.c:344 trace: built-in: git 'config' '--bool' 'commit.gpgsign'	10:34
	then that over and over again, sry for flooding	10:34
oxymoron93	andrbgmi you could use some paste tool for that	10:34
	→ PHPanos joined	10:34
jast	!paste	10:35
gitinfo	Please use a pastebin for snippets longer than one line. https://gist.github.com and https://upaste.de/ both work well.	10:35
andrbmgi	will do	10:35
	← VolcanoMan left	10:36
andrbmgi	it loops at rev-parse --git-dir	10:36
cymen	Hm...somebody did a force push on a repo that I use (maybe that's the reason) and now I get fatal: refusing to merge unrelated histories when trying to pull	10:37
jast	the 'git-rebase' isn't part of the loop?	10:37
andrbmgi	nope	10:37
cymen	I don't even have any changes. How do I get back to the server version of things?	10:37
jast	that's curious	10:37
	→ VolcanoMan joined	10:37
jast	cymen: git fetch; git reset --hard @{upstream}	10:38
andrbmgi	how so?	10:38
	→ cdg joined	10:38
	→ Cavallari joined	10:38
	→ jnavila joined	10:38
	→ cdg_ joined	10:39
cymen	jast: what is @{upstream}? it doesn't seem to be in my config...	10:42
jast	just those characters, in that order :)	10:42
	← cdg left	10:42
	→ tvw joined	10:42
jast	or @{u} as shorthand	10:43
	← Cavallari left	10:43
jast	usually that works, otherwise git reset --hard <name of remote>/<name of branch>	10:43
	in both cases, all uncommitted changes will be destroyed	10:43
	← cdg_ left	10:43
igemnace	cymen: check out git help revisions to see different ways to specify revisions, including @{upstream}	10:44
	→ tcorneli joined	10:47
	← VolcanoMan left	10:48
	← Spydar007 left	10:48
	← jcarpenter2 left	10:49
	→ Nizumzen joined	10:49
	← Nizumzen left	10:49
	→ VolcanoMan joined	10:49
	← in1t3r left	10:51
	→ in1t3r joined	10:52
	→ manuelschneid3r joined	10:52
	← darktemprary left	10:52
andrbmgi	I think the problem may be on my machine. I cloned the repo in a different directory and checked out another branch and have the same problem, even with an empty branch (no commits) I created earlier. I know that the other can to rebases on their branches but when I try on their branch it fails.	10:53
	→ sarp joined	10:53
andrbmgi	others*	10:53
	→ darktemprary joined	10:55
	← jstein left	10:59
	← VolcanoMan left	10:59
	← Murr left	10:59
	→ Murr joined	10:59
	→ cdg joined	11:00
	← jnavila left	11:01
	→ MarioBranco joined	11:01
	→ VolcanoMan joined	11:02
	← Cabanossi left	11:03
	← JeroenT left	11:03
	← upperdeck left	11:04
	← cdg left	11:04
	→ Cabanossi joined	11:05
	→ upperdeck joined	11:05
	← a3Dman left	11:10
	← VolcanoMan left	11:13
	→ VolcanoMan joined	11:15
	→ Nizumzen joined	11:16
	→ LichtMacher joined	11:17
	← nowhereman_ left	11:17
	→ nowhereman_ joined	11:18
	← darktemprary left	11:18
	→ kurkale6ka joined	11:18
	← kurkale61 left	11:19
	→ Cavallari joined	11:21
	← tcorneli left	11:21
	→ Anja_ joined	11:22
	← cur8or_ left	11:24
	← kurkale6ka left	11:24
	← mentalita left	11:25
	→ aacn500 joined	11:25
	→ kurkale6ka joined	11:28
	→ hcolor joined	11:29
	← davimore_ left	11:29
	← raynold left	11:29
	← PHPanos left	11:30
	→ davimore_ joined	11:30
	← hcolor left	11:30
	← shripadr left	11:30
	← Elon_Satoshi left	11:30
	← aacn500 left	11:31
	← VolcanoMan left	11:32
	→ cur8or joined	11:33
	← tobiasvl left	11:33
	← Cavallari left	11:33
	→ Cavallari joined	11:34
	← kurkale6ka left	11:34
	→ nast joined	11:34
	→ VolcanoMan joined	11:35
	→ Elon_Satoshi joined	11:36
	→ kurkale6ka joined	11:37
	→ converge joined	11:38
	→ mentalita joined	11:39
	→ Bennux_dev joined	11:40
	← nowhereman_ left	11:41
	→ nowhereman_ joined	11:41
	← jottr left	11:43
	← kurkale6ka left	11:43
	→ JeroenT joined	11:43
	→ xaxxon_ joined	11:47
	→ kurkale6ka joined	11:47
	← xaxxon left	11:47
	→ JeroenT_ joined	11:48
	→ Ellusionist joined	11:48
	← neil_cn left	11:49
	→ treefrob joined	11:50
	← salamanderrake left	11:51
	← JeroenT left	11:51
	→ Masber_080 joined	11:52
	← masuberu left	11:53
	→ jottr joined	11:53
	← Celelibi left	11:54
	→ tarkus joined	11:56
	→ kurkale61 joined	11:56
	← kurkale6ka left	11:57
	← hio left	11:58
	← dimi1947 left	11:59
	← nast left	11:59
	→ nast joined	12:00
	→ cteqpan joined	12:01
	→ darktemprary joined	12:01
	← cteqpan[work] left	12:02
	← sarri left	12:02
	← Cabanossi left	12:03
	← devbaka left	12:04
	→ Cabanossi joined	12:05
	← sarp left	12:05
	→ cousteau joined	12:05
cousteau	if I don't like the last commit I made, `git reset --hard HEAD~` will "rewind" the current branch to the previous one, right?	12:06
	← VolcanoMan left	12:06
osse	yes	12:06
cousteau	I've created another branch pointing here just in case I decide the change wasn't a bad idea after all somewhere in the future	12:06
_ikke_	correct, make sure you don't have any uncomitted changes though	12:06
cousteau	ok	12:06
_ikke_	cousteau: there is always the reflog to keep track of 'lost' commits	12:07
cousteau	perfect!	12:07
	_ikke_, the reflog is the one who would have complained if I hadn't made another branch, right?	12:07
_ikke_	no, the reflog is just passively saving you from yourself :-)	12:09
	← phinxy left	12:10
	← cqi left	12:11
	→ phinxy joined	12:12
	→ yohnnyjoe joined	12:13
	← Plorntus left	12:14
	→ PHPanos joined	12:15
	← kurkale61 left	12:16
	← davimore_ left	12:16
	→ kurkale61 joined	12:16
	→ davimore_ joined	12:17
	← yohnnyjoe left	12:17
	← nast left	12:18
	→ nast joined	12:19
	→ jnavila joined	12:19
	← Ellusionist left	12:20
	← floppydh left	12:20
	→ floppydh joined	12:20
	← upperdeck left	12:22
	→ Ellusionist joined	12:22
	→ tvl joined	12:22
	tvl → tobiasvl	12:22
	→ kurkale6ka joined	12:23
	← cdown left	12:23
	→ upperdeck joined	12:23
	← kurkale61 left	12:24
	← Ellusionist left	12:24
	← d1b left	12:26
	→ Ellusionist joined	12:26
	← jottr left	12:26
	← darktemprary left	12:27
	→ freimatz joined	12:27
	→ darktemprary joined	12:28
	← kurkale6ka left	12:30
	← ertes-w left	12:30
	→ sarp joined	12:31
	→ Zamerick joined	12:31
	→ d1b joined	12:31
	← mikedd left	12:32
	← ghost43 left	12:34
	→ sarri joined	12:34
	← Cabanossi left	12:34
	→ kurkale6ka joined	12:34
	→ ghost43 joined	12:34
	→ Heisenberg joined	12:34
	→ Celelibi joined	12:34
	← sarri left	12:34
	→ sarri joined	12:34
	← Ellusionist left	12:35
	→ Cabanossi joined	12:35
	→ devbaka joined	12:35
	→ shripadr joined	12:37
	← Bennux_dev left	12:38
	→ rebrec joined	12:38
	← enkrypt_ left	12:38
	→ enkrypt joined	12:38
	← cteqpan left	12:40
	← adgtl left	12:40
	← juvenal left	12:40
	→ ertes-w joined	12:41
	← enkrypt left	12:41
	← jnavila left	12:42
	← sarri left	12:42
	← kurkale6ka left	12:42
	→ enkrypt joined	12:43
	→ nowhere_man joined	12:43
	→ jnavila joined	12:43
	← enkrypt left	12:44
	→ enkrypt joined	12:45
	← nowhereman_ left	12:47
	→ ogny joined	12:47
	← ogny left	12:47
	→ ogny joined	12:47
	← floppydh left	12:50
	→ cdg joined	12:50
	→ YuGiOhJCJ joined	12:50
	→ str joined	12:51
	← luckman212 left	12:52
	→ floppydh joined	12:52
	← enkrypt left	12:53
	← darktemprary left	12:53
	← cdg left	12:54
	→ darktemprary joined	12:54
	→ geoid joined	12:55
	← because left	12:56
	→ VolcanoMan joined	12:57
	→ because joined	12:58
	→ luckman212 joined	12:58
	← Murr left	12:59
	← nowhere_man left	12:59
	→ Murr joined	12:59
	→ nowhere_man joined	13:00
	← hs366 left	13:00
	← jeffreylevesque left	13:01
	← markmarkmark left	13:03
	← darktemprary left	13:04
	→ markmarkmark joined	13:04
	← Heisenberg left	13:05
	→ Kaisyu7 joined	13:05
	→ darktemprary joined	13:05
	→ juvenal joined	13:05
	← Kaisyu7 left	13:06
	→ adgtl joined	13:06
	← adgtl left	13:06
	→ adgtl joined	13:06
	← adgtl left	13:06
	→ adgtl joined	13:06
	← nast left	13:06
	← guideline left	13:06
	→ enkrypt joined	13:07
	← darktemprary left	13:09
	→ synthroid joined	13:09
	← VolcanoMan left	13:10
	→ VolcanoMan joined	13:11
	→ h12o joined	13:12
	→ snoopdave joined	13:13
	→ darktemprary joined	13:14
	→ guideline joined	13:14
	→ rorro joined	13:14
	← Cabanossi left	13:17
	← YuGiOhJCJ left	13:19
	→ Cabanossi joined	13:20
	← darktemprary left	13:20
	← howdoi left	13:21
	→ jottr joined	13:21
	← sonOfRa left	13:21
	→ darktemprary joined	13:22
	→ cdown joined	13:23
	→ OnceMe joined	13:23
OnceMe	I have a local project in git and init it with git init project	13:23
	I have a remote repo git init project.git --bare	13:23
	how can I conf local repo to push to the remote one?	13:23
	git add remote origin?	13:23
	→ sonOfRa joined	13:24
oxymoron93	git remote add origin <URL_of_remote_repo> OnceMe	13:25
OnceMe	oxymoron93: Ok Ive added it	13:28
	however: Warning: push.default is unset; its implicit value has changed in	13:28
	← theoceaniscool left	13:30
canton7	read the warning: don't just paste it	13:30
	← VolcanoMan left	13:32
	← nanga left	13:32
OnceMe	Ill stick with git push -u remote branch	13:33
	what is the usual setup though?	13:33
	→ nanga joined	13:34
	← nanga left	13:34
	→ nanga joined	13:34
jast	the warning is really just for people who used git before 2.0, to let them know the default has changed	13:34
	→ cyberz joined	13:34
jast	the new default is pretty sensible and means you can just use 'git push' without args after using -u once	13:34
OnceMe	what was the default?	13:34
jast	it was 'tracking', now it's 'simple'	13:34
	→ VolcanoMan joined	13:34
jast	to suppress the warning, just explicitly set the value to its new default: git config --global push.default simple	13:35
	sorry, it was 'matching', I meant to say	13:35
	← eshlox left	13:36
	← Puffball left	13:36
	← manuelschneid3r left	13:37
	← Guest63406 left	13:37
	→ Guest63406 joined	13:37
	← Guest63406 left	13:37
	→ Guest63406 joined	13:37
	Guest63406 → matthiaskrgr	13:37
	→ jeffreylevesque joined	13:37
	← nowhere_man left	13:37
	→ nowhere_man joined	13:38
	→ Puffball joined	13:38
	← VolcanoMan left	13:39
	← nanga left	13:39
	← andrbmgi left	13:40
	→ nanga joined	13:40
	→ VolcanoMan joined	13:42
	→ a3Dman joined	13:44
	← kyan left	13:44
	→ piremi joined	13:47
	← xaxxon_ left	13:48
	← nanga left	13:48
	→ nanga joined	13:48
	← nanga left	13:48
	→ nanga joined	13:48
	← Repox left	13:49
	← VolcanoMan left	13:49
	← piremi left	13:49
	→ VolcanoMan joined	13:49
	← darktemprary left	13:50
	← sarp left	13:51
	→ kurkale6ka joined	13:52
	→ darktemprary joined	13:53
	← nanga left	13:53
	← VolcanoMan left	13:54
	→ nanga joined	13:55
	← devbaka left	13:55
	→ VolcanoMan joined	13:55
	← throstur left	13:57
	← Puffball left	13:58
	→ OptimusMKD joined	14:01
	→ Puffball joined	14:02
	→ cdg joined	14:03
	→ theoceaniscool joined	14:03
	→ Andr0id joined	14:03
	← _Vi left	14:03
	← OptimusMKD left	14:04
	← basteh left	14:04
	→ basteh joined	14:05
	→ Tobbi joined	14:05
	← VolcanoMan left	14:06
	→ sasheto joined	14:06
	→ yohnnyjoe joined	14:07
	→ VolcanoMan joined	14:07
	← shripadr left	14:08
	← darktemprary left	14:08
	→ synthroi_ joined	14:09
	← Jskal left	14:09
	→ darktemprary joined	14:09
	← jnavila left	14:10
	→ cdg_ joined	14:10
	← yohnnyjoe left	14:11
	← VolcanoMan left	14:11
	← synthroid left	14:12
	→ jnavila joined	14:12
	→ VolcanoMan joined	14:13
	← sasheto left	14:13
	← cdg left	14:14
	← Nizumzen left	14:16
	→ aard_ joined	14:16
	← VolcanoMan left	14:18
	→ justAllgood joined	14:19
	← mattcen left	14:21
justAllgood	hi folks, I have 2 remotes. Because someone incorrectly converted an old cvs repo into git, we've ended up with an origin (which we can consider the true HEAD of master) and a remote which needs to be merged. However, the remote doesn't share the same history, 'fatal: refusing to merge unrelated histories'. What is the correct workflow, to merge in that branch, but essentially ignore it?	14:21
	← Tobbi left	14:21
justAllgood	basically when I run git pull remote master, I get that unrelated history	14:21
MacGyver	If you want to ignore the branch, why merge it?	14:22
	I'm a bit unclear in what exactly you're trying to do here.	14:22
justAllgood	well, the other option is to git push remote --delete master right?	14:23
	→ mattcen joined	14:23
	→ yohnnyjoe joined	14:23
justAllgood	basically I just want to be able to push our authoritive master	14:23
	to our remote	14:23
	but when I delete I get	14:23
	remote: error: By default, deleting the current branch is denied, because the next	14:23
	remote: error: 'git clone' won't result in any file checked out, causing confusion.	14:23
	I'm just wondering what the correct solution is here, there is no important history in the remote branch so deleting it IS an option	14:24
	← aard_ left	14:24
	→ aard_ joined	14:24
igemnace	there is no important history there? just git push --force to that remote	14:24
justAllgood	ok will try that	14:24
canton7	justAllgood, !bare	14:24
gitinfo	justAllgood: A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/	14:24
MacGyver	You can --allow-unrelated-histories on a merge, if you'd rather keep the remote's history.	14:24
canton7	repos which you push to should be bare	14:24
	ah, no, it's not referring to that, ignore me	14:24
	it's referring to deleting the default branch	14:25
justAllgood	MacGyver: so I saw that, but I thought, that it may merge in unwanted commits	14:25
	I'm not sure which strat to try haha	14:25
MacGyver	I really don't understand what you're trying to achieve here.	14:25
	Sounds like you just want to throw away the remote repo entirely.	14:25
	And just put the correct one in its place.	14:26
justAllgood	uhh yes that would be an option but I figured it out	14:26
	you were correct	14:26
	→ xaxxon joined	14:26
justAllgood	git push remote master --force	14:26
	worked just fine	14:26
oxymoron93	what	14:26
MacGyver	shrug	14:26
justAllgood	tldr; basically we had a repo which we don't control but code must eventually be pushed there to deploy (platform as a service type hosting), while converting from csv, to git, we ended up with 2 different remotes that didn't share a history. I had a branch I wanted to use as the true master HEAD which we wanted to base future releases and work off of, so I needed to do a git push <SecondRemote> master --force	14:28
	sorry if that wasn't clear but y'all were helpful anyways =P	14:28
	→ jeffreylevesque_ joined	14:28
	← jeffreylevesque left	14:29
	← Andr0id left	14:29
	← ghost43 left	14:30
	← clickjac_ left	14:30
	→ Andr0id joined	14:30
	→ clickjack joined	14:30
	← darktemprary left	14:30
igemnace	jsyk git push --force does do that option (i.e. throw away the remote repo entirely and put the correct one in it)	14:30
	→ ghost43 joined	14:31
	→ devbaka joined	14:31
	→ VolcanoMan joined	14:32
	→ darktemprary joined	14:33
	← cur8or left	14:34
	→ jungsubk joined	14:34
	→ Dougie187 joined	14:37
	← Raging_Hog left	14:37
	← darktemprary left	14:37
	← yohnnyjoe left	14:38
	← jungsubk left	14:38
	→ darktemprary joined	14:39
	← Puffball left	14:40
	← tarkus left	14:45
	→ Gustavo6046 joined	14:46
	← in1t3r left	14:46
	← converge left	14:46
	→ in1t3r joined	14:46
	→ dlf42me joined	14:47
	← Andr0id left	14:47
	→ rajat joined	14:47
	→ dolf joined	14:47
	→ Andr0id joined	14:47
	→ pirocks joined	14:47
	→ Kajayacht joined	14:47
	← dolf left	14:49
	← dlf42me left	14:49
	→ dolf joined	14:50
	← dolf left	14:50
	→ v4ult joined	14:50
	→ dolf joined	14:51
	← dolf left	14:51
	→ dolf joined	14:51
	→ fission6 joined	14:51
	← dolf left	14:51
	→ fmgt joined	14:53
	← Smarticles101 left	14:54
	→ POQDavid joined	14:55
	← Dreadnaught left	14:56
	← VolcanoMan left	14:56
	→ Smarticles101 joined	14:56
	→ VolcanoMan joined	14:56
	→ ResidentBiscuit joined	14:57
	← Murr left	14:59
	→ thiago joined	14:59
	→ frobnic joined	15:00
	→ Murr joined	15:00
	← vish93 left	15:00
	← cdg_ left	15:00
	→ dolf joined	15:00
	← dolf left	15:01
	→ Argylelabcoat joined	15:01
	→ Dreadnaught joined	15:01
	← Dreadnaught left	15:01
	→ Dreadnaught joined	15:01
	← kurkale6ka left	15:01
	→ cdg joined	15:02
	← cdg left	15:02
	→ cdg joined	15:02
	← oxymoron93 left	15:02
	← jottr left	15:02
	→ kurkale6ka joined	15:03
	→ jottr joined	15:03
	→ sosheskaz joined	15:04
	→ airdisa joined	15:04
	→ converge joined	15:05
	← converge left	15:05
	→ converge joined	15:05
	← xaxxon left	15:05
	← phinxy left	15:05
	→ rkta_ joined	15:06
	→ phinxy joined	15:06
	← theoceaniscool left	15:07
	→ AaronMT joined	15:08
	→ _Vi joined	15:08
	← Andr0id left	15:09
	← rkta left	15:09
	rkta_ → rkta	15:09
	→ brwoods joined	15:10
	← darktemprary left	15:12
	← jottr left	15:12
	← VolcanoMan left	15:13
	← ogny left	15:13
	← tvw left	15:13
	← enkrypt left	15:14
	→ mud joined	15:14
	→ jottr joined	15:14
	→ phluks joined	15:14
	→ darktemprary joined	15:14
	→ VolcanoMan joined	15:14
	← fission6 left	15:14
	→ dviola joined	15:14
	← ghost43 left	15:15
	→ sfranke joined	15:15
	→ ghost43 joined	15:16
	→ tmsmith joined	15:16
	→ shinnya joined	15:16
	→ Ben_1 joined	15:17
	→ aw1 joined	15:18
	← phinxy left	15:19
	→ phinxy joined	15:20
	← pirocks left	15:20
	← JeroenT_ left	15:20
	→ theoceaniscool joined	15:20
	→ crtcji joined	15:21
	→ pirocks joined	15:21
	← cdg left	15:22
	← geoid left	15:23
	← pirocks left	15:24
	← dege left	15:24
	→ cdg joined	15:24
	← Ben_1 left	15:25
	← floppydh left	15:25
	← cdg left	15:25
	→ pirocks joined	15:25
	→ cdg joined	15:26
	→ enkrypt joined	15:27
	→ floppydh joined	15:27
	→ Andr0id joined	15:27
	← Andr0id left	15:28
sfranke	Heya all! Why would I use 'git fetch && git pull' instead of just 'git pull'?	15:29
	→ Andr0id joined	15:29
thiago	you wouldn't	15:29
	← rajat left	15:30
sfranke	Something regarding losing the connection during the process?	15:30
	→ skypatrol_ joined	15:30
jast	it makes no sense to assume that from the start IMO	15:30
	if 'git pull' fails, just do it again :)	15:30
	if it's due to connection loss at least	15:31
	→ heym0e joined	15:31
jast	'git pull' is literally 'git fetch' + 'git merge' under the hood, anyway	15:31
	← nowhere_man left	15:31
sfranke	git fetch followed by git merge FETCH_HEAD <-- from the docs	15:31
	← MrMojit0 left	15:31
sfranke	just curious what that 'followed by' means^^	15:32
jast	it fetches and then merges	15:32
	→ nowhere_man joined	15:32
sfranke	'&&' would only execute if the fetch is completed successfully	15:32
thiago	git pull literally runs git fetch	15:32
jast	yeah, but 'git pull' will still do another fetch internally, so you might as well leave out the first bit	15:32
	git fetch && git pull means: fetch, then fetch again, then merge	15:32
	← metts left	15:33
	→ crose joined	15:33
sfranke	i eans.. fetch.. only if that succeeds.. fetch again and merge	15:33
	→ stutter joined	15:33
sfranke	+m	15:33
jast	that's like always starting your car engine twice on the off chance that the first time fails	15:33
	yeah, but then why bother?	15:33
	git pull will do the exact same thing again	15:34
thiago	bad analogy: if you start the car engine, it's running	15:34
	← Andr0id left	15:34
sfranke	just curious if anything really abd could happen if fetching fais and I pull anyways	15:34
jast	well, yeah	15:34
sfranke	*bad	15:34
jast	no	15:34
	← VolcanoMan left	15:34
jast	if 'git pull' can't connect or something, it will show an error message and that's that	15:34
	→ VolcanoMan joined	15:34
jast	principle of least surprise and all: 'git pull' is NOT designed to break your repo in a likely error case :)	15:35
	the reason you'd fetch separately is if you wanted to review what's changed prior to merging	15:35
	← darktemprary left	15:35
sfranke	what happens to a repository that is in the process of merging.. and DURING that process the connection to the repository is closed?	15:36
jast	the merge doesn't need a connection	15:36
	once the fetch part is complete, everything else happens locally	15:36
sfranke	well.. then during the fetch	15:36
jast	then the fetch stops	15:36
sfranke	I have a half completed fetch and start a merge.. what happens?	15:36
jast	it's ACID: the downloaded data doesn't do anything	15:36
	→ fission6 joined	15:36
	→ in1t3r_ joined	15:36
jast	only when the fetch completes is your local data actually updated	15:36
	→ darktemprary joined	15:37
	← crose left	15:37
	→ vish93 joined	15:37
jast	internally, the final part of fetch is updating the remote-tracking branches (and FETCH_HEAD)	15:37
	← zefferno left	15:38
	→ crose joined	15:38
jast	so if you skip fetching altogether (which is equivalent to a prematurely aborted fetch), merging would merge what was there before the fetch	15:38
	(and in all likelihood you've already merged that)	15:38
	← psprint left	15:38
	→ charlesr joined	15:38
jast	merge automatically skips over anything that is already in your local branch	15:39
	there, all safe :)	15:39
	→ anli joined	15:39
	← in1t3r left	15:39
	→ dave0x6d joined	15:39
	← charlesr left	15:39
	← crose left	15:40
	→ crose joined	15:40
	← abba left	15:41
	→ kculpis joined	15:42
	→ Dougie1871 joined	15:44
	← crose left	15:44
	← f2k left	15:45
	→ crose joined	15:45
	← Dougie187 left	15:46
	→ kpease joined	15:48
	← darktemprary left	15:49
	← igemnace left	15:49
	← fission6 left	15:50
	← floppydh left	15:51
	→ durham joined	15:51
	← rscata left	15:51
	→ fission6 joined	15:52
	→ floppydh joined	15:52
	→ ianp joined	15:53
	→ dreiss joined	15:53
	← Darcidride left	15:54
	→ darktemprary joined	15:54
	→ Darcidride joined	15:55
	→ czart joined	15:56
	← seschwar left	15:57
	← TomyWork left	15:59
	← h12o left	15:59
	→ hdaugherty joined	16:00
	→ jesst joined	16:00
	→ Persondude joined	16:01
	← darktemprary left	16:01
	← tmsmith left	16:02
	← jesst left	16:02
	← aoscott left	16:02
	← finalbeta left	16:03
	→ finalbeta joined	16:03
	→ darktemprary joined	16:04
	← Cabanossi left	16:04
	← Kajayacht left	16:05
	← Bobguy left	16:05
	→ Cabanossi joined	16:05
	→ rajat joined	16:05
	← navidr left	16:06
	← kpease left	16:07
	← rorro left	16:07
	← chele left	16:08
	← clmsy left	16:09
	→ rorro joined	16:10
	← nowhere_man left	16:10
	← VolcanoMan left	16:11
	→ VolcanoMan joined	16:12
	← ianp left	16:12
	← dreiss left	16:13
	→ ianp joined	16:13
	← crose left	16:14
	→ navidr joined	16:14
	→ airdisa_ joined	16:14
	→ kpease joined	16:15
	→ dege joined	16:15
	← thiago left	16:17
	→ igemnace joined	16:17
	← airdisa left	16:17
	→ madewokherd joined	16:17
	← synthroi_ left	16:18
	← tkore\work left	16:18
	→ synthroid joined	16:19
	← skypatrol_ left	16:19
	← synthroid left	16:19
	← jnavila left	16:20
	→ TomyLobo joined	16:20
	→ synthroid joined	16:20
	← synthroid left	16:20
	→ synthroid joined	16:21
	← synthroid left	16:21
	→ synthroid joined	16:22
	← OnceMe left	16:22
	← synthroid left	16:22
	→ synthroid joined	16:22
	← synthroid left	16:23
	→ synthroid joined	16:23
	← Silmarilion left	16:23
	→ metts joined	16:23
	← synthroid left	16:24
	← durham left	16:24
	→ durham joined	16:25
	← VolcanoMan left	16:25
	← dec0n left	16:26
	← thierryp left	16:26
	← texinwien_ left	16:26
	→ tmsmith joined	16:27
	→ texinwien_ joined	16:28
	← wandering_vagran left	16:29
	← durham left	16:30
	→ Jskal joined	16:30
	→ Mike11 joined	16:30
	← guideline left	16:31
	← darktemprary left	16:31
	← v4ult left	16:31
	← thinkpad left	16:32
	→ yohnnyjoe joined	16:34
	→ Andr0id joined	16:34
	→ durham joined	16:35
	→ dreiss joined	16:36
	→ darktemprary joined	16:37
	→ cagomez joined	16:38
	→ h12o joined	16:38
	← yohnnyjoe left	16:39
	→ Puffball joined	16:40
	← Mike11 left	16:41
	→ VolcanoMan joined	16:42
	← PHPanos left	16:42
	← h12o left	16:43
	← snoopdave left	16:43
	← anli left	16:43
	← vish93 left	16:43
	→ airdisa joined	16:44
	→ dec0n joined	16:46
	← crtcji left	16:47
	← airdisa_ left	16:47
	→ crtcji joined	16:48
	→ yehowyada joined	16:49
	← TekMason2 left	16:49
	← converge left	16:50
	← dreiss left	16:50
	→ robotroll joined	16:51
	← VolcanoMan left	16:51
	← imack left	16:51
	→ kareeeeem joined	16:52
	← upperdeck left	16:52
	→ VolcanoMan joined	16:53
	→ upperdeck joined	16:54
	← tmsmith left	16:54
	→ tarkus joined	16:54
	→ applecrumble joined	16:55
	→ Guma joined	16:56
	← shinnya left	16:56
	→ nixjdm joined	16:56
	← Argylelabcoat left	16:56
	← ResidentBiscuit left	16:57
	→ nowhere_man joined	16:58
	← dec0n left	16:58
	→ thiago joined	16:59
	← Murr left	16:59
	→ Murr joined	17:00
	→ db8093246 joined	17:00
	← rorro left	17:01
sfranke	well.. thanks so far.. have a nice evening!	17:01
	← sfranke left	17:01
	← crtcji left	17:02
	← Cabanossi left	17:03
	→ rorro joined	17:04
	→ snowkidind joined	17:04
	← robotroll left	17:05
	→ aLeSD joined	17:05
aLeSD	hi all	17:05
	→ Cabanossi joined	17:05
kareeeeem	Hi I have a question regarding the official git prompt and a code execution vulnerability. A while ago something came up regarding a vulnerability and it was said that the official prompt was safe. However I just did `PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '`. and entered this repo https://github.com/njhartwell/pw3nage that I cloned (which is a proof of concept for the vulnerability) and it's still vulnerable. It's not	17:05
	vulnerable when I put it in my PROMPT_COMMAND however. Any ideas?	17:05
aLeSD	is it possible to remove the last n commit in my master branch and make them one bit commit ?	17:06
	s/bit/big	17:06
kareeeeem	Im running bash 4.4.12 and git 2.15.0	17:06
moritz	aLeSD: yes, you can use rebase -i HEAD~5 or something like that, and then use the squash or fixup feature	17:07
	aLeSD: but if you've already pushed these commits, it's a !rewrite	17:07
gitinfo	aLeSD: 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	17:07
	→ bnason_ joined	17:08
	bnason_ → bnason	17:08
bnason	I'm trying to fix some branches pushed by another dev onto our repo, they should all be directly off the master branch, but instead they all were branched from the previous branch that person pushed.	17:09
	I tried rebasing, but it seems to keep all intermediate commits in that branch.	17:10
	I want to make each branch be master -> lsat commit for that branch	17:11
	How can I go about doing that?	17:11
	← schleppel left	17:11
moritz	bnason: I'm not sure, but maybe git rebase --onto can help you with that	17:11
	→ guideline joined	17:12
bnason	i already did a rebase but its keeping the extra intermediate commits	17:12
	i basically want to remove the intermediate commits from each branch	17:12
	← aw1 left	17:12
	→ schleppel joined	17:12
	← Guma left	17:13
	→ diverdude joined	17:13
bnason	hmm ah maybe an interactive rebase will work	17:13
diverdude	if i want to make a branch B from branch A, do i then first checkout A and then do git branch B?	17:14
moritz	diverdude: yes, but there's also a shortcut	17:14
	← heym0e left	17:14
moritz	git branch A B	17:14
	erm, other way around	17:14
	→ h12o joined	17:14
moritz	or git checkout -b B A	17:14
	← stutter left	17:15
	← h12o left	17:20
	← pirocks left	17:22
	← re1 left	17:23
	→ ZexaronS joined	17:23
	← mentalita left	17:23
	→ malditasea joined	17:23
	← darktemprary left	17:24
	← hdaugherty left	17:25
	→ DaGoaty joined	17:25
	→ aw1 joined	17:25
	→ darktemprary joined	17:25
	← sea-gull left	17:25
	← upperdeck left	17:26
	← VolcanoMan left	17:26
	→ VolcanoMan joined	17:27
	→ upperdeck joined	17:27
	→ pirocks joined	17:28
	← aLeSD left	17:29
	← dviola left	17:30
	→ aLeSD joined	17:31
	→ pirocks_ joined	17:32
	← svm_invictvs left	17:33
	← VolcanoMan left	17:34
	→ mentalita joined	17:35
	→ tmm88 joined	17:35
	← tmm88 left	17:35
	→ tmm88 joined	17:35
	→ banisterfiend joined	17:35
	← pirocks left	17:35
	→ h12o joined	17:36
	← skylite left	17:37
	→ worstadmin joined	17:37
	→ ToBeFree joined	17:37
	← cstratak left	17:37
	← ToBeFree left	17:38
	← MarioBranco left	17:39
	← kurkale6ka left	17:41
	→ Plouescat joined	17:41
	← h12o left	17:41
	→ Bobguy joined	17:42
	→ converge joined	17:42
	← converge left	17:42
	→ converge joined	17:42
	→ argnoor joined	17:43
	← nowhere_man left	17:43
	→ kyan joined	17:43
	← floppydh left	17:43
	← DaGoaty left	17:43
	← darktemprary left	17:44
	→ DaGoaty joined	17:44
	← murii_ left	17:45
	← _Vi left	17:45
	→ arora joined	17:45
	→ darktemprary joined	17:45
	→ imack joined	17:46
	← Persondude left	17:46
arora	hey, suppose i made changes to a repo, how can i keep them only to my local repo and have them merge when git pulled?	17:46
moritz	arora: you just don't "git push"	17:46
	→ svm_invictvs joined	17:46
moritz	that way they stay local automatically	17:46
	→ murii joined	17:46
	→ gugah joined	17:47
	→ Tobbi joined	17:47
	→ safe joined	17:48
	← aLeSD left	17:48
	← DaGoaty left	17:49
arora	moritz: but it gives me error, that they will be overwritten because of merge	17:49
	→ akushner joined	17:50
	→ thierryp joined	17:50
	← davimore_ left	17:50
	→ aLeSD joined	17:50
	→ orbyt_ joined	17:50
moritz	arora: you might need to "git add" and commit your files	17:51
	→ stutter joined	17:51
	→ tmsmith joined	17:52
arora	its a github repo so wouldnt it commit to the original repo(not owned by me)?	17:52
	← thierryp left	17:53
	→ DaGoaty joined	17:53
	→ satifant joined	17:54
igemnace	it would commit to your local repo	17:54
osse	arora: Committing is only local	17:54
	← darktemprary left	17:54
danemacmillan	Would anyone here know of a good way to have an entire existing repo code reviewed (on GitHub), such that I can treat the entire codebase as though it were a pull request and everything can be commented on?	17:55
	← LichtMacher left	17:55
	→ darktemprary joined	17:55
	→ h12o joined	17:56
	← Tobbi left	17:57
	← DaGoaty left	17:58
arora	thanks osse, moritz and igemnace :)	17:58
	→ benmuirhead joined	17:58
	← benmuirhead left	17:59
	← freimatz left	18:00
	← converge left	18:00
	→ DaGoaty joined	18:01
	← h12o left	18:01
	← flaviodesousa left	18:01
	→ muelleme joined	18:01
	← malditasea left	18:02
tobiasvl	danemacmillan: why do you need that?	18:03
	→ jiruru joined	18:03
	← rorro left	18:06
	→ Spydar007 joined	18:07
	← _ADN_ left	18:07
	← devbaka left	18:08
	← muelleme left	18:08
	← cdown left	18:09
	→ paul424 joined	18:13
	→ chaosruler joined	18:13
	← jiruru left	18:14
	← aLeSD left	18:15
	→ h12o joined	18:16
	← justAllgood left	18:16
	← glebihan left	18:17
	→ Scoop7 joined	18:18
Scoop7	hey, can I get git diff all~ ? not just for the exact filename ?	18:18
	→ aLeSD joined	18:18
	← Kaisyu left	18:18
_ikke_	Scoop7: sorry?	18:19
aLeSD	moritz, I was thinking to create a branch than merge from master without history than make the branch the master., then push. is it possible ?	18:19
	← DaGoaty left	18:20
Scoop7	well I've made some changes in my local project to let's say 2 files	18:20
	← texinwien_ left	18:20
Scoop7	and I don't want to specify it's path	18:20
	just see all the diff (so for those 2 files)	18:20
	→ texinwien_ joined	18:20
	← h12o left	18:20
Scoop7	+_ikke_	18:20
_ikke_	Scoop7: Do you mean you want to just specify the filename, not the entire path?	18:21
	← Floflobel left	18:21
Scoop7	not really I would like to just see all	18:21
igemnace	Scoop7: do you mean get a diff of all changes?	18:21
	→ sea-gull joined	18:21
Scoop7	yes	18:21
igemnace	git diff by itself does that already	18:21
Scoop7	oh	18:21
	great	18:21
	lol	18:21
	→ ResidentBiscuit joined	18:21
	← rajat left	18:24
	← murii left	18:27
	→ dviola joined	18:27
	← sim590 left	18:28
shawn_ges	careful with that - it would diff your working directory against the current HEAD, which may not be what you want.	18:29
	→ sim590 joined	18:29
	→ cdown joined	18:30
	→ ocds joined	18:30
	← tmsmith left	18:30
	→ tmsmith joined	18:31
	← jottr left	18:32
paul424	I hardly rested my work , how do I find the orphaned nodes ?	18:32
	s/hardly/hard	18:32
	← banisterfiend left	18:32
	→ DaGoaty joined	18:32
	← darktemprary left	18:33
	→ dendazen joined	18:33
	→ darktemprary joined	18:34
	← orbyt_ left	18:34
	← ocds left	18:34
osse	paul424: git reflog	18:35
igemnace	if you committed them at some point in time, reflog	18:35
	→ yohnnyjoe joined	18:35
paul424	osse: igemnace thansk	18:35
	→ Ellusionist joined	18:36
	→ h12o joined	18:36
	→ Natsume joined	18:36
	→ jiruru joined	18:38
	← jiruru left	18:38
	← darktemprary left	18:38
	→ _Vi joined	18:38
	→ jiruru joined	18:39
	→ darktemprary joined	18:39
	← yohnnyjoe left	18:40
	← h12o left	18:40
	← cagomez left	18:41
	← durham left	18:41
	→ durham joined	18:42
	→ rafasc joined	18:44
	← phinxy left	18:44
	→ devbaka joined	18:45
	→ pasadinhas joined	18:45
	→ crose joined	18:45
	→ TheG0ldenG0d joined	18:46
	← TheG0ldenG0d left	18:46
	← finalbeta left	18:47
	→ anli joined	18:47
	→ wootehfoot joined	18:47
	→ finalbeta joined	18:47
	→ heym0e joined	18:50
	→ phinxy joined	18:50
	→ cagomez joined	18:51
	→ smak joined	18:52
	← foo left	18:52
	→ scientes joined	18:53
	→ boombatower joined	18:54
smak	I am looking for advice. I have a datafile that is important to my project up to a certain version. After that point it no longer needs to be part of the repo, but it HAS to exist if a version prior is checked out. How can remove and stop tracking a file for all new commits, but keep it in the repo for checkouts for prior versions?	18:54
	← jiruru left	18:55
	→ muelleme joined	18:55
Seveas	smak: git rm path/to/file && git commit -am "Remove file not needed in newer versions"	18:55
moritz	smak: if you simply git rm the file, that will be exactly what happens	18:55
	it's there when you check out the old versions, and not there on the new version	18:55
	→ h12o joined	18:55
smak	Seveas: moritz: thanks. The way I parsed git rm was that it completely removes the file from the repo	18:56
	→ justAllgood joined	18:57
	← BSab left	18:57
	→ energizer joined	18:57
	← tmsmith left	18:57
Seveas	no, git rm does not affect history	18:58
	very few things do, on purpose :)	18:58
moritz	.oO( rm -rf .git does :-) )	18:59
	← DaGoaty left	18:59
	← Murr left	18:59
	→ Murr joined	19:00
	← darktemprary left	19:00
	← h12o left	19:00
	← AaronMT left	19:00
bremner	also smashing disk with a hammer, if you want to be like that	19:01
	→ darktemprary joined	19:01
	→ Sasazuka joined	19:02
	→ Angelica joined	19:02
	← Angelica left	19:02
tobiasvl	moritz: the man-page of `git rm` _does_ mention /bin/rm ...	19:03
	← heym0e left	19:03
	← Natsume left	19:03
	← eijk left	19:04
smak	Thanks again...	19:06
	→ sammyo joined	19:07
	→ nowhere_man joined	19:08
	← fmgt left	19:09
	← TinkerTyper left	19:10
	← Ellusionist left	19:11
	→ _ADN_ joined	19:11
	→ arabbear joined	19:12
	→ Ellusionist joined	19:12
	← cdown left	19:12
	→ TinkerTyper joined	19:12
	← \|ifei5good left	19:12
	→ rtjure joined	19:13
	← darktemprary left	19:13
	→ ericho joined	19:14
	← theoceaniscool left	19:15
	→ darktemprary joined	19:16
	→ mostlybadfly joined	19:16
	← pasadinhas left	19:17
	← imack left	19:18
	← rtjure left	19:18
	→ raynold joined	19:19
	→ orbyt_ joined	19:20
	→ LichtMacher joined	19:22
	← Ellusionist left	19:22
	→ Ellusionist joined	19:23
	→ Discovery joined	19:23
	→ h12o joined	19:25
	← darktemprary left	19:27
	← Discovery left	19:28
	→ Discovery joined	19:28
	→ AndresInSpace joined	19:29
	→ darktemprary joined	19:29
	← LocaMocha left	19:29
AndresInSpace	anyone know what would cause my git repo to fail on pushing up commits that contain binary (images) ? AS well as start effecting my SFTP (filezilla)?	19:29
	→ jiruru joined	19:29
	← h12o left	19:30
AndresInSpace	git started failing and now when I sftp images up i get disconnects and the image gets half uploaded , swear they are related issues they both started same time	19:30
	← overlord_tm left	19:31
	← Ellusionist left	19:32
	← Cabanossi left	19:32
	← darktemprary left	19:33
	→ Gurkenglas joined	19:33
	← phluks left	19:34
	← jiruru left	19:35
	→ Cabanossi joined	19:35
	→ mecasou joined	19:35
	→ MrJoshua joined	19:35
	→ cdg_ joined	19:35
	← smak left	19:35
	← Discovery left	19:38
	← cdg left	19:38
	← cdg_ left	19:40
	← Darcidride left	19:41
	→ Discovery joined	19:41
Seveas	what are the error messages you get from git and sftp?	19:43
	→ Ellusionist joined	19:44
AndresInSpace	sftp software disconnected, then it reconnects to server and asks to overwrite file(which is new file i just uploaded)	19:44
	git is broken pipe, sometimes just remote end hangup	19:44
	super weird part, is if i sftp up through winscp it seems to work fine, at the moment	19:45
	at a loss, as my other git directories work fine, and is just this one, which if it was broken git config or something, how the ef would that effect SFTP?	19:45
	→ pirocks joined	19:46
Seveas	smells like your ssh remote does not like large files	19:46
	check its logs, if possible	19:46
	← pirocks_ left	19:48
	→ Acerific joined	19:48
	← Acerific left	19:48
	→ Acerific joined	19:48
	→ AaronMT joined	19:48
	← arora left	19:48
AndresInSpace	Seveas: its just odd, as just a copuple weeks ago i was pushing up commits with MUCH larger binary data	19:49
	worked fine, just all the sudden one day it started doing this	19:49
orbyt_	I have a branch, "develop", with commits 1, 2, 3, 4, 5, etc. I'd like to remove commit 1 and 2 from the branch, so that the first commit on the branch is 3. Is there a simple way to go about this?	19:49
Seveas	AndresInSpace: find out what changed on the remote on that day :)	19:49
	orbyt_: !interactive rebase	19:49
gitinfo	orbyt_: [!interactive_rebase] Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.	19:49
	← Ellusionist left	19:50
Seveas	orbyt_: git rebase -i sha1-of-commit-1^ (the ^ is important!)	19:50
	→ arora joined	19:50
	→ mel00010 joined	19:50
Seveas	then remove 1 and 2 from the picklist and let it rip	19:50
	→ DaGoaty joined	19:51
	← achadwick left	19:51
	→ cdg joined	19:51
	→ banisterfiend joined	19:53
orbyt_	Seveas So with an interactive rebase, what's the difference between using "drop" and deleting the line entirely?	19:54
	→ h12o joined	19:55
	→ tlaxkit joined	19:55
_ikke_	orbyt_: originally you just deleted the line, but that was not obvious enough for some people, so they added an explicit drop	19:55
	→ tmsmith joined	19:55
orbyt_	Thank you.	19:55
	← cdg left	19:56
	← dege left	19:58
	← PaulCapestany left	19:59
	← aw1 left	19:59
	→ rorro joined	20:00
	← h12o left	20:00
	→ sartan joined	20:02
	→ PaulCapestany joined	20:02
	← banisterfiend left	20:02
	→ ZyX-I joined	20:03
sartan	is there a way to combine the output of 'git diff --name-only' (changes not staged) with 'git diff --name-only --cached' (changes to be committed) in the same command?	20:03
	writing a git hook to run on all 'changed' files regardless if they're added to changeset or not, whatever is different from upstream	20:03
_ikke_	sartan: git diff HEAD --name-only	20:04
sartan	Perfect thanks	20:04
	→ h12o joined	20:05
sartan	any way to have it also show the new name of a file if it's been renamed? (Seems to show the old one)	20:06
	← applecrumble left	20:06
	← rorro left	20:06
	← madewokherd left	20:06
	← db8093246 left	20:06
	← orbyt_ left	20:06
	← scientes left	20:07
	→ applecrumble joined	20:08
	← rafasc left	20:08
_ikke_	it should show both	20:08
Seveas	with --name-only?	20:09
	← h12o left	20:09
	→ behr328 joined	20:09
_ikke_	Seveas: was that adressed to me or to sartan ?	20:09
Seveas	_ikke_: to you :)	20:09
	← fission6 left	20:10
Seveas	--name-status shows both names, but --name-only not	20:11
	→ Martian joined	20:11
Seveas	e.g. this in git.git:	20:11
	git --no-pager show --format= --name-only 0c977dbc8180892af42d7ab9235fd3e51d6c4078	20:11
	git --no-pager show --format= --name-status 0c977dbc8180892af42d7ab9235fd3e51d6c4078	20:11
	the latter shows both names	20:12
	→ salamanderrake joined	20:12
_ikke_	Hmm, I would expect it to show 2 descrete names	20:12
	→ Ellusionist joined	20:13
	→ tmsmith_ joined	20:13
_ikke_	Like this:	20:14
	git --no-pager show --format= --name-only --no-renames 0c977dbc8180892af42d7ab9235fd3e51d6c4078	20:14
	But due to rename detection, it gets lumped together	20:14
Seveas	yup	20:15
	sartan: so --no-renames is the answer to your question	20:15
sartan	Thanks, lemme play with it. I can tool and script around htis, just trying to minimize work	20:16
	→ pirocks_ joined	20:17
	← tmsmith left	20:17
	→ jungsubk joined	20:18
	← mattcen left	20:18
	← pirocks left	20:19
AndresInSpace	Seveas: how would i check the remote if it 'doesn't like large files' as you said	20:20
	to confirm that essentially	20:20
	← DaGoaty left	20:21
	→ endiruna joined	20:21
	← Cavallari left	20:21
Seveas	if you have ssh access to it: check logs and ssh config. If not: ask the admin.	20:22
	→ mattcen joined	20:24
	← upperdeck left	20:24
	→ synthroid joined	20:24
	← arabbear left	20:25
	→ kgrimes1 joined	20:26
	→ upperdeck joined	20:27
	← stutter left	20:27
	→ ph88 joined	20:28
ph88	hey guys, i see i'm doing a merge but how do i start my merge tool ? (meld	20:28
AndresInSpace	Thanks Seveas	20:28
	I'm trying everything, having my coworker check the server (not my cup of tea)	20:29
	→ pasadinhas joined	20:29
	→ grothe joined	20:30
_ikke_	ph88: do you have a merge conflict?	20:31
	→ banisterfiend joined	20:33
	← cagomez left	20:33
	← Scoop7 left	20:33
	← Cabanossi left	20:33
	← pasadinhas left	20:34
	→ h12o joined	20:34
	→ Cabanossi joined	20:35
	← tmsmith_ left	20:36
	→ yohnnyjoe joined	20:36
	→ orbyt_ joined	20:37
	→ Masber joined	20:37
	→ phluks joined	20:38
	← h12o left	20:39
	→ stutter joined	20:39
	→ jt__ joined	20:40
	← Plouescat left	20:40
	← dviola left	20:40
	← Masber_080 left	20:40
	jt__ → Guest33806	20:40
	← yohnnyjoe left	20:40
	→ Masber_080 joined	20:41
	← Masber left	20:41
	→ sasheto joined	20:43
	← upperdeck left	20:43
	← daynaskully left	20:44
	→ upperdeck joined	20:44
	← banisterfiend left	20:45
	← cousteau left	20:45
	→ pirocks joined	20:46
	→ rorro joined	20:47
	← pirocks_ left	20:48
	→ paulg joined	20:50
ph88	_ikke_: yes i had, but manual merge was easier ... meld was confusing :(	20:50
	yes i found the command	20:50
	git mergetool	20:50
	→ banisterfiend joined	20:51
	→ fission6 joined	20:52
	→ WhitePhosphorus joined	20:53
	→ hockeyfan99 joined	20:53
	← hockeyfan99 left	20:54
_ikke_	:-)	20:55
	→ cdg joined	20:57
	→ thierryp joined	20:58
	→ theoceaniscool joined	20:59
	← thierryp left	20:59
	← Barrt left	21:00
	← cdg left	21:00
	→ cdg joined	21:01
	← banisterfiend left	21:01
	→ Barrt joined	21:02
	→ madewokherd joined	21:03
	→ h12o joined	21:04
	← akushner left	21:06
	← Barrt left	21:06
	→ beastd joined	21:07
	← beastd left	21:07
	→ Barrt joined	21:07
	← Ellusionist left	21:08
	← h12o left	21:08
	← Discovery left	21:09
	→ davimore joined	21:09
	← energizer left	21:10
	→ db8093246 joined	21:10
	← texinwien_ left	21:11
	→ cdg_ joined	21:14
	← dendazen left	21:14
	→ DaGoaty joined	21:15
AndresInSpace	Seveas: it is not the server	21:15
	:(	21:16
	← cdg left	21:17
	← mattcen left	21:17
	→ glebihan joined	21:18
	→ codyw joined	21:19
	← bruce_lee left	21:20
	← DaGoaty left	21:20
	← orbyt_ left	21:20
	→ Person joined	21:21
	← grothe left	21:21
	← sosheskaz left	21:21
	→ mattcen joined	21:22
	→ yuop12 joined	21:24
	← ph88 left	21:24
	→ yohnnyjoe joined	21:25
	→ orbyt_ joined	21:27
	→ jnavila joined	21:29
	← yohnnyjoe left	21:30
	← Guest33806 left	21:30
	→ daynaskully joined	21:30
	← applecrumble left	21:30
	← jj995 left	21:31
	→ pwnz0r joined	21:32
	← Cabanossi left	21:32
	← orbyt_ left	21:33
	→ h12o joined	21:34
	← ResidentBiscuit left	21:34
	→ jeffreylevesque joined	21:34
	← jeffreylevesque_ left	21:35
	→ Cabanossi joined	21:35
	← yuop12 left	21:36
	→ jeffreylevesque_ joined	21:36
	→ applecrumble joined	21:36
	← Cabanossi left	21:37
	→ ResidentBiscuit joined	21:37
	→ Cabanossi joined	21:37
	← kyan left	21:38
	← h12o left	21:38
	← jeffreylevesque left	21:39
	← Person left	21:40
	← fission6 left	21:40
	→ cagomez joined	21:40
	← stutter left	21:41
	→ MeiR joined	21:41
	← kareeeeem left	21:41
	← kgrimes1 left	21:42
	→ scientes joined	21:45
	← paul424 left	21:46
	→ jottr joined	21:46
	← gugah left	21:47
	← crose left	21:47
	→ pirocks_ joined	21:47
	→ stutter joined	21:47
	→ nowhereman_ joined	21:49
	← pirocks left	21:49
	← nowhere_man left	21:49
	→ imack joined	21:51
	→ akushner joined	21:53
	← synthroid left	21:53
	← akushner left	21:54
	← jeffreylevesque_ left	21:55
	← stutter left	21:55
	→ akushner joined	21:55
	← hellux left	21:56
	← akushner left	21:57
	→ DaGoaty joined	21:58
	← jnavila left	21:58
	← DaGoaty left	22:01
	← WhitePhosphorus left	22:01
	→ akushner joined	22:02
	← akushner left	22:03
	→ h12o joined	22:03
	→ akushner joined	22:03
	← Jskal left	22:04
	← phluks left	22:05
	← Gustavo6046 left	22:05
	→ kgrimes1 joined	22:06
	← Cuzner left	22:07
	← h12o left	22:08
	→ manuelschneid3r joined	22:09
	← pwnz0r left	22:09
	→ Gustavo6046 joined	22:09
	→ jottr_ joined	22:10
	← devbaka left	22:10
	← jottr left	22:11
	→ rh10 joined	22:12
	← netj left	22:13
	→ netj joined	22:13
	← schleppel left	22:13
	→ duderonomy joined	22:13
	→ darktemprary joined	22:13
	← kgrimes1 left	22:17
	→ Tobbi joined	22:17
	→ kgrimes1 joined	22:19
	← mattcen left	22:20
	→ xz joined	22:20
xz	hi there, I'm using repo tool and I'm putting custom manifest file under .repo/manifests/my-custom-manifest.xml	22:21
	does the name or directory of my-custom-manifest.xml matter? or repo will pick it up as long as it's somewhere under .repo/ ?	22:21
	← rh10 left	22:23
	→ rh10 joined	22:24
	→ heym0e joined	22:25
	← causasui left	22:26
	← muelleme left	22:26
	→ lafleurdubien joined	22:26
	→ orbyt_ joined	22:27
	← behr328 left	22:28
	← Xrayez left	22:28
	→ mizu_no_oto joined	22:28
	→ mattcen joined	22:28
	← endiruna left	22:30
	→ sclarkso joined	22:31
	← ResidentBiscuit left	22:31
	→ yu joined	22:31
	→ causasui joined	22:31
	→ WhitePhosphorus joined	22:32
	→ banisterfiend joined	22:34
	→ Munt joined	22:34
	← yu left	22:35
	← upperdeck left	22:36
dvl	/j #poudriere	22:36
	← navidr left	22:36
	← AndresInSpace left	22:37
	→ upperdeck joined	22:37
	← mniip left	22:38
	← TomyLobo left	22:38
	→ fstd_ joined	22:39
	← btree_ left	22:39
	← Dougie1871 left	22:40
	→ behr328 joined	22:40
	← jottr_ left	22:42
	← fstd left	22:42
	fstd_ → fstd	22:42
	← thiago left	22:44
	→ Enphuego joined	22:46
	→ fission6 joined	22:48
	← darktemprary left	22:48
	→ thiago joined	22:49
	→ darktemprary joined	22:50
	→ [Brain] joined	22:50
	← AaronMT left	22:50
	← behr328 left	22:50
	← thiago left	22:51
	← tmm88 left	22:51
	→ gopar joined	22:52
	→ btree joined	22:53
	← btree left	22:54
	→ shinnya joined	22:55
	← theoceaniscool left	23:00
	← supernov2h left	23:00
	→ supernov1h joined	23:00
	→ jeffreylevesque joined	23:01
	← nowhereman_ left	23:02
	← wootehfoot left	23:03
	→ thinkpad joined	23:06
	← darktemprary left	23:07
	→ piremi joined	23:07
	→ gopar_ joined	23:07
	← applecrumble left	23:08
	← argnoor left	23:09
	← gopar left	23:09
	→ thiago joined	23:09
	→ dviola joined	23:10
	← piremi left	23:10
	→ darktemprary joined	23:10
	← pirocks_ left	23:10
	→ piremi joined	23:10
	← piremi left	23:11
	→ Kaisyu joined	23:12
	← Munt left	23:13
	→ gopar joined	23:15
	→ piremi joined	23:15
	← piremi left	23:15
	→ piremi joined	23:16
	← imack left	23:16
	← piremi left	23:17
	→ piremi joined	23:17
	← Cabanossi left	23:17
	← gopar_ left	23:18
	→ overlord_tm joined	23:20
	→ Cabanossi joined	23:20
	→ jcarpenter2 joined	23:21
	← svm_invictvs left	23:24
	← darktemprary left	23:25
	→ nowhereman_ joined	23:25
	→ yohnnyjoe joined	23:26
	→ svm_invictvs joined	23:26
	← aard_ left	23:26
	→ markus_ joined	23:28
	← snowkidind left	23:28
	← satifant left	23:29
	← dviola left	23:30
	← markus_ left	23:30
	← mel00010 left	23:30
	→ Morphy joined	23:30
	← yohnnyjoe left	23:30
	→ dviola joined	23:32
	← Morphy left	23:32
	← heym0e left	23:33
	→ Morphy joined	23:33
	← Phylock left	23:33
	← Acerific left	23:35
	← dfaught left	23:36
	← ZexaronS left	23:36
	← Martian left	23:37
	← sasheto left	23:37
	← ZyX-I left	23:37
	→ ZexaronS joined	23:38
	→ sasheto joined	23:39
	← basteh left	23:40
	← chaosruler left	23:41
	← Gustavo6046 left	23:42
	→ dendazen joined	23:43
	← db8093246 left	23:44
	← cagomez left	23:45
	→ cagomez joined	23:45
	→ ResidentBiscuit joined	23:47
	← diverdude left	23:48
	← joey_ left	23:48
	→ joey_ joined	23:48
	← joey_ left	23:49
	→ joeyy joined	23:49
	→ rax_ joined	23:50
	← cagomez left	23:50
	← unreal left	23:50
	← rax_ left	23:51
	→ Martian joined	23:51
	→ cagomez joined	23:52
	← ResidentBiscuit left	23:52
	← aLeSD left	23:53
	→ YuGiOhJCJ joined	23:55
	← thinkpad left	23:56
	← airdisa left	23:57
	→ rax_ joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation