IRCloggy #git 2017-12-09

Provider of IRC logs since 2005.

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

	2017-12-09
	← jrabe left	00:00
	← dermoth left	00:00
	→ dermoth joined	00:00
	→ jrabe joined	00:03
	← finalbeta left	00:04
	← jottr left	00:05
	← nikio_ left	00:07
	← CheckDavid left	00:09
	← pirocks left	00:12
	→ castleguard joined	00:13
castleguard	Is there a good tutorial that will take me through git, starting with creating a repo, rather than trying to import it or set up a git server or whatever?	00:13
	← PaulCapestany left	00:13
	→ cdg joined	00:14
mud	castleguard: !book should do decent maybe?	00:14
gitinfo	castleguard: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	00:14
	← Amanas left	00:15
	→ blackmesa1 joined	00:15
castleguard	https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository lovely ty	00:16
	← sea-gull left	00:16
mud	Anytime	00:16
	→ PaulCapestany joined	00:17
	← cdg left	00:18
	← cagomez left	00:19
	→ cagomez joined	00:19
	→ safe joined	00:19
	← cagomez left	00:19
castleguard	Thanks very much. that site is perfect, and jumping ahead probably didn't help me but I can start at the start in a little bit, thanks.	00:20
	← castleguard left	00:20
	→ AmR\|EiSa joined	00:22
	→ cagomez joined	00:23
	→ menip joined	00:23
	← jokajak left	00:25
	→ madewokherd joined	00:25
	→ causasui joined	00:25
	← pyfoo left	00:26
	← nixjdm left	00:29
	← safe left	00:30
	← shinnya left	00:30
	→ shinnya joined	00:31
	← Matsv left	00:34
	← orbyt_ left	00:34
	← PaulCapestany left	00:34
	→ PaulCapestany joined	00:36
	← njbair left	00:38
	→ njbair joined	00:40
	→ safe joined	00:40
	→ orbyt_ joined	00:41
	→ tkore\ joined	00:42
	← Nizumzen left	00:43
	← tkore left	00:45
	← PaulCapestany left	00:46
mac-	hey	00:50
	I did: git fetch origin master:master	00:51
	when I have master checkouted	00:51
	which returned:	00:51
	fatal: Refusing to fetch into current branch refs/heads/master of non-bare repository	00:51
	the first question is: what is bare/non-bare repository ?	00:51
mud	mac-: A non-bare repository is one with a working tree. If you can see the files that are versioned by the repository, it's a non-bare repo.	00:52
	It's ... the usual kind of repository you work in.	00:52
	← shinnya left	00:52
mud	Bare repositories are ones you push to.	00:53
mac-	then bare repos are remotes ones ?	00:55
	ok, not only	00:55
	but usually	00:55
mud	Usually any repo you push to will be bare, yes. So remote ones typically, sure.	00:56
	← Murr left	00:57
	→ Murr joined	00:58
	→ PaulCapestany joined	00:58
	← akushner left	00:58
	← TomyLobo left	00:58
mac-	then with the fatal I've got	00:58
	I see thet there is -u flag which shouldn't be used manually and is only for pull	00:59
	and during pull it is used internally by pull	00:59
mud	mac-: Well, what is your intention exactly?	00:59
mac-	I don't understand why I've got fatal when trying to fetch from remote origin to local origin	01:00
	→ cdown_ joined	01:00
mac-	when master is current branch	01:00
mud	Because that's not what you're doing. You're trying to overwrite your local 'master' branch with the remote one, the one that origin/master tracks.	01:01
	→ dviola joined	01:01
mac-	I mean from origin/mater to local/master	01:01
mud	Because that's a weird thing to want to do. Do you want to make your local master exactly equal to the remote one?	01:01
mac-	hmm	01:01
	well I wish to get origin/master and then merge to it (possibly with fast-forward)	01:02
	BrAsS_mOnKeY → william	01:02
mac-	when I'm behind origin/master	01:02
mud	merge it in you mean? That'd be 'git fetch && git merge origin/master'	01:02
	← upperdeck left	01:02
	← cdown left	01:02
mac-	yep	01:02
	cdown_ → cdown	01:03
mud	fetch doesn't do merges at all, in any way. All it does is overwrite certain things, usually remote-tracking-branches that you don't particular mind getting overwritten.	01:03
mac-	I didn't do any work on local/master but there are new commits on origin/master	01:03
	hm, in ProGit they wrote that I have two possible ways of pulling remote - pull which does fetch & merge and fetch which requires manual merge	01:04
	→ rafasc joined	01:05
mud	Yes. I favor the second, actually using 'git pull' I find unpleasant.	01:05
	→ db8093246 joined	01:05
mac-	as they wrote	01:05
	← cdown left	01:06
	→ cdown joined	01:06
	→ upperdeck joined	01:07
mac-	hmm	01:08
	ok I think I understand	01:08
	← xaa left	01:08
	← overlord_tm left	01:08
mac-	git fetch origin master - will overwrite origin/master on my local machine but it is remote branch reference	01:09
	when	01:09
	← orbyt_ left	01:09
mac-	git fetch origin master:master - will try to overwrite local/master with origin/master content	01:09
	just replace it	01:10
	after that there is no need to do merge when it will be directly replaced, then all my commits (which should be merged) will be lost	01:11
	am I right ?	01:11
mud	mac-: Really just, don't use fetch that way IMO. It's not particularly pretty. If you really want to just plain overwrite a local branch, the usualy way would be 'git fetch && git checkout master && git reset --hard origin/master'	01:15
	I find that easier to understand and harder to screw up.	01:15
mac-	I used src:dst notation because I saw it in man of git-fetch	01:16
	$ git fetch origin +pu:pu maint:tmp	01:16
	This updates (or creates, as necessary) branches pu and tmp in the	01:16
	local repository by fetching from the branches (respectively) pu	01:16
	and maint from the remote repository.	01:16
	sorry	01:16
	they wrote 'update'	01:17
	← gopar left	01:17
	→ gopar joined	01:18
	→ Gustavo6046 joined	01:20
	→ thiago joined	01:20
	← King_Hual left	01:21
	→ Gurkenglas joined	01:21
	← jstimm left	01:22
	← chachasmooth left	01:22
	→ chachasmooth joined	01:22
	← Noldorin left	01:22
	← gopar left	01:23
	→ gopar joined	01:23
	→ orbyt_ joined	01:24
	→ Noldorin joined	01:27
	← cagomez left	01:28
	← floatleft left	01:32
	← dre_ left	01:34
	→ Amanas joined	01:35
	← jstein left	01:35
	← Cabanossi left	01:38
	→ cdg joined	01:39
	→ Cabanossi joined	01:40
	← DvdKhl left	01:42
	← cdg left	01:44
	← crtcji left	01:44
	← converge left	01:45
	→ akushner joined	01:47
	← akushner left	01:49
	→ Claw_wolf joined	01:51
	← Claw_wolf left	01:51
	→ Claw_wolf joined	01:51
	← nunchuck left	01:58
	→ floatleft joined	01:58
	→ Raed\|Laptop joined	01:59
	← db8093246 left	02:01
	← Munt left	02:03
	→ ArcaTech joined	02:05
	→ durham joined	02:05
	← Sasazuka left	02:06
	← kfoonamalik left	02:06
	← dviola left	02:08
	→ yu joined	02:08
	← beerdrop left	02:09
	← orbyt_ left	02:09
	→ xaxxon joined	02:10
	→ mrkgnao joined	02:13
	→ stduolc2 joined	02:13
	← Claw_wolf left	02:16
	← stduolc1 left	02:16
	← cdown left	02:16
	→ cdown joined	02:17
	← occupant left	02:18
	→ orbyt_ joined	02:18
	→ rushi joined	02:19
	← menip left	02:20
	← upperdeck left	02:20
	← VoradorPT left	02:21
	→ beerdrop joined	02:21
	→ dviola joined	02:22
	← steeze left	02:22
	← yu left	02:22
	← svm_invictvs left	02:23
	← clickjack left	02:23
	← Amanas left	02:23
	← Gustavo6046 left	02:25
	→ upperdeck joined	02:25
	← durham left	02:27
	← blackmesa1 left	02:27
	→ yu_rushi joined	02:28
	→ gxt joined	02:28
	→ finalbeta joined	02:28
	→ dreiss joined	02:29
	→ Claw_wolf joined	02:29
	← Claw_wolf left	02:29
	→ Claw_wolf joined	02:29
	← Tobbi left	02:30
	← rushi left	02:31
	→ menip joined	02:36
	→ linuxmodder- joined	02:38
	← linuxmodder- left	02:38
	→ linuxmodder- joined	02:38
	→ Munt joined	02:38
	← linuxmodder- left	02:39
	← Cabanossi left	02:39
	→ linuxmodder- joined	02:39
	← linuxmodder- left	02:39
	→ linuxmodder- joined	02:39
	→ Cabanossi joined	02:40
	← linuxmodder left	02:40
	← linuxmodder- left	02:40
	→ linuxmodder- joined	02:41
	← linuxmodder- left	02:41
	→ linuxmodder- joined	02:41
	← linuxmodder- left	02:42
	→ linuxmodder- joined	02:42
	← linuxmodder- left	02:42
	→ linuxmodder- joined	02:42
	← linuxmodder- left	02:43
	→ linuxmodder- joined	02:44
	← linuxmodder- left	02:44
	→ linuxmodder- joined	02:44
	← linuxmodder- left	02:45
	← ilbot3 left	02:45
	← d10n-work left	02:46
	← d^sh left	02:48
	→ d^sh joined	02:50
	→ pyfoo joined	02:55
	→ mohabaks joined	02:56
	← mrkgnao left	02:57
	← Murr left	02:57
	→ Murr joined	02:58
	→ devbaka_ joined	02:58
	← prg318 left	02:59
	→ Lyqyd joined	02:59
	← xaxxon left	02:59
	→ ilbot3 joined	03:00
	→ prg318 joined	03:00
	← devbaka left	03:02
	← dreiss left	03:03
	→ xaxxon joined	03:03
	← ZexaronS left	03:04
	← bergice_ left	03:05
	← yu_rushi left	03:07
	← xaxxon left	03:07
	← Munt left	03:07
	→ Munt joined	03:08
	→ xaxxon joined	03:10
	→ IndianAr_ joined	03:10
	→ lagothrix joined	03:12
	← maroloccio left	03:12
	→ lhx joined	03:14
	→ mizu_no_oto joined	03:14
	← lagothri1 left	03:14
	← sim590 left	03:15
	→ akela joined	03:16
akela	So... symlinking the files into the local git repo, only prints the path on the remote git repo.. is there a way to fix this?	03:16
lhx	akela: hard link them?	03:16
	→ mrkcc joined	03:16
akela	lhx: if that's the best solution, I will go with that, thanks! :)	03:16
	← mrkcc left	03:17
	← leeN left	03:17
lhx	akela: I dunno... I try not to play around with links and git repos	03:19
	if anything, I symlink "out" of the git repo... i.e. for dot files and the like	03:19
akela	lhx: what do you mean symlink "out"? I want to keep my dotfiles in sync with the remote git repo	03:20
	And that's the solution I go for: create a git directory, and symlink the files I want to keep in sync. Is there a better way?	03:21
lhx	Let's say I have dot files in /home/username/repos/my-dot-files/	03:21
	i would do 'ln -s /home/username/repos/my-dot-files/.zhrc /home/username/'	03:21
	The git repo never knows there's a link	03:21
akela	ooooh I see! And it works like that?	03:22
lhx	akela: yeah, that's how I do dot files	03:22
	works perfect	03:22
	have the original inside the git repo... not the link	03:22
akela	nice :D easy trick, fuck... XD	03:22
	wait, but this is not what you just type for the command, right?	03:23
lhx	Glad I could help :)	03:23
	huh?	03:23
akela	oh, sorry sorry	03:23
	too late for me and I can't read properly :P	03:23
lhx	no need to apologize... did not understand your last question :)	03:23
akela	thanks for your help man !	03:23
lhx	anytime	03:24
	← mizu_no_oto left	03:24
	← mohabaks left	03:26
	→ shinnya joined	03:26
	→ dreiss joined	03:28
	← Ratler left	03:32
	→ NeverTired joined	03:32
	← dreiss left	03:33
	← Munt left	03:35
	← safe left	03:35
	→ Munt joined	03:36
	← chachasmooth left	03:36
	→ chachasmooth joined	03:36
	→ yu_rushi joined	03:36
	→ cdg joined	03:37
	← Cabanossi left	03:38
	← nephyrin left	03:39
	→ Cabanossi joined	03:40
	← cdg left	03:41
	← heroux left	03:42
	← akela left	03:42
	← rafasc left	03:43
	← Munt left	03:45
	→ Munt joined	03:46
	← ArcaTech left	03:48
	← khisanth_ left	03:51
	→ Michael_ joined	03:51
	← pbrewczynski left	03:54
	→ nephyrin joined	03:56
	← DolpheenDream left	03:57
	← goweol left	03:59
	→ DolpheenDream joined	03:59
	→ goweol joined	03:59
	← DolpheenDream left	04:00
	← goweol left	04:00
	→ goweol joined	04:02
	← goweol left	04:02
	← Munt left	04:03
	← pks left	04:04
	→ Munt joined	04:04
	→ pks joined	04:05
	→ khisanth_ joined	04:05
	→ goweol joined	04:05
	← Cabanossi left	04:07
	← goweol left	04:08
	→ Cabanossi joined	04:08
	→ goweol joined	04:08
	← goweol left	04:09
	→ goweol joined	04:10
	← goweol left	04:11
	→ cdg joined	04:12
	← Munt left	04:14
	→ clandestino joined	04:14
	→ Munt joined	04:15
	← cdg left	04:17
	← jzeus left	04:17
	← snowkidind left	04:18
	← yu_rushi left	04:19
	← gopar left	04:19
	→ gopar joined	04:20
	→ umask077 joined	04:20
	← upperdeck left	04:22
	→ jzeus joined	04:23
	← gopar left	04:24
	← umask077 left	04:24
	← Noldorin left	04:26
	→ upperdeck joined	04:26
	→ Anja_ joined	04:29
	← Gurkenglas left	04:31
	→ stutter joined	04:32
	← Aichan left	04:33
	← stutter left	04:33
	→ Aichan joined	04:33
	← livingstn left	04:33
	← Munt left	04:34
	→ dreiss joined	04:35
	← Cabanossi left	04:36
	← pyfoo left	04:37
	→ Cabanossi joined	04:39
	← yohnnyjoe left	04:39
	← clandestino left	04:41
	→ jungsubk joined	04:42
	→ Ldip joined	04:42
	→ umask077 joined	04:43
	→ mohabaks joined	04:44
	← mohabaks left	04:44
	→ mohabaks joined	04:45
	→ rumflump joined	04:46
	→ mattsll joined	04:48
mattsll	Any suggestions for reasons why git would show that every line in a file changed when it's not due to line endings?	04:49
	→ jstimm joined	04:49
lhx	mattsll: some other whitespace issue? tabs v. spaces?	04:50
	mattsll: are you going windows to unix/osx and back?	04:50
	→ roygbiv joined	04:50
mattsll	lhx: On Linux the whole time. Only changed a few lines. Didn't change white space.	04:51
	← Anja_ left	04:52
	← Claw_wolf left	04:52
lhx	mattsll: have you tried doing a git diff just to see what it thinks are the changes	04:53
	(that's weird if it's not line endings... :( )	04:53
mattsll	lhx: That's what prompted my questions. It shows the whole original red and the whole new file green.	04:53
lhx	same for line by line?	04:53
mattsll	Yeah. It's always line endings. Meaning that when I tried searching for other ideas, I got nothing but answers about line endigns. :-/	04:54
	← introom left	04:54
mattsll	I didn't know I could do line by line	04:54
lhx	and the original is for sure committed in parent commit? It's not just showing you every line is new because it's git's first encounter with the file?	04:55
mattsll	lhx: No. It's showing all the old lines deleted. I can copy and past the whole git diff out into my editor and it correctly shows just the changes I actually made.	04:55
lhx	So it shows old lines deleted, and then replaced with the same line?	04:56
	And no filename change?	04:56
	← n-st left	04:56
	→ snowkidind joined	04:57
mattsll	lhx: Correct on both counts.	04:57
lhx	how about git checkout -b testbranch then commit and then make a minor change and see what's happening?	04:57
	see if it works normally there	04:57
	Is your editor set up for unix line endings?	04:57
mattsll	I just found and ran --color-words and it only highlights the actual changes....	04:57
	← Murr left	04:57
lhx	then you definitely have a whitespace issue	04:58
	→ Murr joined	04:58
lhx	whitespace or line endings	04:58
	try different editor to see if issue persists?	04:58
	→ n-st joined	04:59
mattsll	I've seen line ending issues in the past and git always highlights the line end changes	04:59
lhx	reset your changes and try a different editor	05:00
mattsll	Ok. Will do.	05:01
	→ Atemu joined	05:01
	→ stux\|RC-- joined	05:05
	← jstimm left	05:06
	← jungsubk left	05:06
	← orbyt_ left	05:06
	← floatleft left	05:06
	← AmR\|EiSa left	05:06
	← MoziM left	05:06
	← m0viefreak left	05:06
	← dmarr left	05:06
	← harv left	05:06
	← mooasaurus left	05:06
	← jimmyrcom_ left	05:06
	← ktwo left	05:06
	← sasheto left	05:06
	← shalok left	05:06
	← dustinm left	05:06
	← pdgwien left	05:06
	← Guest16693 left	05:06
	← likewhoa left	05:06
	← pewpew left	05:06
	← xtheosirian left	05:06
	← absolutejam left	05:06
	← hahuang65 left	05:06
	← vishal left	05:06
	← synthmeat left	05:06
	← matoro_ left	05:06
	← dhollinger left	05:06
	← simon816 left	05:06
	← austin987 left	05:06
	← sw1m left	05:06
	← Codaraxis left	05:06
	← gruetzkopf left	05:06
	← adamus1red left	05:06
	← cpallares left	05:06
	← sven^_ left	05:06
	← hyperair left	05:06
	← courrier left	05:06
	← rigid left	05:06
	← nivag_ left	05:06
	← tijensse left	05:06
	← sitaram left	05:06
	← jwest left	05:06
	← mulvane left	05:06
	← immae left	05:06
	← pztrick left	05:06
	← weylin left	05:06
	← kenansulayman left	05:06
	← dcpc007 left	05:06
	← comps left	05:06
	← marienz left	05:06
	← Arguggi left	05:06
	← thnee left	05:06
	← guardian left	05:06
	← andres left	05:06
	← kdragon left	05:06
	← MrC left	05:06
	← gaucheph[m] left	05:06
	← dreadful[m] left	05:06
	← moonrunes[m] left	05:06
	← unclechu left	05:06
	← weltall left	05:06
	← roygbiv left	05:06
	← NeverTired left	05:06
	← thiago left	05:06
	← jrabe left	05:06
	← joeco left	05:06
	← salamanderrake left	05:06
	← nahtnam left	05:06
	← Rubin left	05:06
	← mud left	05:06
	← arooni left	05:06
	← bigjazzsound left	05:06
	← Arcaelyx left	05:06
	← landau[m] left	05:06
	← wloncom left	05:06
	← daurnimator left	05:06
	← kashike left	05:06
	← tcp_j left	05:06
	← r3c0d3x left	05:06
	← cschneid left	05:06
	← zifnab left	05:06
	← awygle left	05:06
	← kent\n left	05:06
	← prosody left	05:06
	← johnlage left	05:06
	← bartman left	05:06
	← duckydan left	05:06
	← alcohol left	05:06
	← Sleepy63 left	05:06
	← qqx left	05:06
	← ghoti left	05:06
	← jab416171 left	05:06
	← tcsc left	05:06
	← Orbitrix left	05:06
	← stux\|RC left	05:06
	← nellicus_ left	05:06
	← thinkpad left	05:06
	← Ranhir left	05:06
	← fuchstronaut left	05:06
	← swords left	05:06
	← ndim left	05:06
	← Jak_o_Shadows left	05:06
	← m1dnight_ left	05:06
	← Fissure left	05:06
	← monokrome left	05:06
	← NeXTSUN left	05:06
	← A\|TARIS left	05:06
	← SirCmpwn left	05:06
	← BooK left	05:06
	← opal left	05:06
	← GameGamer43 left	05:06
	← infernix left	05:06
	← hoek left	05:06
	← noahsussman left	05:06
	← jleclanche left	05:06
	← xxpor left	05:06
	← ablackack_ left	05:06
	← nydel09 left	05:06
	← leprechau left	05:06
	← nydel07 left	05:06
	← Hello71 left	05:06
	← milli left	05:06
	← Case_Of left	05:06
	← madknight left	05:06
	← tribly left	05:06
	← Kuukunen left	05:06
	← binary106 left	05:06
	← irqq left	05:06
	← SpeakerToMeat left	05:06
	← tango_ left	05:06
	← winny left	05:06
	← uebera\|\| left	05:06
	← gargola left	05:06
	← dwmw2_gone left	05:06
	← mrkake left	05:06
	← jason237 left	05:06
	← Furai left	05:06
	← Iroha left	05:06
	← beuker left	05:06
	← n1ax left	05:06
	← skered left	05:06
	← __main__ left	05:06
	← lhx left	05:06
	← jimmyrcom left	05:06
	← wcpan left	05:06
	← perrier-jouet left	05:06
	← n-st left	05:06
	← menip left	05:06
	← Raed\|Laptop left	05:06
	← njbair left	05:06
	← raffo left	05:06
	← Gianormagantrous left	05:06
	← armin left	05:06
	← sonOfRa left	05:06
	← CedaEI[m] left	05:06
	← abithvijayan[m] left	05:06
	← thepilot[m] left	05:06
	← Miguelngel[m] left	05:06
	← Guest6289 left	05:06
	← Demos[m] left	05:06
	← equalunique[m] left	05:06
	← nuck left	05:06
	← Cerise left	05:06
	← martinklepsch left	05:06
	← Phylock left	05:06
	← nopf left	05:06
	← blackbeard420 left	05:06
	← harmaahylje left	05:06
	← ghormoon left	05:06
	← bongozig left	05:06
	← kgz left	05:06
	← cliluw left	05:06
	← ribasushi left	05:06
	← nevodka left	05:06
	← eb0t left	05:06
	← plitter left	05:06
	← whitby left	05:06
	← cust left	05:06
	← Xe left	05:06
	← oelewapperke left	05:06
	← Guest33114 left	05:06
	← timvisher left	05:06
	← cyberz left	05:06
	← Aaeriele left	05:06
	← destiny_ left	05:06
	← TooLmaN left	05:06
	← caffeinatedcode left	05:06
	← rancyd left	05:06
	← seanBE left	05:06
	← knittl left	05:06
	← gkatsev left	05:06
	← jorj left	05:06
	← Paparaciz left	05:06
	← Kronuz left	05:06
	← yourfate left	05:06
	← Dewin left	05:06
	← Sc0rpius left	05:06
	← diginaut left	05:06
	← joes left	05:06
	← zachary12 left	05:06
	← eldritch left	05:06
	← ollien left	05:06
	← Esya left	05:06
	← AlgorithmWizard left	05:06
	← hiroki left	05:06
	← nsc[m] left	05:06
	← patrickr[m] left	05:06
	← cicada3307[m] left	05:06
	← c0ff33[m] left	05:06
	← flo[m] left	05:06
	← murii left	05:06
	← hujuiko left	05:06
	← janx left	05:06
	← infinisil left	05:06
	← hussam left	05:06
	← Cathy left	05:06
	← Es0teric left	05:06
	← ahrs left	05:06
	← ShekharReddy left	05:06
	← thallada left	05:06
	← nyuszika7h left	05:06
	← veremitz left	05:06
	← uptime left	05:06
	← yn left	05:06
	← hue left	05:06
	← Amadiro left	05:06
	← justache left	05:06
	← XDS2010\|AFK left	05:06
	← l2y left	05:06
	← Meow-J left	05:06
	← wizonesolutions left	05:06
	← Guest9063 left	05:06
	← ixian left	05:06
	← w0ng left	05:06
	← whyme left	05:06
	← MapMan left	05:06
	← lu_zero left	05:06
	← beccamorgan left	05:06
	← ruskie left	05:06
	← Spydar007 left	05:06
	← dupondje left	05:06
	← ngqrl left	05:06
	← dvl left	05:06
	← boutcher left	05:06
	← necrosis left	05:06
	← Zarthus left	05:06
	← jaeckel left	05:06
	← bathtub_shark left	05:06
	← hakzsam left	05:06
	← ti2 left	05:06
	← deepy left	05:06
	← hexa- left	05:06
	← souther left	05:06
	← demize left	05:06
	← bronson_ left	05:06
	← BackEndCoder left	05:06
	← fowlduck left	05:06
	← MatthewAllan93 left	05:06
	← toydestroyer_ left	05:06
	← osse left	05:06
	← frobnic left	05:06
	← utrack left	05:06
	← _Patrick_ left	05:06
	← ketas left	05:06
	← Bigcheese left	05:06
	← f0rks left	05:06
	← nimbleark left	05:06
	← rewt left	05:06
	← lohfu left	05:06
	← reu left	05:06
	← Pilfers left	05:06
	← Nickeeh left	05:06
	← Guest32854 left	05:06
	← Ragnor left	05:06
	← tsia left	05:06
	← Phlogistique left	05:06
	← huhlig left	05:06
	← Ionic left	05:06
	← Atemu left	05:06
	← mattsll left	05:06
	← jzeus left	05:06
	← khisanth_ left	05:06
	← xaxxon left	05:06
	← dviola left	05:06
	← peepsalot left	05:06
	← jayjo left	05:06
	← MacWinner left	05:06
	← IanLiu left	05:06
	← tchan left	05:06
	← wagle left	05:06
	← konsolebox left	05:06
	← mattp_ left	05:06
	← zxd left	05:06
	← pR0Ps left	05:06
	← BUSY left	05:06
	← qpdb left	05:06
	← Bercik left	05:06
	← Milos left	05:06
	← esc left	05:06
	← jim left	05:06
	← chrfle left	05:06
	← rnsanchez left	05:06
	← Walex left	05:06
	← waveclaw left	05:06
	← strugee left	05:06
	← garo left	05:06
	← gk left	05:06
	← MrMagic left	05:06
	← Persikka left	05:06
	← roger_raymond left	05:06
	← holdsworth left	05:06
	← axisys left	05:06
	← hdon left	05:06
	← ses1984 left	05:06
	← anderson left	05:06
	← halftroll left	05:06
	← jantje left	05:06
	← jlewis left	05:06
	← Murr left	05:06
	← Ldip left	05:06
	← IndianAr_ left	05:06
	← Lyqyd left	05:06
	← askb_ left	05:06
	← tang^ left	05:06
	← mattcen left	05:06
	← peeps left	05:06
	← tunekey left	05:06
	← VladGh left	05:06
	← marcje left	05:06
	← ravndal left	05:06
	← lb1c left	05:06
	← felixsanz left	05:06
	← naf left	05:06
	← Puppet_ left	05:06
	← philosaur left	05:06
	← justanotheruser left	05:06
	← wgrant left	05:06
	← fatalhalt left	05:06
	← SCHAPiE left	05:06
	← stux\|RC-only left	05:06
	← QualityAddict left	05:06
	← drakon left	05:06
	← bket left	05:06
	← bordeaux_facile left	05:06
	← Croepha left	05:06
	← emg left	05:06
	← Impaloo left	05:06
	← sborza left	05:06
	← because left	05:06
	← _xor left	05:06
	← Eugene left	05:06
	← spacemud left	05:06
	← wizardedit left	05:06
	← mniip left	05:06
	← sbeyer left	05:06
	← freephile left	05:06
	← kozy left	05:06
	← vrc405 left	05:06
	← grumble left	05:06
	← Deflate left	05:06
	← murr4y left	05:06
	← Celelibi left	05:06
	← amigara left	05:06
	← nshp left	05:06
	← ephemer0l left	05:06
	← aspiers left	05:06
	← Sigma left	05:06
	← hurricanehrndz left	05:06
	← heinrich5991 left	05:06
	← _cyril_ left	05:06
	← mika left	05:06
	← tinanoo1 left	05:06
	← Ankhers left	05:06
	← Guest55057 left	05:06
	← planigan left	05:06
	← cybrNaut left	05:06
	← SporkWitch left	05:06
	← sangy left	05:06
	← Chaser left	05:06
	← wwalker left	05:06
	← Rhonda left	05:06
	← everbird left	05:06
	← dreiss left	05:06
	← upperdeck left	05:06
	← devbaka_ left	05:06
	← volestorm left	05:06
	← dpower left	05:06
	← nowhere_man left	05:06
	← boombatower left	05:06
	← preaction left	05:06
	← Zamerick left	05:06
	← \|ifei5g00d left	05:06
	← [Brain] left	05:06
	← Barrt left	05:06
	← filcab left	05:06
	← dmc left	05:06
	← Nugget left	05:06
	← catsup left	05:06
	← FilipNortic_ left	05:06
	← led_belly_ left	05:06
	← Levex left	05:06
	← Garen left	05:06
	← jimInDevNull left	05:06
	← mac- left	05:06
	← freekevin left	05:06
	← yaiyan left	05:06
	← trondth left	05:06
	← dskull left	05:06
	← CalimeroTeknik left	05:06
	← M6HZ left	05:06
	← Kiruwa left	05:06
	← FabTG left	05:06
	← k left	05:06
	← hanneso left	05:06
	← Jackneill left	05:06
	← Shayan-To left	05:06
	← infinite left	05:06
	← Timvde left	05:06
	← dilfridge left	05:06
	← mfiano left	05:06
	← plasticboy left	05:06
	← PaulePanter left	05:06
	← sejo left	05:06
	← surial left	05:06
	← themill left	05:06
	← Peng left	05:06
	← MonsterKiller left	05:06
	← seitensei left	05:06
	← SlashLife left	05:06
	← arand left	05:06
	← FIQ left	05:06
	← Kamilion left	05:06
	← timthowtdi left	05:06
	← maestrojed left	05:06
	← ninsei left	05:06
	← monty left	05:06
	← ColdKeyboard left	05:06
	← markus-k left	05:06
	← anbz left	05:06
	← Willis left	05:06
	← lus left	05:06
	← ReenignE left	05:06
	← _W_ left	05:06
	← musca left	05:06
	← ahammond left	05:06
	← Sornaensis left	05:06
	← djh left	05:06
	← musl_ left	05:06
	← deltab left	05:06
	← bl0m1 left	05:06
	← Davey left	05:06
	← justinmrkva left	05:06
	← Xethron left	05:06
	← armenb left	05:06
	← tafa2 left	05:06
	← teej left	05:06
	→ philosau1 joined	05:06
	→ justache_ joined	05:06
	→ Meow-J_ joined	05:07
	→ hujuiko joined	05:07
	→ l2y_ joined	05:07
	→ pdgwien joined	05:07
	→ fatalhalt_ joined	05:07
	← waltervargas[m] left	05:08
	← aspiers[m] left	05:08
	← colonelkrud[m] left	05:08
	← horpoppy[m] left	05:08
	← hiq[m] left	05:08
	← MeTheFlea left	05:08
	← olbat[m] left	05:08
	← reactormonk[m] left	05:08
	← UncleCJ left	05:08
	← shinnya left	05:08
	← apurvapavaskar[m left	05:08
	← Guest95103 left	05:08
	← KevinMGranger left	05:08
	← primeos[m] left	05:08
	← mark_c left	05:08
	← dyce[m] left	05:08
	← sr___ left	05:08
	← nappy[m] left	05:08
	← aviraldg left	05:08
	← cverna left	05:08
	← am2on left	05:08
	← Techie[m] left	05:08
	← pvn[m] left	05:08
	← spinningarrow[m] left	05:08
	← ushaNg6i[m] left	05:08
	← acme[m] left	05:08
	← torarne left	05:08
	← dikiaap left	05:08
	← sphalerite left	05:08
	← kculpis left	05:08
	→ NeverTired joined	05:09
	← autrilla left	05:09
	← aidalgol left	05:09
	← yanbbyan left	05:09
	← Remramm left	05:09
	← jeffreylevesque left	05:10
	← hujuiko left	05:10
	← d^sh left	05:10
	← bwn left	05:10
	← Polylith left	05:10
	→ justanotheruser joined	05:11
	→ Atemu joined	05:11
	→ mattsll joined	05:11
	→ jzeus joined	05:11
	→ khisanth_ joined	05:11
	→ xaxxon joined	05:11
	→ jayjo joined	05:11
	→ peepsalot joined	05:11
	→ garo joined	05:11
	→ IanLiu joined	05:11
	→ tchan joined	05:11
	→ wagle joined	05:11
	→ MapMan joined	05:11
	→ konsolebox joined	05:11
	→ mattp_ joined	05:11
	→ zxd joined	05:11
	→ murii joined	05:11
	→ janx joined	05:11
	→ pR0Ps joined	05:11
	→ BUSY joined	05:11
	→ qpdb joined	05:11
	→ infinisil joined	05:11
	→ hussam joined	05:11
	→ Cathy joined	05:11
	→ Es0teric joined	05:11
	→ ahrs joined	05:11
	→ ShekharReddy joined	05:11
	→ thallada joined	05:11
	→ uptime joined	05:11
	→ yn joined	05:11
	→ veremitz joined	05:11
	→ Amadiro joined	05:11
	→ hue joined	05:11
	→ XDS2010\|AFK joined	05:11
	→ wizonesolutions joined	05:11
	→ Guest9063 joined	05:11
	→ Ionic joined	05:11
	→ huhlig joined	05:11
	→ Phlogistique joined	05:11
	→ tsia joined	05:11
	→ Ragnor joined	05:11
	→ Guest32854 joined	05:11
	→ Nickeeh joined	05:11
	→ Pilfers joined	05:11
	→ reu joined	05:11
	→ lohfu joined	05:11
	→ rewt joined	05:11
	→ f0rks joined	05:11
	→ Bigcheese joined	05:11
	→ nimbleark joined	05:11
	→ ketas joined	05:11
	→ _Patrick_ joined	05:11
	→ utrack joined	05:11
	→ frobnic joined	05:11
	→ osse joined	05:11
	→ toydestroyer_ joined	05:11
	→ MatthewAllan93 joined	05:11
	→ fowlduck joined	05:11
	→ BackEndCoder joined	05:11
	→ bronson_ joined	05:11
	→ demize joined	05:11
	→ souther joined	05:11
	→ hexa- joined	05:11
	→ deepy joined	05:11
	→ ti2 joined	05:11
	→ hakzsam joined	05:11
	→ bathtub_shark joined	05:11
	→ Zarthus joined	05:11
	→ jaeckel joined	05:11
	→ necrosis joined	05:11
	→ boutcher joined	05:11
	→ dvl joined	05:11
	→ ngqrl joined	05:11
	→ dupondje joined	05:11
	→ Spydar007 joined	05:11
	→ beccamorgan joined	05:11
	→ ruskie joined	05:11
	→ lu_zero joined	05:11
	→ whyme joined	05:11
	→ w0ng joined	05:11
	→ ixian joined	05:11
	→ Milos joined	05:11
	→ esc joined	05:11
	→ jim joined	05:11
	→ chrfle joined	05:11
	→ rnsanchez joined	05:11
	→ Walex joined	05:11
	→ waveclaw joined	05:11
	→ strugee joined	05:11
	→ gk joined	05:11
	→ MrMagic joined	05:11
	→ Persikka joined	05:11
	→ roger_raymond joined	05:11
	→ holdsworth joined	05:11
	→ hdon joined	05:11
	→ axisys joined	05:11
	→ halftroll joined	05:11
	→ ses1984 joined	05:11
	→ jantje joined	05:11
	leguin.freenode.net set mode: +vvvv	05:11
	→ anderson joined	05:11
	→ jlewis joined	05:11
	leguin.freenode.net set mode: +vv	05:11
	→ Bercik joined	05:11
	← whyme left	05:11
	← justanotheruser left	05:11
	→ Xe joined	05:11
	← Amadiro left	05:11
	← Guest9063 left	05:11
	← wizonesolutions left	05:11
	← XDS2010\|AFK left	05:11
	← ShekharReddy left	05:11
	← uptime left	05:11
	← Meow-J_ left	05:12
	→ Meow-J_ joined	05:12
	← justache_ left	05:12
	→ justache_ joined	05:12
	← l2y_ left	05:12
	→ l2y_ joined	05:12
	← NeverTired left	05:12
	→ NeverTired joined	05:12
	Likulau → plus_m_now_tho	05:12
	plus_m_now_tho → Likulau	05:12
	→ Guest9063 joined	05:12
	→ kgz joined	05:12
	← Guest9063 left	05:12
	→ Guest9063 joined	05:12
	→ wizonesolutions joined	05:12
	→ XDS2010\|AFK joined	05:13
	← XDS2010\|AFK left	05:13
	→ XDS2010\|AFK joined	05:13
	← Xe left	05:13
	→ Xe joined	05:13
	→ Jak_o_Shadows joined	05:13
	→ weltall joined	05:13
	← wizonesolutions left	05:13
	→ wizonesolutions joined	05:13
	→ ShekharReddy joined	05:13
	← mohabaks left	05:13
	l2y_ → l2y	05:13
	→ MrC joined	05:13
	→ dreiss joined	05:13
	→ upperdeck joined	05:13
	→ devbaka_ joined	05:13
	→ volestorm joined	05:13
	→ dpower joined	05:13
	→ nowhere_man joined	05:13
	→ boombatower joined	05:13
	→ preaction joined	05:13
	→ Zamerick joined	05:13
	→ \|ifei5g00d joined	05:13
	→ [Brain] joined	05:13
	→ Barrt joined	05:13
	→ mac- joined	05:13
	→ filcab joined	05:13
	→ Levex joined	05:13
	→ dmc joined	05:13
	→ Nugget joined	05:13
	→ catsup joined	05:13
	→ FilipNortic_ joined	05:13
	→ led_belly_ joined	05:13
	→ Garen joined	05:13
	→ jimInDevNull joined	05:13
	→ freekevin joined	05:13
	→ yaiyan joined	05:13
	→ trondth joined	05:13
	→ dskull joined	05:13
	→ CalimeroTeknik joined	05:13
	→ M6HZ joined	05:13
	→ Kiruwa joined	05:13
	→ FabTG joined	05:13
	→ k joined	05:13
	→ hanneso joined	05:13
	→ Jackneill joined	05:13
	→ surial joined	05:13
	→ Shayan-To joined	05:13
	→ infinite joined	05:13
	→ Timvde joined	05:13
	→ dilfridge joined	05:13
	→ FIQ joined	05:13
	→ mfiano joined	05:13
	→ plasticboy joined	05:13
	→ PaulePanter joined	05:13
	→ sejo joined	05:13
	→ maestrojed joined	05:13
	→ themill joined	05:13
	→ Peng joined	05:13
	leguin.freenode.net set mode: +v	05:13
	→ MonsterKiller joined	05:13
	→ SlashLife joined	05:13
	→ seitensei joined	05:13
	→ arand joined	05:13
	→ Kamilion joined	05:13
	→ timthowtdi joined	05:13
	→ ninsei joined	05:13
	→ monty joined	05:13
	leguin.freenode.net set mode: +vvvv	05:13
	→ ColdKeyboard joined	05:13
	→ markus-k joined	05:13
	→ anbz joined	05:13
	→ tafa2 joined	05:13
	leguin.freenode.net set mode: +vvvv	05:13
	→ Sornaensis joined	05:13
	→ Willis joined	05:13
	→ lus joined	05:13
	→ ReenignE joined	05:13
	leguin.freenode.net set mode: +vvvv	05:13
	→ _W_ joined	05:13
	→ musca joined	05:13
	→ ahammond joined	05:13
	→ djh joined	05:13
	leguin.freenode.net set mode: +vvvv	05:13
	→ musl_ joined	05:13
	→ deltab joined	05:13
	→ bl0m1 joined	05:13
	→ Davey joined	05:13
	leguin.freenode.net set mode: +vvvv	05:13
	→ justinmrkva joined	05:13
	→ Xethron joined	05:13
	→ armenb joined	05:13
	leguin.freenode.net set mode: +vvv	05:13
	→ Orbitrix joined	05:14
	← MrC left	05:14
	← Jak_o_Shadows left	05:14
	→ Jak_o_Shadows joined	05:14
	← pR0Ps left	05:14
	→ justanotheruser joined	05:14
	← Bercik left	05:14
	→ Bercik joined	05:14
	→ teej joined	05:14
	→ n-st joined	05:14
	→ menip joined	05:14
	→ Raed\|Laptop joined	05:14
	→ njbair joined	05:14
	→ raffo joined	05:14
	→ Gianormagantrous joined	05:14
	→ armin joined	05:14
	→ sonOfRa joined	05:14
	→ nuck joined	05:14
	→ Cerise joined	05:14
	→ martinklepsch joined	05:14
	→ Phylock joined	05:14
	→ nopf joined	05:14
	→ blackbeard420 joined	05:14
	→ harmaahylje joined	05:14
	→ ghormoon joined	05:14
	→ bongozig joined	05:14
	→ cliluw joined	05:14
	→ nevodka joined	05:14
	→ plitter joined	05:14
	→ whitby joined	05:14
	→ cust joined	05:14
	→ oelewapperke joined	05:14
	→ Guest33114 joined	05:14
	→ timvisher joined	05:14
	→ cyberz joined	05:14
	→ Aaeriele joined	05:14
	→ destiny_ joined	05:14
	→ TooLmaN joined	05:14
	→ caffeinatedcode joined	05:14
	→ rancyd joined	05:14
	→ seanBE joined	05:14
	→ knittl joined	05:14
	→ gkatsev joined	05:14
	→ jorj joined	05:14
	→ Paparaciz joined	05:14
	leguin.freenode.net set mode: +vvvv	05:14
	→ Kronuz joined	05:14
	→ yourfate joined	05:14
	→ Dewin joined	05:14
	→ Sc0rpius joined	05:14
	leguin.freenode.net set mode: +vvvv	05:14
	→ diginaut joined	05:14
	→ joes joined	05:14
	→ zachary12 joined	05:14
	→ eldritch joined	05:14
	leguin.freenode.net set mode: +vvvv	05:14
	→ Esya joined	05:14
	leguin.freenode.net set mode: +v	05:14
	→ ollien joined	05:14
	→ AlgorithmWizard joined	05:14
	→ hiroki joined	05:14
	leguin.freenode.net set mode: +vvv	05:14
	← teej left	05:14
	→ teej joined	05:14
	← ghormoon left	05:14
	← n-st left	05:14
	← armin left	05:14
	← nopf left	05:14
	← teej left	05:14
	→ m0viefreak joined	05:14
	→ nopf joined	05:14
	→ ghormoon joined	05:14
	→ d^sh joined	05:15
	→ bwn joined	05:15
	→ SCHAAP137 joined	05:15
	→ ribasushi joined	05:15
	→ jstimm joined	05:15
	→ orbyt_ joined	05:15
	→ AmR\|EiSa joined	05:15
	→ MoziM joined	05:15
	→ dmarr joined	05:15
	→ harv joined	05:15
	→ mooasaurus joined	05:15
	→ jimmyrcom_ joined	05:15
	→ ktwo joined	05:15
	→ shalok joined	05:15
	→ dustinm joined	05:15
	→ Guest16693 joined	05:15
	→ likewhoa joined	05:15
	→ pewpew joined	05:15
	→ xtheosirian joined	05:15
	→ absolutejam joined	05:15
	→ hahuang65 joined	05:15
	→ vishal joined	05:15
	→ synthmeat joined	05:15
	→ matoro_ joined	05:15
	→ dhollinger joined	05:15
	→ simon816 joined	05:15
	→ austin987 joined	05:15
	→ sw1m joined	05:15
	→ Codaraxis joined	05:15
	→ gruetzkopf joined	05:15
	→ adamus1red joined	05:15
	→ cpallares joined	05:15
	→ sven^_ joined	05:15
	→ hyperair joined	05:15
	→ thnee joined	05:15
	→ rigid joined	05:15
	→ nivag_ joined	05:15
	→ tijensse joined	05:15
	→ sitaram joined	05:15
	→ jwest joined	05:15
	→ guardian joined	05:15
	→ mulvane joined	05:15
	→ immae joined	05:15
	→ pztrick joined	05:15
	→ weylin joined	05:15
	→ kenansulayman joined	05:15
	→ dcpc007 joined	05:15
	→ comps joined	05:15
	→ marienz joined	05:15
	leguin.freenode.net set mode: +v	05:15
	→ Arguggi joined	05:15
	→ andres joined	05:15
	→ MrC joined	05:15
	→ felixsanz joined	05:15
	→ n-st joined	05:15
	→ because joined	05:15
	← kenansulayman left	05:15
	← austin987 left	05:15
	← absolutejam left	05:15
	← likewhoa left	05:15
	← pztrick left	05:15
	← shalok left	05:15
	← synthmeat left	05:15
	← dustinm left	05:15
	← ribasushi left	05:15
	← SCHAAP137 left	05:15
	→ kdragon joined	05:15
	← pewpew left	05:15
	→ armin joined	05:15
	→ absolutejam joined	05:15
	→ kenansulayman joined	05:15
	→ austin987 joined	05:15
	→ likewhoa joined	05:15
	→ cybrNaut- joined	05:15
	→ bordeaux_facile_ joined	05:15
	→ sborza_ joined	05:15
	→ naf_ joined	05:16
	→ shinnya joined	05:16
	→ spacemud joined	05:16
	→ eb0t joined	05:16
	→ sasheto joined	05:16
	→ courrier joined	05:16
	→ Murr joined	05:16
	→ Ldip joined	05:16
	→ IndianAr_ joined	05:16
	→ Lyqyd joined	05:16
	→ askb_ joined	05:16
	→ tang^ joined	05:16
	→ mattcen joined	05:16
	→ peeps joined	05:16
	→ VladGh joined	05:16
	→ marcje joined	05:16
	→ ravndal joined	05:16
	→ lb1c joined	05:16
	→ naf joined	05:16
	→ Puppet_ joined	05:16
	→ wgrant joined	05:16
	→ QualityAddict joined	05:16
	→ drakon joined	05:16
	→ bket joined	05:16
	→ bordeaux_facile joined	05:16
	→ Croepha joined	05:16
	→ emg joined	05:16
	→ Impaloo joined	05:16
	→ sborza joined	05:16
	→ _xor joined	05:16
	→ Eugene joined	05:16
	→ wizardedit joined	05:16
	→ mniip joined	05:16
	→ sbeyer joined	05:16
	→ freephile joined	05:16
	→ amigara joined	05:16
	→ nshp joined	05:16
	→ vrc405 joined	05:16
	→ grumble joined	05:16
	→ Deflate joined	05:16
	→ murr4y joined	05:16
	→ Celelibi joined	05:16
	→ ephemer0l joined	05:16
	→ aspiers joined	05:16
	→ Sigma joined	05:16
	→ hurricanehrndz joined	05:16
	→ _cyril_ joined	05:16
	→ mika joined	05:16
	→ tinanoo1 joined	05:16
	→ Ankhers joined	05:16
	→ planigan joined	05:16
	→ cybrNaut joined	05:16
	→ SporkWitch joined	05:16
	→ sangy joined	05:16
	→ Chaser joined	05:16
	→ wwalker joined	05:16
	→ Rhonda joined	05:16
	→ everbird joined	05:16
	← _xor left	05:16
	← cybrNaut left	05:16
	← ravndal left	05:16
	← sborza left	05:16
	← spacemud left	05:16
	← ephemer0l left	05:16
	← sasheto left	05:16
	← bordeaux_facile left	05:16
	← naf left	05:16
	← QualityAddict left	05:16
	← eb0t left	05:16
	← Deflate left	05:16
	→ dustinm joined	05:16
	→ ephemer0l joined	05:16
	→ _xor joined	05:16
	→ Amadiro joined	05:16
	→ pR0Ps joined	05:16
	→ pztrick joined	05:16
	← marcje left	05:16
	sborza_ → sborza	05:16
	← dreiss left	05:16
	→ Deflate joined	05:16
	→ uptime joined	05:16
	→ pewpew joined	05:16
	→ heinrich5991 joined	05:16
	→ kozy joined	05:16
	← Ldip left	05:16
	→ synthmeat joined	05:16
	→ ravndal joined	05:16
	→ marcje joined	05:16
	→ teej joined	05:17
	→ sasheto joined	05:17
	← xaxxon left	05:17
	→ shalok joined	05:17
	→ QualityAddict joined	05:17
	→ eblip joined	05:17
	← tkore\ left	05:17
	→ whyme joined	05:17
	← Michael_ left	05:17
	→ nyuszika7h_ joined	05:17
	→ ribasushi joined	05:18
	→ ArcaTech joined	05:18
	because → i	05:20
	→ SCHAPiE joined	05:20
	← justache_ left	05:20
	→ justache joined	05:21
	← IanLiu left	05:21
	→ daurnimator joined	05:22
	→ rosco_y joined	05:25
	← fuzzmz left	05:26
rosco_y	When I try to push my local branch to github, I get a ! [rejected] error telling me to (fetch first). What does it mean by (fetch first)?	05:26
	→ xaxxon joined	05:27
	← rosco_y left	05:27
	← ahrs left	05:29
	→ fuzzmz joined	05:30
	→ dre_ joined	05:30
	→ ahrs joined	05:30
	← mattsll left	05:32
	→ dreiss joined	05:34
	← xaxxon left	05:35
	→ yohnnyjoe joined	05:36
	→ safe joined	05:37
	← justanotheruser left	05:37
	→ justanotheruser joined	05:37
	← IndianAr_ left	05:39
	→ IndianAr_ joined	05:39
	i → 32NABGP7F	05:39
	→ lhx joined	05:39
	→ thiago joined	05:39
	→ jrabe joined	05:39
	→ joeco joined	05:39
	→ salamanderrake joined	05:39
	→ nahtnam joined	05:39
	→ Rubin joined	05:39
	→ mud joined	05:39
	→ arooni joined	05:39
	→ bigjazzsound joined	05:39
	→ Arcaelyx joined	05:39
	→ wloncom joined	05:39
	→ kashike joined	05:39
	→ tcp_j joined	05:39
	→ r3c0d3x joined	05:39
	→ cschneid joined	05:39
	→ zifnab joined	05:39
	→ awygle joined	05:39
	→ kent\n joined	05:39
	→ prosody joined	05:39
	→ johnlage joined	05:39
	→ bartman joined	05:39
	→ duckydan joined	05:39
	→ alcohol joined	05:39
	→ Sleepy63 joined	05:39
	→ qqx joined	05:39
	→ jab416171 joined	05:39
	→ tcsc joined	05:39
	→ ghoti joined	05:39
	→ stux\|RC joined	05:39
	→ nellicus_ joined	05:39
	→ thinkpad joined	05:39
	→ Ranhir joined	05:39
	→ fuchstronaut joined	05:39
	→ swords joined	05:39
	→ ndim joined	05:39
	→ m1dnight_ joined	05:39
	→ Fissure joined	05:39
	→ monokrome joined	05:39
	→ NeXTSUN joined	05:39
	→ A\|TARIS joined	05:39
	→ SirCmpwn joined	05:39
	→ BooK joined	05:39
	→ opal joined	05:39
	→ infernix joined	05:39
	→ GameGamer43 joined	05:39
	→ hoek joined	05:39
	→ noahsussman joined	05:39
	→ jleclanche joined	05:39
	→ xxpor joined	05:39
	→ ablackack_ joined	05:39
	→ nydel09 joined	05:39
	→ leprechau joined	05:39
	→ nydel07 joined	05:39
	→ Hello71 joined	05:39
	→ milli joined	05:39
	→ Case_Of joined	05:39
	→ madknight joined	05:39
	→ tribly joined	05:39
	→ Kuukunen joined	05:39
	→ binary106 joined	05:39
	→ irqq joined	05:39
	→ SpeakerToMeat joined	05:39
	→ tango_ joined	05:39
	→ winny joined	05:39
	→ uebera\|\| joined	05:39
	→ gargola joined	05:39
	→ dwmw2_gone joined	05:39
	→ mrkake joined	05:39
	→ jason237 joined	05:39
	→ Furai joined	05:39
	→ Iroha joined	05:39
	→ beuker joined	05:39
	→ n1ax joined	05:39
	→ skered joined	05:39
	→ __main__ joined	05:39
	→ jimmyrcom joined	05:39
	→ wcpan joined	05:39
	→ perrier-jouet joined	05:39
	← Kuukunen left	05:40
	← stux\|RC left	05:40
	← A\|TARIS left	05:40
	← thinkpad left	05:40
	← madknight left	05:40
	← SpeakerToMeat left	05:40
	← Arcaelyx left	05:40
	← tcsc left	05:40
	← ghoti left	05:40
	← jrabe left	05:40
	→ jrabe` joined	05:40
	→ madknigh- joined	05:40
	→ stux\|RC-only joined	05:40
	→ ghoti joined	05:40
	→ Kuukunen joined	05:40
	→ tcsc joined	05:40
	→ SpeakerToMeat joined	05:40
	→ A\|TARIS joined	05:41
	→ Arcaelyx joined	05:41
	← felixsanz left	05:41
	jrabe` → jrabe	05:42
	← bwn left	05:42
	← Bercik left	05:42
	← martinklepsch left	05:45
	32NABGP7F → because	05:46
	→ Bercik joined	05:46
	→ felixsanz joined	05:46
	← yohnnyjoe left	05:46
	→ martinklepsch joined	05:47
	← martinklepsch left	05:48
	← jcarpenter2 left	05:49
	→ martinklepsch\|BN joined	05:49
	martinklepsch\|BN → martinklepsch	05:49
	→ jcarpenter2 joined	05:49
	→ bwn joined	05:49
	→ roygbiv joined	05:51
	← WakiMiko_ left	05:52
	→ WakiMiko_ joined	05:53
	← dreiss left	05:54
	← kba left	05:54
	→ kyan joined	05:57
	← jcarpenter2 left	05:59
	→ floatleft joined	05:59
	← martinklepsch left	05:59
	→ gopar joined	05:59
	→ jcarpenter2 joined	05:59
	→ kba joined	06:00
	→ martinklepsch joined	06:00
	← jcarpenter2 left	06:02
	← WakiMiko_ left	06:02
	→ kpease joined	06:03
	→ jcarpenter2 joined	06:03
	→ WakiMiko_ joined	06:03
	← kpease left	06:04
	→ kpease joined	06:04
	← jcarpenter2 left	06:05
	→ jcarpenter2 joined	06:05
	← kpease left	06:07
	→ Polylith joined	06:07
	→ LocaMocha joined	06:08
	← martinklepsch left	06:10
	→ martinklepsch joined	06:10
	→ nikio_ joined	06:11
	← ArcaTech left	06:13
	← martinklepsch left	06:13
	→ martinklepsch joined	06:13
	→ ozcanesen joined	06:15
	← grawity left	06:16
	→ martinklepsch\|BN joined	06:16
	← martinklepsch left	06:16
	→ grawity joined	06:16
	martinklepsch\|BN → martinklepsch	06:16
	→ KeyJoo joined	06:16
	← Zamerick left	06:28
	→ dreiss joined	06:29
	→ cdg joined	06:29
	← madewokherd left	06:29
	← gopar left	06:29
	← cdg left	06:33
	← bket left	06:33
	← energizer left	06:34
	→ sim590 joined	06:34
	← Atemu left	06:36
	→ Munt joined	06:38
	→ hiq[m] joined	06:38
	→ bket joined	06:39
	← boombatower left	06:39
	→ cverna joined	06:41
	← dpower left	06:41
	→ dpower joined	06:42
	→ milesmeow joined	06:42
	← sim590 left	06:43
	gitinfo set mode: +v	06:43
milesmeow	hello?	06:43
gitinfo	milesmeow: 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.	06:43
_ikke_	milesmeow: hi	06:44
	→ mrkgnao joined	06:46
	→ imack joined	06:47
	← ozcanesen left	06:47
	← Munt left	06:47
	→ abba joined	06:48
	← thiago left	06:48
	→ schultza joined	06:51
	→ astronavt joined	06:51
	← hahuang65 left	06:52
	← WakiMiko_ left	06:52
	→ WakiMiko_ joined	06:53
	← martinklepsch left	06:55
	→ ArcaTech joined	06:55
	→ shripadr joined	06:55
	→ martinklepsch joined	06:56
	→ hahuang65 joined	06:56
	← astronavt left	06:57
	→ astronavt joined	06:57
	← Murr left	06:57
	→ Murr joined	06:58
	← naf_ left	06:59
	→ naf joined	06:59
	← naf left	06:59
	→ naf joined	06:59
	← IndianAr_ left	07:00
	← martinklepsch left	07:00
	→ martinklepsch joined	07:02
	← martinklepsch left	07:03
	→ martinklepsch joined	07:04
	→ Anja_ joined	07:06
	← martinklepsch left	07:07
	→ martinklepsch joined	07:07
	← dreiss left	07:07
	← Cabanossi left	07:08
	← martinklepsch left	07:09
	→ Cabanossi joined	07:09
	← dsdeiz left	07:09
	→ dsdeiz joined	07:10
	← dsdeiz left	07:10
	→ dsdeiz joined	07:10
	→ martinklepsch joined	07:11
	→ energizer joined	07:13
	← ArcaTech left	07:14
	← Lyqyd left	07:15
	← sword left	07:16
	← martinklepsch left	07:17
	→ ArcaTech joined	07:17
	→ govg joined	07:18
	→ martinklepsch joined	07:18
	← martinklepsch left	07:23
	→ dreiss joined	07:23
	→ martinklepsch joined	07:24
	→ senaps joined	07:26
	→ nd_ joined	07:26
	← dreiss left	07:28
	← Raed\|Laptop left	07:28
	← nd left	07:29
	→ gaucheph[m] joined	07:29
	→ Xiti` joined	07:30
	→ Techie[m] joined	07:30
	← ArcaTech left	07:30
	← Xiti left	07:31
	→ cicada3307[m] joined	07:31
	→ mark_c joined	07:31
	→ reactormonk[m] joined	07:32
	← orbyt_ left	07:35
senaps	i have file, that get's generated dynamically. i have added it to git. you know what it has become! a group of 4 testing on it, deploying to multiple different server's, and we all are generating our own version of that file. now, i want to get it out of the git. but not removed on any of the systems.	07:39
	git ignore is the trick or what?	07:40
	→ cur8or joined	07:40
	→ manuelschneid3r joined	07:41
rewt	yes, remove it from the repo, and add it to everyone's .gitignore	07:42
	← dustinm left	07:42
	← uptime left	07:42
	← govg left	07:42
	→ __marco joined	07:43
	← __marco left	07:44
	→ yohnnyjoe joined	07:44
	→ __marco joined	07:44
	→ dustinm joined	07:44
	← rumflump left	07:44
	← joeco left	07:45
	→ govg joined	07:45
	→ uptime joined	07:45
_ikke_	But git will remove it from the working trees of the others when they merge this in, so they need to make sure they either keep a back-up or regenerate those files	07:45
	← snowkidind left	07:48
	→ re1 joined	07:48
	← yohnnyjoe left	07:48
	→ steeze joined	07:48
	← m0viefreak left	07:49
	→ IndianAr_ joined	07:49
	→ svm_invictvs joined	07:50
	→ g00s joined	07:51
senaps	_ikke_ okay, you just saved my career!! server's having this file have been maintained by hand(creating a copy of file, merge and paste the old copy to new thing) i wanted to change the thing that was working. thanks man.	07:52
mud	Git won't nuke a file that way that has changes that aren't in history anyway. In other words, it won't delete such a file unless it's easily possibly to drag out the exact same contents from history.	07:54
	→ heroux joined	07:57
	→ patrickr[m] joined	07:57
	→ pvn[m] joined	07:57
	→ dreiss joined	07:59
	← pewpew left	07:59
_ikke_	nod	08:00
	← grawity left	08:01
	→ grawity joined	08:01
	→ chaosruler joined	08:03
	→ narendraj9 joined	08:04
	← steeze left	08:05
	→ Xiti joined	08:06
	← dre_ left	08:07
	← Xiti` left	08:08
	← fahadash left	08:08
	← re1 left	08:08
	→ ixxie joined	08:08
	→ sea-gull joined	08:09
	→ mentalita joined	08:09
	→ rkta joined	08:12
	→ SteffanW joined	08:13
	← narendraj9 left	08:13
	← cur8or left	08:15
	→ cur8or joined	08:17
	← chaosruler left	08:18
	→ chaosruler joined	08:18
	← govg left	08:19
	← ixxie left	08:19
	← devbaka_ left	08:20
	→ rumflump joined	08:22
	← __marco left	08:22
	→ robotroll joined	08:22
	← chaosruler left	08:23
	→ chaosruler joined	08:23
	← nahtnam left	08:25
	← mrkgnao left	08:26
	← in1t3r_ left	08:28
	← mentalita left	08:30
	→ mentalita joined	08:30
	→ landau[m] joined	08:31
	→ CedaEI[m] joined	08:31
	← nowhere_man left	08:32
	→ Guest6289 joined	08:33
	← TinkerTyper left	08:33
milesmeow	ok	08:34
	← dsdeiz left	08:34
milesmeow	who else is burning the midnight oil?	08:34
	→ dsdeiz joined	08:35
	← mud left	08:35
_ikke_	milesmeow: it's in the morning here	08:35
	so, nope	08:35
	→ TinkerTyper joined	08:35
	→ nooooone joined	08:36
	→ SkyPatrol_ joined	08:37
	← rkta left	08:37
	← roygbiv left	08:38
	← schultza left	08:38
	← mda1 left	08:39
	← sarri left	08:40
	← dreiss left	08:42
	→ sarri joined	08:42
	← sarri left	08:42
	→ sarri joined	08:42
	→ rkta joined	08:44
	← menip left	08:45
	→ pewpew joined	08:47
	→ ozcanesen joined	08:47
	→ narendraj9 joined	08:47
	→ Repox joined	08:50
	→ pijiu joined	08:50
	← milesmeow left	08:55
	← manuelschneid3r left	08:55
	← Murr left	08:57
	→ Murr joined	08:58
	← AmR\|EiSa left	08:59
	← hurricanehrndz left	09:00
	→ hurricanehrndz joined	09:00
	→ re1 joined	09:00
	← g00s left	09:00
	← cverna left	09:01
	← hiq[m] left	09:01
	← pvn[m] left	09:01
	← cicada3307[m] left	09:01
	← reactormonk[m] left	09:01
	← gaucheph[m] left	09:01
	← CedaEI[m] left	09:01
	← landau[m] left	09:01
	← patrickr[m] left	09:01
	← mark_c left	09:01
	← Guest6289 left	09:01
	← Techie[m] left	09:01
	→ aidalgol joined	09:04
	→ lufeng_ joined	09:05
	→ minionofgozer joined	09:06
	→ clickjack joined	09:06
	→ Es0teric_ joined	09:08
	→ Munt joined	09:10
	← IndianAr_ left	09:10
	← rumflump left	09:12
	→ ShalokShalom joined	09:14
	→ schleppel joined	09:14
	→ rumflump joined	09:14
	← ShalokShalom left	09:14
	← aidalgol left	09:15
	→ spacemud joined	09:17
	← whyme left	09:18
	← svm_invictvs left	09:19
	← clickjack left	09:21
	→ whyme joined	09:22
	→ hanetzer joined	09:22
hanetzer	ok, here's a question: got an asshole vendor, they forked lede-project and ported their device to it, but they did it on the master branch and not a feature branch or anything of the like. what's the 'cleanest' way to import their changes back into upstream?	09:23
	→ landau[m] joined	09:23
	← senaps left	09:26
	← robotroll left	09:27
	→ ok91 joined	09:28
	→ cqi joined	09:29
	← tombusby left	09:29
	← astronavt left	09:29
	→ overlord_tm joined	09:30
	→ tombusby joined	09:31
	← upperdeck left	09:32
	→ blackmesa1 joined	09:36
	← sea-gull left	09:36
	→ upperdeck joined	09:37
	← Es0teric_ left	09:38
	→ yohnnyjoe joined	09:44
	→ leeN joined	09:44
	→ crtcji joined	09:45
	→ Xrayez joined	09:45
	→ MACscr joined	09:45
	→ maroloccio joined	09:47
	→ jnavila joined	09:48
	← Repox left	09:48
	← yohnnyjoe left	09:48
	→ clickjack joined	09:53
	← rumflump left	09:53
	→ rumflump joined	09:54
	→ sz0 joined	09:55
	→ surfist joined	09:56
	→ robotroll joined	09:59
	→ pirocks joined	09:59
	← chaosruler left	10:00
	← jnavila left	10:02
	→ jnavila joined	10:02
	→ DvdKhl joined	10:04
	→ reactormonk[m] joined	10:07
	→ olbat[m] joined	10:07
	→ patrickr[m] joined	10:07
	→ moonrunes[m] joined	10:07
	→ autrilla joined	10:07
	→ equalunique[m] joined	10:07
	→ primeos[m] joined	10:07
	→ flo[m] joined	10:07
	→ dikiaap joined	10:07
	→ nappy[m] joined	10:07
	→ UncleCJ joined	10:07
	→ cverna joined	10:07
	→ aspiers[m] joined	10:07
	→ abithvijayan[m] joined	10:07
	→ thepilot[m] joined	10:07
	→ apurvapavaskar[m joined	10:07
	→ hiq[m] joined	10:07
	→ dyce[m] joined	10:07
	→ enick_443 joined	10:07
	→ spinningarrow[m] joined	10:07
	→ unclechu joined	10:07
	→ Miguelngel[m] joined	10:07
	→ waltervargas[m] joined	10:07
	→ pvn[m] joined	10:07
	→ torarne joined	10:07
	→ Techie[m] joined	10:07
	→ aidalgol joined	10:07
	→ Demos[m] joined	10:07
	→ dreadful[m] joined	10:07
	→ horpoppy[m] joined	10:07
	→ yanbbyan joined	10:07
	→ MeTheFlea joined	10:07
	→ c0ff33[m] joined	10:07
	→ aviraldg joined	10:07
	→ Remramm joined	10:07
	→ cicada3307[m] joined	10:07
	→ KevinMGranger joined	10:07
	→ mark_c joined	10:07
	→ enick_907 joined	10:07
	→ sphalerite joined	10:07
	→ am2on joined	10:07
	→ ushaNg6i[m] joined	10:07
	← blackmesa1 left	10:07
	→ acme[m] joined	10:07
	→ CedaEI[m] joined	10:07
	→ gaucheph[m] joined	10:07
	→ colonelkrud[m] joined	10:07
	→ nsc[m] joined	10:07
	← Cabanossi left	10:08
	→ Ratler joined	10:08
	← Ratler left	10:08
	→ Ratler joined	10:08
	← clickjack left	10:08
	→ Cabanossi joined	10:08
	← floatleft left	10:10
	→ clickjack joined	10:13
	→ de-vri-es joined	10:14
	← energizer left	10:16
	← ozcanesen left	10:17
	← robotroll left	10:18
	← rkta left	10:18
	← clickjack left	10:19
	← tombusby left	10:19
	→ tombusby joined	10:19
	→ clickjack joined	10:21
	→ db8093246 joined	10:22
	← cybrNaut- left	10:24
	→ __marco joined	10:26
	→ cybrNaut joined	10:26
	← cybrNaut left	10:26
	→ cybrNaut joined	10:26
	→ cdg joined	10:28
	→ manuelschneid3r joined	10:31
	→ PioneerAxon joined	10:32
	← PioneerAxon left	10:32
	← cdg left	10:33
	→ roygbiv joined	10:34
	← safe left	10:40
	← NeverTired left	10:41
_ikke_	hanetzer: hi	10:42
hanetzer	_ikke_: hello o/	10:42
	→ King_Hual joined	10:43
_ikke_	hanetzer: Did they just do their own changes on master, or did they also merge in upstream changes	10:44
hanetzer	nope, they're like 2k changes or more behind master	10:45
_ikke_	hanetzer: so basically, their master branch is just a feature branch?	10:45
hanetzer	_ikke_: yep. and uggo	10:45
_ikke_	uggo?	10:45
hanetzer	slang for ugly	10:46
_ikke_	ah ok	10:46
	yeah, so that is going to be the biggest challenge	10:46
	getting it into a shape that it's acceptable for upstream	10:46
hanetzer	and I'm workin' blind :P	10:46
_ikke_	You can try extracting useful features from their code and submet those one-by-one	10:47
	← wouter0100 left	10:47
_ikke_	submit*	10:47
hanetzer	I'm prolly gonna have to buy one. its a nifty little device and fairly cheap too	10:47
selckin	for that amount of work they better give you one	10:47
_ikke_	selckin: I think they don't expec them to work in it	10:48
hanetzer	lol. I doubt they're that cooperative. chinese company and I'm just a geek with no creds	10:48
	→ wouter0100 joined	10:48
	← jayjo left	10:48
_ikke_	Do you even have the specifications for their hardware?	10:49
	Or is the code all you have?	10:49
hanetzer	source code and a half-port on lede. the device can boot from spi nor or nand :P	10:50
	on lede the spi nor is supported	10:50
	→ theoceaniscool joined	10:51
	→ Darcidride joined	10:51
	← shripadr left	10:51
hanetzer	I just like to tinker :P	10:52
	→ Repox joined	10:53
_ikke_	hanetzer: I would first discuss with upstream if it's even worth the trouble	10:54
hanetzer	I dev for the upstream a bit	10:55
	← Darcidride left	10:55
	← Murr left	10:57
	→ Murr joined	10:57
	← heroux left	11:01
	→ heroux joined	11:01
	→ TomyLobo joined	11:02
	← theoceaniscool left	11:02
	← Repox left	11:04
	← cdown left	11:04
	← swalladge left	11:04
	→ cdown joined	11:04
	→ Raging_Hog joined	11:04
	→ ocds joined	11:05
	← hfp_work left	11:06
	→ cdown_ joined	11:06
	← Cabanossi left	11:07
	→ jceb joined	11:08
	← __marco left	11:08
	→ Cabanossi joined	11:08
	← cdown left	11:09
	cdown_ → cdown	11:09
	→ Darcidride joined	11:10
	→ hfp_work joined	11:12
	← Raging_Hog left	11:16
	→ cur8or_ joined	11:19
	← cur8or left	11:19
	← Munt left	11:19
	→ jost joined	11:19
	→ converge joined	11:24
	← naf left	11:25
	→ robotroll joined	11:25
	→ naf joined	11:25
	← Puffball left	11:25
	→ IndianAr_ joined	11:26
	← robotroll left	11:28
	→ Puffball joined	11:28
	→ dre_ joined	11:29
	← a3Dman left	11:33
	→ cdg joined	11:34
	→ Mike11 joined	11:36
	→ Munt joined	11:36
	→ a3Dman joined	11:37
	→ Acerific joined	11:38
	← Acerific left	11:38
	→ Acerific joined	11:38
	← rumflump left	11:39
	← cdg left	11:41
	→ Cassiopaya joined	11:41
	→ Nizumzen joined	11:45
	→ yohnnyjoe joined	11:45
	→ xaa joined	11:48
	→ Tobbi joined	11:48
j416	why've we no GUARD flag on this channel	11:48
	→ rumflump joined	11:48
j416	I noticed on another channel I admin it seems to have gone away	11:49
selckin	no what	11:49
j416	GUARD is a flag that controls whether or not ChanServ guards the channel	11:49
	← yohnnyjoe left	11:49
_ikke_	j416: why is it necessary?	11:49
	It just prevents the channel from losing flags when it empties	11:49
j416	yeah, perhaps not necessary in this case	11:49
	but in case of some network restart, split, I don't know what could happen ¯\_(ツ)_/¯	11:50
_ikke_	j416: Isn't it possible for chanserv to be gone too then?	11:50
selckin	not much bad can happen on freenode	11:50
j416	I'm no expert, but I would think ChanServ is pretty quick to join nonetheless and might not be affected (as much?) by a split or the like	11:51
	anyway, just happened to notice it.	11:51
_ikke_	j416: But then the perceived damage is already done	11:51
	j416: It just makes chanserv join this channel	11:51
	j416: we have gitinfo in this channel :P	11:51
j416	which is on jast's computer under his bed? :P	11:52
_ikke_	something like that	11:52
j416	:D	11:52
_ikke_	Nah, he has it hosted somewhere	11:52
j416	cool.	11:52
	_ikke_ set mode: -o	11:53
_ikke_	This channel is more then 11 years old so it seems	11:54
j416	12, even!	11:54
_ikke_	2006, right?	11:54
	"Channel created on Sun, 26 Nov 2006 07:42:45"	11:55
	← Acerific left	11:55
_ikke_	Ah, chanserv says it was registed in 2005	11:55
	"Registered : Apr 10 14:01:12 2005 (12y 35w 0d ago)"	11:56
	← rumflump left	11:57
j416	I think the Channel created part is when the channel was spawned on the server, so to speak	11:57
	← cdown left	11:57
	← maroloccio left	11:57
j416	I've a channel I registered a couple of years back, and it says created two days ago -- assumingly because that was the last time it was empty	11:58
_ikke_	right, but I know other channels which probably have been empty more often, but still have a register date in 2010	11:58
	← upperdeck left	12:02
	→ blackmesa1 joined	12:03
	→ tmm88 joined	12:03
	→ cdown joined	12:04
	→ upperdeck joined	12:06
	← Mike11 left	12:08
	← upperdeck left	12:08
	← SteffanW left	12:09
	nyuszika7h_ → nyuszika7h	12:10
	← tmm88 left	12:11
	→ tmm88_ joined	12:12
	← mentalita left	12:13
	→ mentalita joined	12:13
	→ upperdeck joined	12:13
	→ mikecmpbll joined	12:14
	← Tobbi left	12:15
j416	I'm referring to creation date, not registration..	12:17
	→ __marco joined	12:17
	← czart_ left	12:18
	← imack left	12:18
_ikke_	sorry, me too	12:18
j416	ah.	12:20
	odd then. Perhaps there is something else controlling the creation date, then.	12:20
	← mentalita left	12:20
	→ mentalita joined	12:21
	← jceb left	12:21
	→ tmm88 joined	12:25
	← tmm88 left	12:25
	→ tmm88 joined	12:25
	← tmm88_ left	12:25
	→ devbaka joined	12:26
	← tmm88 left	12:30
	← mentalita left	12:33
	→ mentalita joined	12:33
	← __marco left	12:39
	← dsdeiz left	12:39
	→ dsdeiz joined	12:39
	← dsdeiz left	12:39
	→ dsdeiz joined	12:39
	← ghost43 left	12:40
	→ ghost43 joined	12:40
	← cqi left	12:41
	→ __marco joined	12:42
	→ maroloccio joined	12:42
	← cdown left	12:43
	→ cdown joined	12:44
	← upperdeck left	12:45
	→ Claw_wolf joined	12:46
	→ m0viefreak joined	12:46
	→ nowhere_man joined	12:49
	← blackmesa1 left	12:49
	→ upperdeck joined	12:50
	→ polydo_s joined	12:50
	→ linuxmodder joined	12:55
	← linuxmodder left	12:56
	→ linuxmodder joined	12:56
	← linuxmodder left	12:56
	→ linuxmodder joined	12:56
	← doug16k left	12:57
	← Murr left	12:57
	→ Murr joined	12:57
	← linuxmodder left	12:58
	→ doug16k joined	12:58
	→ linuxmodder joined	12:58
	← linuxmodder left	12:58
	→ linuxmodder joined	12:58
	← heroux left	12:59
	← linuxmodder left	12:59
	← DvdKhl left	12:59
	→ linuxmodder joined	12:59
	← linuxmodder left	12:59
	→ linuxmodder joined	12:59
	← m0viefreak left	13:01
	← linuxmodder left	13:01
	→ linuxmodder joined	13:01
	→ masuberu joined	13:01
	← linuxmodder left	13:02
	← polydo_s left	13:02
	→ linuxmodder joined	13:02
	← linuxmodder left	13:04
	→ m0viefreak joined	13:05
	← dre_ left	13:06
	← peepsalot left	13:07
	← Cabanossi left	13:07
	→ Cabanossi joined	13:09
	→ aw1 joined	13:09
	→ polydo_s joined	13:09
	→ blackmesa1 joined	13:12
	← polydo_s left	13:14
	→ PioneerAxon joined	13:15
	→ rumflump joined	13:17
	← gxt left	13:22
	← Munt left	13:22
	→ frederfred joined	13:22
	→ gxt joined	13:24
	→ polydo_s joined	13:24
	→ pgimeno joined	13:28
	← polydo_s left	13:28
	← aw1 left	13:28
	← cdown left	13:28
	→ cdown joined	13:28
pgimeno	I've gotten myself into a situation that I can't get out of without creating new commits. I'd appreciate some help. I've created a simplified test case here: http://www.formauri.es/personal/pgimeno/pastes/create-testcase.sh	13:30
	Now I want to amend the commit which added the .gitattributes file. But when I use git rebase --interactive HEAD~2, git always tells me that the testfile.txt file is modified and I can't get the rebase to progress.	13:32
	← narendraj9 left	13:34
pgimeno	'git stash' doesn't help. 'git co testfile.txt' doesn't help. 'git co master testfile.txt' doesn't help.	13:34
_ikke_	pgimeno: Do you try to fix line ending issues?	13:35
pgimeno	_ikke_: yes, obviously it has to do with line endings	13:35
	→ Gustavo6046 joined	13:36
pgimeno	my problem is that I've found no way to tell git that the file is not modified at that point	13:36
	or even to ignore the modifications	13:37
_ikke_	pgimeno: You have to normalize the files first before you turn on line ending normalization	13:37
pgimeno	_ikke_: so you're suggesting to invert the order of the commits, right?	13:38
_ikke_	yes	13:39
pgimeno	problem is, git reset --cached -r . does it for me automatically if I have changed .gitattributes first	13:39
	so I'm in a chicken-and-egg problem	13:39
_ikke_	pgimeno: It's better to make it a single commit	13:40
pgimeno	_ikke_: problem is that it makes the review of .gitattributes more difficult	13:40
	(once I send it as a PR)	13:41
	← blackmesa1 left	13:41
_ikke_	Switching on line ending normalization before the files are normalized will get you a lot of issues (like you experienced)	13:42
pgimeno	is there no way to get out of there?	13:42
	besides repeating the process with the right changes, of course	13:43
_ikke_	temporarily disable the normalization	13:43
pgimeno	then what?	13:44
	← ocds left	13:46
pgimeno	ah, never mind... changing the files to binary lets me proceed	13:46
	← pirocks left	13:46
pgimeno	thanks	13:46
	→ yohnnyjoe joined	13:46
_ikke_	which is the same as disabling normalization	13:46
	→ tmm88 joined	13:46
pgimeno	yeah, I think I tried eol=crlf but that didn't help, however binary did	13:48
	→ blackmesa1 joined	13:54
	→ heroux joined	13:54
	← m0viefreak left	13:57
	→ Mike11 joined	13:58
	→ bertschneider joined	13:58
	← PioneerAxon left	13:59
	→ polydo_s joined	14:00
	→ Munt joined	14:02
	→ kasual joined	14:02
	← tmm88 left	14:05
	→ darktemprary joined	14:05
	→ tmm88 joined	14:07
	← tmm88 left	14:07
	→ tmm88 joined	14:07
	← cdown left	14:08
	→ cdown joined	14:09
	→ pirocks joined	14:09
	→ cdown_ joined	14:11
	→ mborgard joined	14:13
	← xaa left	14:13
	← cdown left	14:13
	cdown_ → cdown	14:13
	← BUSY left	14:16
	← darktemprary left	14:17
	→ Acerific joined	14:17
	← blackmesa1 left	14:18
	→ dave0x6d joined	14:19
	← polydo_s left	14:20
	← stduolc2 left	14:22
	← Acerific left	14:24
	→ stduolc2 joined	14:29
	→ hujuiko joined	14:29
	→ Zamerick joined	14:32
	← nooooone left	14:36
	← IndianAr_ left	14:38
	← mborgard left	14:38
	← lufeng_ left	14:43
	→ lufeng_ joined	14:43
	← lufeng_ left	14:43
	→ lufeng_ joined	14:44
	← MACscr left	14:45
	← lufeng_ left	14:45
	→ tunekey joined	14:45
	→ lufeng_ joined	14:45
	→ rosco_y joined	14:46
	→ Amanas joined	14:47
	← stduolc2 left	14:48
	→ banisterfiend joined	14:48
	→ darktemprary joined	14:48
	→ koolkalang joined	14:49
	← masuberu left	14:51
	→ swalladge joined	14:51
koolkalang	hi all, I've got an alias question	14:52
	I have this in bashrc	14:52
	alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'	14:52
	it works for the most part	14:52
	except when I do 'config add .', then when I press enter it doesn't take it seems like	14:52
	→ ocds joined	14:53
	→ stduolc2 joined	14:57
	← Murr left	14:57
	→ masuberu joined	14:57
	→ Murr joined	14:58
	← gusnan left	14:58
	← banisterfiend left	14:59
	← frederfred left	14:59
	→ gusnan joined	15:00
	← darktemprary left	15:00
	← pgimeno left	15:02
	← rosco_y left	15:02
	→ Es0teric_ joined	15:03
	← shinnya left	15:07
	← lufeng_ left	15:08
	→ lufeng_ joined	15:08
_ikke_	koolkalang: what happens instead?	15:08
	← jnavila left	15:08
	← lufeng_ left	15:09
	← Mike11 left	15:09
	→ lufeng_ joined	15:09
	← lufeng_ left	15:10
	→ lufeng_ joined	15:10
	← lufeng_ left	15:11
	→ lufeng_ joined	15:11
	← Es0teric_ left	15:11
	→ VoradorPT joined	15:13
	← fk left	15:13
	→ Mike11 joined	15:15
	← Derperpe- left	15:16
koolkalang	_ikke_ it seems like it hangs	15:16
	because it doesn't give me a >	15:16
	at the end	15:16
	→ Derperperd joined	15:16
koolkalang	so maybe it's processing the entire folder rather than just what's in git status	15:16
	?	15:17
	← scarcry left	15:17
koolkalang	I guess this stems from me not understanding git add fully	15:17
_ikke_	Git add is fairly simple	15:17
	← Derperperd left	15:18
	→ Derperperd joined	15:18
	→ czart joined	15:18
koolkalang	but when I do git add .	15:18
	it shouldn't go through everything I put in .gitignore right?	15:19
_ikke_	I think so	15:19
koolkalang	I just don't know what would take so long, since I only have like 4 files tracked in that repo lol	15:21
	← __marco left	15:21
koolkalang	*7 actually	15:22
	→ jeffreylevesque joined	15:22
_ikke_	Not sure if it actually helps, but could you try GIT_TRACE=1 config add .	15:22
	→ rosco_y joined	15:23
	→ imack joined	15:23
viric	The other day I solved for long merge conflicts... and before commit, I did "git checkout -b mynewbranch"	15:24
	no complaint - but the commit didn't merge anything. grmbl	15:24
	git forgot that it was merging	15:24
	← felixsanz left	15:25
_ikke_	so MERGE_HEAD got lost	15:25
	→ felixsanz joined	15:26
	→ banisterfiend joined	15:26
viric	that may be a more technical way of saying that	15:27
	→ Raed\|Laptop joined	15:32
	→ wootehfoot joined	15:32
	→ fk joined	15:32
	← vamiry left	15:32
cbreak	viric: why did you abandon the merge? You forgot that you were merging?	15:33
	→ scarcry joined	15:33
	← kasual left	15:35
	← rosco_y left	15:36
	← masuberu left	15:38
	← [Kid] left	15:42
	→ madewokherd joined	15:43
	→ DolpheenDream joined	15:46
	← askb_ left	15:50
	← Raed\|Laptop left	15:51
	→ chaosruler joined	15:51
	← jost left	15:52
	← converge left	15:54
	← rumflump left	15:59
	→ iNCoNFuN joined	16:00
	← DolpheenDream left	16:05
	← Barrt left	16:07
	← Cabanossi left	16:07
	← banisterfiend left	16:08
	→ Cabanossi joined	16:08
	← Claw_wolf left	16:12
	→ Lyqyd joined	16:14
	→ blackmesa1 joined	16:17
	← tmm88 left	16:18
	→ livingstn joined	16:19
	→ Barrt joined	16:20
	→ astronavt joined	16:21
	← upperdeck left	16:22
	→ Tobbi joined	16:23
	← lufeng_ left	16:24
	← crtcji left	16:25
	← koolkalang left	16:26
	→ upperdeck joined	16:26
	→ NeverTired joined	16:28
	← nowhere_man left	16:28
	→ nowhere_man joined	16:28
	← peeps left	16:29
	← iNCoNFuN left	16:30
	← salamanderrake left	16:31
	← surfist left	16:33
	→ rosco_y joined	16:33
	→ salamanderrake joined	16:34
	→ surfist joined	16:34
	→ dumbstruck joined	16:34
	← Lyqyd left	16:35
	→ peeps joined	16:36
	← yohnnyjoe left	16:37
	← rosco_y left	16:40
	→ rumflump joined	16:41
	→ Noldorin joined	16:42
	→ floatleft joined	16:48
	← duderonomy left	16:49
	→ joeyy joined	16:51
	→ snowkidind joined	16:51
	← konsolebox left	16:55
	→ linuxmodder joined	16:56
	← linuxmodder left	16:56
	→ linuxmodder joined	16:56
	← linuxmodder left	16:57
	← Murr left	16:57
	← manuelschneid3r left	16:57
	→ linuxmodder joined	16:58
	← linuxmodder left	16:58
	→ linuxmodder joined	16:58
	→ Murr joined	16:58
	← peeps left	16:58
	← linuxmodder left	16:58
	→ konsolebox joined	17:00
	→ mud joined	17:00
	← Mike11 left	17:01
	→ yohnnyjoe joined	17:03
	→ peeps joined	17:05
	→ jceb joined	17:06
	← maroloccio left	17:07
	→ DolpheenDream joined	17:07
	→ converge joined	17:07
	→ duderonomy joined	17:11
	← imack left	17:13
	← dvl left	17:13
	← ocds left	17:13
	← finalbeta left	17:13
	→ finalbeta joined	17:13
	← brainproxy left	17:14
	→ dvl joined	17:15
	← dvl left	17:15
	→ dvl joined	17:15
	← re1 left	17:16
	→ manuelschneid3r joined	17:19
	← kyan left	17:22
	← Munt left	17:23
	→ basiclaser joined	17:23
	→ jstein_ joined	17:24
	jstein_ → jstein	17:25
	→ jnavila joined	17:26
	→ thiago joined	17:27
	→ pyfoo joined	17:27
	→ opalepatrick joined	17:29
	← ok91 left	17:29
	→ svm_invictvs joined	17:29
	← MeTheFlea left	17:31
	→ paul424 joined	17:35
	→ linuxmodder joined	17:35
	→ g00s joined	17:35
	→ unreal joined	17:36
	→ akushner joined	17:36
	← devbaka left	17:38
	← livingstn left	17:39
	← upperdeck left	17:42
	→ livingstn joined	17:43
	→ rosco_y joined	17:45
	← pyfoo left	17:46
	→ upperdeck joined	17:47
rosco_y	I generated an ssh key on my unix pc. On my Windows pc, do I generate another ssh key and add that to my github account, or do I reuse the key I generated in unix?	17:47
grawity	either works, although I have one key per machine	17:48
rosco_y	Does github support mulitple ssh keys?	17:48
grawity	yes	17:48
	← manuelschneid3r left	17:51
	← rosco_y left	17:52
	← ZyX-I left	17:52
	→ cagomez joined	17:55
g00s	i am doing an interactive rebase, and am not on a commit i marked as "edit" ... but when i use 'git status' i don't get the usual list of things that have changed, only a message about the fact that i am current rebasing. how do i get the changes in this commit ?	17:55
	*am now	17:55
	→ theoceaniscool joined	17:55
_ikke_	g00s: the commit has already been applied	17:55
	you can either amend the commit, or use git reset HEAD~ to undo the commit but leave the changes	17:56
g00s	_ikke_ ok thanks	17:56
	→ pyfoo joined	17:56
	← luckman212 left	17:57
	← cagomez left	17:58
	→ cagomez joined	17:59
	← cagomez left	18:01
	← theoceaniscool left	18:02
	← nikio_ left	18:02
	→ luckman212 joined	18:04
	→ manuelschneid3r joined	18:05
	→ dreiss joined	18:05
	→ wilbert joined	18:07
	← dreiss left	18:10
	→ Repox joined	18:10
	← svm_invictvs left	18:10
	→ brainproxy joined	18:11
	→ tnecniv joined	18:11
	→ dege joined	18:12
	← wilbert left	18:13
	← tnecniv left	18:13
	→ BUSY joined	18:14
	← pyfoo left	18:15
	→ devbaka joined	18:17
	→ pyfoo joined	18:17
	→ energizer joined	18:19
	→ dviola joined	18:19
	← Xiti left	18:19
	→ rkta joined	18:20
	← Cabanossi left	18:22
	→ Xiti joined	18:22
	→ Cabanossi joined	18:23
	→ dreiss joined	18:25
	→ JoshuaD joined	18:30
	→ agowa338 joined	18:31
JoshuaD	Hey all. I have a local clone of a project on github. I have some changes in a separate branch that I would like to make a pull request for. I don't have write access at the original repository. My understanding is I need to issue the pull request from a fork, but I already cloned and made my edits from the clone. How can I get from where I am to a fork, so I can issue a pull request?	18:32
grawity	git remote add myfork https://github.com/…	18:33
	after clicking the "Fork" button, add the new repo as a remote, and push your new branch to it	18:33
	← livingstn left	18:37
	← blackmesa1 left	18:38
	→ ZyX-I joined	18:39
JoshuaD	@grawity, sweet thanks let me try that	18:42
	@grawity, That did it. Thanks. :)	18:45
	→ longjonsnow joined	18:45
	← KeyJoo left	18:46
	← longjonsnow left	18:47
	→ KeyJoo joined	18:47
	← paul424 left	18:48
	← manuelschneid3r left	18:49
	← ktwo left	18:51
	→ sim590 joined	18:52
	→ serveur joined	18:53
	← cur8or_ left	18:55
	→ cur8or joined	18:55
	← Gustavo6046 left	18:57
	← Murr left	18:57
	→ Murr joined	18:58
	→ Mike11 joined	18:58
	→ keyjoo_ joined	18:58
	← KeyJoo left	18:59
	→ orbyt_ joined	18:59
	← Xiti left	19:00
	→ blackmesa1 joined	19:00
	→ Mike111 joined	19:00
	← Mike111 left	19:01
	← Mike11 left	19:03
	→ manuelschneid3r joined	19:05
	← bertschneider left	19:08
	← nowhere_man left	19:10
	← M6HZ_ left	19:11
	← rkta left	19:12
	← armyriad left	19:12
	← M6HZ left	19:13
	→ DistantStar_ joined	19:14
	→ nowhere_man joined	19:14
	→ DistantStar joined	19:15
	→ ocds joined	19:15
	← floatleft left	19:16
	→ armyriad joined	19:17
	→ livingstn joined	19:18
	← upperdeck left	19:19
	← DolpheenDream left	19:22
	→ paul424 joined	19:24
	→ upperdeck joined	19:24
	→ cdg joined	19:24
	→ Gustavo6046 joined	19:31
g00s	in my global gitignore, i have .idea/ ... but for some reason that file is still being tracked. the global gitconfig has core.excludesfile = file with .idea/ ... so i think the project's .gitignore is overriding this somehow. how can i make my global rule take precedence ?	19:32
	(i do not control the projects .gitignore)	19:32
_ikke_	!ignore_untracked	19:32
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.	19:32
g00s	thanks again _ikke_	19:33
	→ gogoirc joined	19:33
_ikke_	:-)	19:33
	← hujuiko left	19:34
	→ linuxmodder- joined	19:35
fxrs_	does reflog keep track of add and reset? is there a history to undo an 'git reset --patch'?	19:35
_ikke_	fxrs_: it keeps track of refs	19:36
	← linuxmodder- left	19:36
_ikke_	so anything that is comitted	19:36
	→ linuxmodder- joined	19:36
	← linuxmodder- left	19:36
	→ linuxmodder- joined	19:36
_ikke_	git reset -p just unstages things	19:37
	← linuxmodder- left	19:37
	← linuxmodder left	19:37
	→ linuxmodder- joined	19:38
	← linuxmodder- left	19:38
	→ linuxmodder- joined	19:38
	← linuxmodder- left	19:39
fxrs_	i also see checkout, pull and reset in the reflog though, not just commit.	19:39
	← Tobbi left	19:39
	→ linuxmodder- joined	19:39
	← linuxmodder- left	19:39
	→ linuxmodder- joined	19:39
fxrs_	hm, testing diff to HEAD@{#}. maybe ill find something there..	19:40
	← linuxmodder- left	19:40
	← Amanas left	19:40
	← Gustavo6046 left	19:40
	→ linuxmodder- joined	19:40
	← linuxmodder- left	19:40
	→ linuxmodder- joined	19:40
	← rafalcpp left	19:41
	← cdown left	19:43
	← Repox left	19:45
	← linuxmodder- left	19:46
fxrs_	ok, i think i get it, thanks _ikke_.	19:47
	after all reset to a commit makes sense to be there (back to ref), but previous state (uncommited stage) is gone.	19:47
	→ cdown joined	19:48
	→ linuxmodder- joined	19:48
	← linuxmodder- left	19:48
	→ linuxmodder- joined	19:48
	← linuxmodder- left	19:50
	→ linuxmodder- joined	19:50
	← livingstn left	19:50
	← linuxmodder- left	19:51
	→ linuxmodder- joined	19:51
	← linuxmodder- left	19:51
	→ linuxmodder- joined	19:51
	→ robotroll joined	19:52
	← linuxmodder- left	19:52
	→ rokshis joined	19:53
	→ linuxmodder- joined	19:53
	← linuxmodder- left	19:53
	→ linuxmodder- joined	19:53
	← chaosruler left	19:53
	→ netlar joined	19:53
	→ chaosruler joined	19:53
rokshis	Guys, kinda a dumb question, but where can I check repositories commit statistics? I mean, I want to see graphical statistics on github.com website? I know that I have found those before somewhere but I can't find them now	19:54
	→ Hao_819 joined	19:54
	← linuxmodder- left	19:54
rokshis	for example, https://github.com/bitcoin/bitcoin I want to see all developers and who did the most commits graphical stats.	19:54
grawity	they're somewhere under Insights now	19:54
	→ livingstn joined	19:54
rokshis	grawity: i have looked there, but it doesn't let me choose the timeframe and doesnt show the developers.	19:55
	oh damn	19:55
grawity	I clicked "Contributors" on the left-hand menu and—	19:55
rokshis	grawity: yeah..	19:55
	And was looking for it for like 15 minutes.	19:56
	damn	19:56
	← fatalhalt_ left	19:56
rokshis	grawity: thank you	19:56
	← serveur left	19:56
	← thebishop left	19:56
	← Hao_819 left	19:58
Eugene	rokshis - there's lots of cool tools availble if you google"git statistics generator". https://github.com/IonicaBizau/git-stats looks nifty.	19:59
	I find Github's changes and statistics to be less than stellar	20:00
	→ fstd_ joined	20:00
	→ peepsalot joined	20:01
	← livingstn left	20:01
	→ Xiti joined	20:02
	→ Gurkenglas joined	20:02
	→ Tobbi joined	20:03
	← fstd left	20:03
	fstd_ → fstd	20:03
	← surfist left	20:07
	← skered left	20:09
	← sz0 left	20:10
	← mentalita left	20:11
	→ mentalita joined	20:11
	← ZyX-I left	20:11
	→ skered joined	20:11
	← peepsalot left	20:12
	→ peepsalot joined	20:13
	← cdown left	20:13
	→ nadley joined	20:14
	→ nikio_ joined	20:14
	→ dre_ joined	20:17
	→ ArcaTech joined	20:18
	→ surfist joined	20:20
	→ ShapeShifter499 joined	20:21
	← Cabanossi left	20:21
	→ jesst joined	20:22
	← converge left	20:23
	→ Cabanossi joined	20:24
	← jesst left	20:24
	→ bergice_ joined	20:25
	→ Gustavo6046 joined	20:25
	← Cabanossi left	20:25
	→ jesst joined	20:25
	← heroux left	20:26
	→ Cabanossi joined	20:26
	← ShapeShifter499 left	20:28
	→ ShapeShifter499 joined	20:29
	← ShapeShifter499 left	20:29
	→ xaa joined	20:30
	→ fatalhalt joined	20:31
	→ ShapeShifter499 joined	20:31
	← Darcidride left	20:33
	← agowa338 left	20:34
	→ maxlino joined	20:34
	← maxlino left	20:34
	→ IanLiu joined	20:36
	→ jesst_ joined	20:37
	← xtheosirian left	20:37
	← manuelschneid3r left	20:38
	→ heroux joined	20:38
	→ rory joined	20:38
	← jesst left	20:39
rory	Usually I start a new repository with an empty commit for various well-documented reasons. However, this time I didn't; my first commit contains a bunch of code. It it possible to somehow rebase the entire thing onto an empty commit? I only have 1 branch.	20:39
	← robotroll left	20:39
	← ArcaTech left	20:40
	→ xtheosirian joined	20:40
	→ aax joined	20:40
	→ floatleft joined	20:41
	→ kasual joined	20:41
	→ ZyX-I joined	20:42
	← jesst_ left	20:43
_ikke_	rory: untested but something like git checkout --orphan tmp; git rm --cached \*; git commit --alow-empty; git rebase <rootcommit> --onto tmp;	20:44
selckin	usualy find it easier to just start over rm -rf .git; git init; git remote add origin, probably still in your shell history etc :)	20:44
	← xaa left	20:44
	← atrus left	20:45
	← brainproxy left	20:46
	→ Repox joined	20:46
	← VoradorPT left	20:49
	→ roler joined	20:49
	← Repox left	20:49
rory	git rebase --root --onto $(git commit-tree -m 'Initial commit (empty)' 4b825dc642cb6eb9a060e54bf8d69288fbee4904)	20:55
	← kasual left	20:55
rory	did the trick. That hash is the hash of the empty tree!	20:55
	magic number :)	20:55
	→ svm_invictvs joined	20:56
	→ Amanas joined	20:56
	← Murr left	20:57
	→ Murr joined	20:58
	← jstein left	20:59
	→ jesst joined	21:00
	← svm_invictvs left	21:01
	← floatleft left	21:03
	→ phluks joined	21:03
	← cur8or left	21:03
_ikke_	rite	21:04
	→ cur8or joined	21:04
	→ fletom joined	21:05
hanetzer	heh, izzat so?	21:05
	← cur8or left	21:06
	→ cur8or_ joined	21:06
	← jstimm left	21:07
	← cur8or_ left	21:08
	→ cur8or joined	21:08
viric	cbreak: I wanted to merge in a different branch than I was in	21:09
	cbreak: I didn't know that "checkout -b" meant abandon the merge	21:09
_ikke_	A checkout means you change a lot of state	21:11
	though, a new branch doesn't do a lot	21:11
	→ devbaka_ joined	21:11
cbreak	you should have done that after committing :)	21:11
	← devbaka left	21:11
	← cur8or left	21:12
	→ jstimm joined	21:13
	→ cur8or joined	21:13
	← hanetzer left	21:14
	← cur8or left	21:14
	→ cur8or joined	21:15
	← devbaka_ left	21:15
	← cur8or left	21:16
	→ cur8or joined	21:16
	← cur8or left	21:18
	→ cur8or_ joined	21:18
	← pyfoo left	21:19
	← cur8or_ left	21:19
	← schleppel left	21:20
	→ converge joined	21:25
	AciD` → AciD	21:25
	AciD → Guest45420	21:26
	→ pyfoo joined	21:28
	→ rivalomega joined	21:30
	→ ktwo joined	21:32
	→ gopar joined	21:35
	← whitby left	21:36
	← Amanas left	21:37
	← ocds left	21:37
	→ whitby joined	21:37
	→ newbleboir joined	21:37
	← jceb left	21:38
	← g00s left	21:38
	← newbleboir left	21:38
	→ blackmesa joined	21:40
	← blackmesa1 left	21:40
	← netlar left	21:40
	← Cassiopaya left	21:42
	→ brainproxy joined	21:43
	← Gustavo6046 left	21:46
	← converge left	21:46
	← wcpan left	21:47
	→ wcpan joined	21:47
	→ q81230r__ joined	21:48
	→ citizen-stig joined	21:48
	← q81230r__ left	21:48
	→ blackmesa1 joined	21:49
	→ Gustavo6046 joined	21:50
	→ asdf__ joined	21:51
	← blackmesa left	21:51
	→ netlar joined	21:52
	← asdf__ left	21:52
	← jnavila left	21:53
	→ franl joined	21:54
	→ lilsissybtch joined	21:56
	NeverTired → pifon	21:58
	← butterthebuddha left	22:00
	→ butterthebuddha joined	22:00
	← abba left	22:01
	← roler left	22:01
	← jesst left	22:04
	← Cabanossi left	22:06
	← pijiu left	22:07
	← dre_ left	22:07
	→ Cabanossi joined	22:09
	→ Amanas joined	22:10
	← gopar left	22:10
	← zmachine left	22:10
	→ gopar joined	22:11
	← ShapeShifter499 left	22:12
	→ ShapeShifter499 joined	22:13
	→ masuberu joined	22:13
	← ShapeShifter499 left	22:13
	→ zmachine joined	22:14
	← snowkidind left	22:14
	← rumflump left	22:15
	→ ShapeShifter499 joined	22:16
	→ Es0teric_ joined	22:16
	→ mage_ joined	22:16
	← rubenb left	22:16
	← keyjoo_ left	22:17
	← mage__ left	22:17
	→ VoradorPT joined	22:19
	← gopar left	22:19
	← lilsissybtch left	22:26
	← Es0teric_ left	22:29
	← Nizumzen left	22:31
	← felixsanz left	22:33
	→ felixsanz joined	22:33
	← chaosruler left	22:34
	→ MaxLeiter joined	22:38
	← Cabanossi left	22:38
	← Amanas left	22:38
MaxLeiter	working on a github PR, I tried to update to master with `git merge master` instead of rebase, so now theres a merge commit I dont want	22:38
	→ Es0teric_ joined	22:38
MaxLeiter	how should I revert?	22:38
	→ Cabanossi joined	22:39
rewt	git reset --hard @^ ; git push -f	22:40
MaxLeiter	thanks	22:40
rewt	but !public	22:40
gitinfo	[!rewrite] 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	22:40
MaxLeiter	in this case it's fine, but thanks for the tip	22:40
	i.e. rewriting history	22:41
rewt	otoh, there's git revert, but that will just make a new commit that appears to "undo" the merge but will make any future merge of the same branch a nightmare	22:41
MaxLeiter	what about `git checkout hash` and `git push -f`?	22:41
rewt	yeah, same thing... @ is just shorthand for HEAD, and ^ means parent commit, so @^ means the commit before HEAD	22:42
MaxLeiter	ah	22:42
	awesome, thank you	22:42
	→ Amanas joined	22:42
rewt	with checkhout hash, you'll have a detached HEAD, which you can still push with git push -f origin :branch	22:42
	but your local branch won't be updated	22:43
	← rivalomega left	22:46
	← roygbiv left	22:46
	→ rivalomega joined	22:47
MaxLeiter	gotcha	22:49
	← paul424 left	22:50
	← franl left	22:51
	← rivalomega left	22:52
	← pirocks left	22:53
	← GeraldW left	22:53
	← pyfoo left	22:55
	← brainproxy left	22:56
	← citizen-stig left	22:57
	← Murr left	22:57
	→ Murr joined	22:57
	→ GeraldW joined	22:59
	→ Chaosruler joined	23:00
	→ Atemu joined	23:01
	→ converge joined	23:02
	← nowhere_man left	23:03
	→ xaxxon joined	23:03
	← Es0teric_ left	23:06
	→ nowhere_man joined	23:06
	← Cabanossi left	23:06
	→ pineappleroads joined	23:06
	→ Es0teric_ joined	23:06
	← Es0teric_ left	23:07
	→ pyfoo joined	23:07
	→ Es0teric_ joined	23:07
	← Xrayez left	23:07
	← Es0teric_ left	23:07
	→ Es0teric_ joined	23:08
	← Es0teric_ left	23:08
	→ xaa joined	23:08
	→ Cabanossi joined	23:09
	← aax left	23:11
	← dsdeiz left	23:11
	→ dsdeiz joined	23:12
	← dsdeiz left	23:12
	→ dsdeiz joined	23:12
	← blackmesa1 left	23:13
	→ ResidentBiscuit joined	23:19
	← Atemu left	23:19
	→ rosco_y joined	23:19
	← overlord_tm left	23:22
	← ResidentBiscuit left	23:22
	→ gugah joined	23:25
	→ ResidentBiscuit joined	23:27
	→ m0viefreak joined	23:30
	← pineappleroads left	23:30
	→ snowkidind joined	23:31
	← rosco_y left	23:32
	→ pineappleroads joined	23:32
	→ a46xtiolpxe joined	23:33
	← a46xtiolpxe left	23:36
	← dege left	23:40
	→ MoziM_ joined	23:41
mac-	guys is there any git for Android ?	23:47
	i.e. when I do some code on tablet and wish to push it to bitbucket or github	23:47
	→ overlord_tm joined	23:47
oprypin	i can tell you without checking: yes	23:47
	← foo left	23:47
mac-	grrrat, but which one is worth to use ?	23:48
oprypin	probably none	23:48
	← \|ifei5g00d left	23:51
mac-	:]	23:51
	as I was afraid of	23:51
	← MaxLeiter left	23:52
	→ Es0teric_ joined	23:53
	→ brainproxy joined	23:53
	← MoziM_ left	23:53
	→ MoziM_ joined	23:54
	→ \|ifei5g00d joined	23:54
	← MoziM_ left	23:54
	→ ljc joined	23:56
	→ MoziM_ joined	23:56
viric	mac-: install termux	23:59

Logs Search ←Prev date Next date→

Channels Documentation