IRCloggy #git 2017-08-14

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-08-14
	← jrabe left	00:00
	→ jrabe joined	00:00
	← cdown left	00:01
	→ SpeakerToMeat joined	00:01
	→ Purplelawnchair joined	00:02
	← Purplelawnchairs left	00:03
	→ Liir joined	00:04
	→ russkel joined	00:06
	← Liir left	00:07
	← Goplat left	00:08
	← _28_ria left	00:09
russkel	hi all, I'm getting a weird intial editor state when I use git rebase -i HEAD~3, it seems it's fairly malformed with none of the commits actually showing in the editor, https://i.imgur.com/XvbbZFZ.png has anyone seen this issue before?	00:10
	← ContessaTP left	00:11
	← chachasmooth left	00:11
	→ Liir joined	00:12
	← Liir left	00:12
	→ dodobrain joined	00:12
	← Purplelawnchair left	00:13
	→ Goplat joined	00:14
	→ chachasmooth joined	00:14
	← bgamari left	00:14
	← russkel left	00:17
	→ bgamari joined	00:17
	→ Purplelawnchairs joined	00:18
	← m0viefreak left	00:19
	← Goplat left	00:19
	← Purplelawnchairs left	00:23
	← xaa left	00:27
	← cagedwisdom left	00:27
	→ cagedwisdom joined	00:28
	← qpdb left	00:29
	← Cabanossi left	00:29
	→ qpdb joined	00:29
	→ Cabanossi joined	00:31
	→ ContessaTP joined	00:32
	← easzero left	00:32
	← Rodya_ left	00:37
	→ Rodya_ joined	00:38
	→ brent__ joined	00:39
	← samsamek left	00:42
	→ blunaxela joined	00:42
	← sz0 left	00:44
	→ redtail joined	00:48
	← bgamari left	00:49
	→ maryo joined	00:55
	← peterbecich left	00:56
	→ bgamari joined	00:56
	← ZyX-I left	00:57
	← manuelschneid3r left	00:57
	← Rich_ left	00:57
	← chachasmooth left	00:58
	→ chachasmooth joined	00:59
	→ finalbeta joined	01:01
	→ MattMaker joined	01:01
	← perrier-jouet left	01:01
	← oxymoron93 left	01:03
	← catphish left	01:05
	→ phinxy joined	01:06
	← dodobrain left	01:06
	← theoceaniscool left	01:07
	→ robattila256 joined	01:07
	→ thiago joined	01:09
	← brent__ left	01:09
	← beerdrop left	01:09
	← dviola left	01:09
	→ brent__ joined	01:10
	← nikivi left	01:11
	← donmichelangelo left	01:12
	→ dodobrain joined	01:12
	← Gustavo6046 left	01:16
	→ Gustavo6046 joined	01:17
	← thiago left	01:18
	→ dgarstang joined	01:20
	→ beerdrop joined	01:23
	← dgarstang left	01:25
	→ ws2k3 joined	01:25
	← ws2k3 left	01:25
	← robattila256 left	01:29
	→ peterbecich joined	01:29
	→ ws2k3 joined	01:29
	← ws2k3 left	01:29
	← Wulf left	01:38
	→ checkItOut joined	01:41
	← anuxivm left	01:41
	← snowkidimd left	01:41
	→ snowkidimd joined	01:42
	→ wxg joined	01:42
	← Cabanossi left	01:44
	← ilbot3 left	01:45
	→ roygbiv joined	01:46
	→ Cabanossi joined	01:46
	← checkItOut left	01:50
	→ checkItOut joined	01:51
	→ ilbot3 joined	01:52
	← sunri5e left	01:54
	→ sunri5e joined	01:56
	← checkItOut left	01:57
	→ checkItOut joined	01:57
	← IniGit left	01:57
	← blahdodo left	01:58
	← checkItOut left	01:58
	← maryo left	01:59
	→ checkItOut joined	01:59
	← wxg left	01:59
	← bgerber left	02:00
	→ bgerber joined	02:00
	→ maryo joined	02:00
	← roygbiv left	02:01
	→ IniGit joined	02:01
	→ blahdodo joined	02:04
	→ wxg joined	02:05
	← maryo left	02:05
	← blahdodo left	02:06
	← fahadash left	02:06
	→ maryo joined	02:06
	← IniGit left	02:09
	→ blahdodo joined	02:10
	← sbasso left	02:10
	→ perrier-jouet joined	02:11
	→ YuGiOhJCJ joined	02:12
	← chachasmooth left	02:12
	← maryo left	02:13
	→ chachasmooth joined	02:14
	← webdev007 left	02:16
	→ al-damiri joined	02:16
	← MattMaker left	02:16
	→ Kazuto joined	02:19
	→ mizu_no_oto joined	02:20
	→ patrlind joined	02:24
	← patrlind left	02:24
	→ robattila256 joined	02:24
	← futuristic left	02:26
	← chachasmooth left	02:26
	← danimal2 left	02:27
	← Khisanth left	02:27
	→ chachasmooth joined	02:28
	← wxg left	02:28
	→ Vortex34 joined	02:30
	→ MattMaker joined	02:31
	← MattMaker left	02:31
	→ MattMaker joined	02:31
	← peterbecich left	02:31
	→ cbonobo joined	02:31
	← Vortex35 left	02:33
	→ Goplat joined	02:33
	← dermoth left	02:35
	→ dermoth joined	02:36
	→ thiago joined	02:37
	→ czart__ joined	02:37
	← xcm left	02:38
	→ xcm joined	02:38
	← safe left	02:39
	← fstd left	02:40
	→ fstd_ joined	02:40
	← kaldoran left	02:40
	→ tunekey joined	02:40
	fstd_ → fstd	02:40
	← sim590 left	02:41
	← czart_ left	02:41
	→ lagothri1 joined	02:41
	→ sim590 joined	02:42
	→ Khisanth joined	02:42
	→ kaldoran joined	02:42
	← thiago left	02:43
	← lagothrix left	02:44
	→ thiago joined	02:47
	← cbonobo left	02:50
	→ cbonobo joined	02:51
	→ justan0theruser joined	02:53
	← justanotheruser left	02:55
	→ hfp_work joined	02:55
	← thiago left	02:55
	→ hfp joined	02:55
	← Rodya_ left	02:57
	→ wxg joined	02:57
	→ dtrott joined	03:01
	← Anja_ left	03:03
	← pks left	03:04
	← oskarkv left	03:04
	→ pks joined	03:05
	← checkItOut left	03:05
	→ checkItOut joined	03:05
	← hfp left	03:06
	→ CBF16888 joined	03:07
	← wxg left	03:07
	→ donmichelangelo joined	03:08
	← dmarr left	03:08
	← Cabanossi left	03:14
	→ Orbitrix joined	03:15
	→ Cabanossi joined	03:15
	→ ws2k3 joined	03:21
	← ws2k3 left	03:21
	→ ws2k3 joined	03:21
	← ws2k3 left	03:21
	← mizu_no_oto left	03:22
	→ ws2k3 joined	03:22
	← ws2k3 left	03:22
	→ ws2k3 joined	03:23
	→ peterbecich joined	03:23
	← ws2k3 left	03:23
	→ ws2k3 joined	03:23
	← ws2k3 left	03:23
	→ ws2k3 joined	03:23
	← ws2k3 left	03:23
	→ cqi joined	03:24
	← brent__ left	03:25
	→ brent__ joined	03:25
	→ Rodya_ joined	03:30
	← brent__ left	03:32
	→ brent__ joined	03:33
	← snowkidimd left	03:34
	→ mizu_no_oto joined	03:37
	← Gustavo6046 left	03:40
	→ snowkidimd joined	03:42
	← Cabanossi left	03:43
	← dodobrain left	03:45
	→ Cabanossi joined	03:45
	→ darth_platypus joined	03:48
	← cagmz left	03:51
	→ Raging_Hog joined	03:52
	→ ozcanesen joined	03:53
	← phinxy left	03:55
	← Random832 left	03:57
	← hvxgr_ left	04:02
	→ vickyakshay joined	04:04
	→ dgarstang joined	04:05
	← dgarstang left	04:09
	→ sbasso joined	04:11
	← vickyakshay left	04:14
	← CBF16888 left	04:14
	→ CBF16888 joined	04:15
	← sbasso left	04:16
	← whitby left	04:16
	← Raging_Hog left	04:17
	← Gurkenglas left	04:18
	→ svm_invictvs joined	04:18
	← CBF16888 left	04:19
	→ CBF16888 joined	04:20
	→ ISmithers joined	04:20
	← beerdrop left	04:21
ISmithers	Hi all, I'm trying out some git submodule stuff, and have got everything set up and working. I have a question about the correct workflow though, so my submodule is setup as shown https://i.imgur.com/f6qtBBy.png and I want to know - does this mean another dev, would need to make sure his local path matches mine? It seems so - is there a better way?	04:23
mud	ISmithers: Better way is ... don't do that. Submodules are supposed to use URLs that will be valid for at least everyone using the project. Like a github URL or maybe an intranet site for a work thing at worst.	04:24
	ISmithers: As to if there's a better way, I usually prefer not using submodules. But there are times they're appropriate. I just don't tend to run into them.	04:25
	(I usually prefer 'git subtree' (the contrib command)) instead, or other solutions.	04:26
	← chachasmooth left	04:26
	→ chachasmooth joined	04:28
	→ Anja_ joined	04:29
	→ oskarkv joined	04:31
	→ beerdrop joined	04:33
	← MACscr left	04:34
	→ wxg joined	04:35
	← Anja_ left	04:36
	→ lyxus joined	04:38
	→ nikivi joined	04:41
	→ dre_ joined	04:43
	← Cabanossi left	04:44
	→ Cabanossi joined	04:45
	→ wilbert joined	04:45
	→ Silenced joined	04:46
ISmithers	Gottit. I was just away making a coffee and was thinking, why don't I just link it to the actual remote repo.	04:46
	→ Anja_ joined	04:48
ISmithers	Just when I set it up, I was testing locally and sort of accepted that path as the final heh.	04:48
mud	Heh, yeah. It's a fairly common problem with submodules I think. At least I've seen peers do the same thing and I end up with useless repos :-/	04:48
	→ wilbert_ joined	04:49
	← orbyt_ left	04:49
	← wilbert left	04:51
	← MattMaker left	04:52
	← Orbitrix left	04:55
	→ dgarstang joined	04:59
	→ jceb joined	04:59
	← al-damiri left	05:00
	← skalpin left	05:01
	← brent__ left	05:02
	→ dodobrain joined	05:02
	→ robertparkerx joined	05:02
	← robertparkerx left	05:04
	← redtail left	05:06
	← mizu_no_oto left	05:07
	→ Phylock joined	05:07
	→ howdoi joined	05:07
	→ df0 joined	05:08
	→ dec0n joined	05:08
	→ Raging_Hog joined	05:08
	→ skalpin joined	05:09
	← Lyqyd left	05:11
	← govg left	05:12
	← wxg left	05:15
	← dgarstang left	05:15
	→ fatihgenc joined	05:19
	← dre_ left	05:19
	← menip left	05:20
	→ lordjancso joined	05:21
	← jceb left	05:25
	← ozcanesen left	05:25
	← Solvaring left	05:25
	← HurricaneHarry left	05:26
	← peterbecich left	05:29
	← CBF16888 left	05:29
	→ CBF16888 joined	05:30
	→ sbasso joined	05:31
	→ dre_ joined	05:31
	← CBF16888 left	05:34
	→ CBF16888 joined	05:35
	← sbasso left	05:35
	→ MattMaker joined	05:37
	← jfr left	05:43
	→ tkore joined	05:43
	← mel__ left	05:43
	→ ShekharReddy joined	05:44
	→ thiago joined	05:44
	← lyxus left	05:44
	← df0 left	05:49
	→ govg joined	05:53
	← rkta left	05:54
	← sarri left	05:54
	← ahr3n left	05:54
	→ dreiss joined	05:55
	→ bybb joined	05:56
	← SoulOfTheInterne left	05:56
	← dodobrain left	05:56
	→ sarri joined	05:57
	← sarri left	05:57
	→ sarri joined	05:57
	→ Neon joined	05:58
Neon	In a clean working dir I made a git pull --no-ff and now I have lots of untracked files. Where did they come from?	05:59
	← madewokherd left	05:59
	→ SirPole joined	06:00
	← cbonobo left	06:00
mud	Neon: .gitignore changed probably?	06:00
	→ cbonobo joined	06:01
Neon	mud: Ah, yeah, you're right. I totally missed that. Thanks. :)	06:02
mud	'welcome. Yeah it can be really confusing	06:02
	← cbonobo left	06:05
	→ tarkus joined	06:06
	→ oxymoron93 joined	06:06
	→ jfr joined	06:10
	← MattMaker left	06:10
	→ MattMaker joined	06:11
	← boombatower left	06:11
	← MattMaker left	06:11
	→ Unconformed joined	06:13
Unconformed	hi	06:13
mud	Hello	06:14
	→ dodobrain joined	06:15
	→ dege joined	06:15
	← Silenced left	06:16
	← shiranuidong left	06:17
	→ shiranuidong joined	06:17
	→ ahr3n joined	06:18
	→ phluks joined	06:19
	→ MachinShin joined	06:20
	→ zefferno joined	06:20
MachinShin	hey all. is there a way to deny people from making branches, or at least disabling a branch-based workflow. i use forks, and one of the other guys on my team made a branch, and for some reason my changes overwrote his. (and can i recover those things w/o having to parse through the reflog?)	06:21
	→ opalepatrick joined	06:22
mud	I assume this is a github question or some other place?	06:23
grawity	I've two replies to that	06:24
	← phluks left	06:24
grawity	1) you cannot in any way prevent people from using branches in their own clones (or forks)	06:24
	← Unconformed left	06:25
grawity	2) if you managed to overwrite somebody else's branch, that's really something you must have asked git to do with --force, and ... well, honestly, I doubt disabling just branches would help with that.	06:25
	→ Andrew_K joined	06:26
	← Wasp left	06:26
MachinShin	i didn't overwrite, i just sync'd my fork with upstream when a pull request is merged: git fetch upstream && git merge upstream/develop && git push origin develop . so i don't see why it'd overwrite.	06:29
	← dreiss left	06:29
MachinShin	and i didn't do a rebase commit on github either. (i use merge commits)	06:29
thiago	MachinShin: if you're allowing people to push to a central repository, educate people	06:30
	if you want to prevent accidents (or intentional malice), you need hook scripts to prevent that	06:30
	check with your hosting provider	06:30
	if it's GitHub, you can only prevent force pushes	06:31
MachinShin	that's my problem really, i don't want to allow that. i want the team to do their work on their clone, then put in a pull request.	06:31
	ah. (and my friend has been pushing gitlab, which i believe has those)	06:32
thiago	then don't give them push access	06:32
	→ Wulf joined	06:32
MachinShin	ah, just found the setting	06:33
	← misosoup left	06:33
	← Rodya_ left	06:34
	← armyriad left	06:38
	→ armyriad joined	06:38
	← wilbert_ left	06:40
	→ dersand joined	06:44
cbreak	MachinShin: just forbid pushing	06:48
	← Noldorin left	06:50
	← robattila256 left	06:53
	→ czart joined	06:54
ISmithers	I had to change a value in my .git/.config and am wondering how I make this change on my remote? I can't push it I am guessing?	06:55
cbreak	only history can be pushed	06:55
	configuration can only be changed locally	06:55
	there are only few git ways to transfer selected configuration	06:56
	← czart__ left	06:56
ISmithers	So only way to get this change on my remote is to kill the remote and then push this anew? (its a fresh repo so I can do that easily enough).	06:56
cbreak	no	06:56
	that won't change any setting	06:56
	as I said, only history can be pushed	06:57
	wether you push to an existing or new repository doesn't matter in the slightest	06:57
	→ ZyX-I joined	06:57
ISmithers	Submodules are added as part of the repository in 3 places from what I can see, the .config, the .gitmodules and then the path to the repo. So initially that data all gets sent to the remote, because when I clone the remote - its there.	06:57
	So what am I missing?	06:57
	← Cabanossi left	06:58
cbreak	remote repositories don't have submodules	06:58
	→ jason237 joined	06:58
cbreak	they are bare	06:58
	no working dir	06:58
	→ schleppel joined	06:59
cbreak	so obviously pushing won't change submodules either	06:59
ISmithers	So they are defined in the gitmodule file, that's used to setup the config I guess with the submodule data?	06:59
cbreak	sure	06:59
	that happens on clone though	06:59
	or later when you do git submodule sync	06:59
ISmithers	OK good.	06:59
	→ djb-irc joined	06:59
cbreak	it has nothing to do with pushing	06:59
ISmithers	That's what I needed.	06:59
	I can change the gitmodule and push that change, and then all will be well for future-people who clone it.	07:00
	→ Cabanossi joined	07:00
ISmithers	Just wanted to make sure they get a repo that is setup to have the submodule checked out on the correct branch.	07:00
cbreak	no branch	07:00
	→ wxg joined	07:00
cbreak	submodules are usually on no branch at all.	07:00
	→ overlord_tm joined	07:00
ISmithers	From what I read it looks like you can set them up to be on a branch, rather than in a detached state, which is preferable for what I'm doing as each branch represents a version of our platform.	07:01
	→ Cosmo_ joined	07:02
	gitinfo set mode: +v	07:03
cbreak	maybe they added that later. But submodules really are made to track an exact commit	07:03
	every time you commit the outer repository, it'll record a commit hash for every submodule	07:03
	I saw that they had some support for branch handling, but that was always layered on top of the real submodule tracking	07:03
ISmithers	I've never used them before, but I do know what you say regarding that they track a specific commit yes. From reading today I see that you can make them track a branch/tag too.	07:04
Cosmo_	hello there, could i ask a question or two?	07:05
jast	tracking a commit is built into the design, tracking a ref got added on top as a bit of a hack... but yes, it exists :)	07:05
ISmithers	Well that's one question Cosmo_, so you only have one left now assuming you wanted to ask 2. If you wanted to ask only one question, then you've already consumed it. Thank you, come again! :p	07:06
	← darth_platypus left	07:06
jast	question calculus this early in the morning? desist! :P	07:06
ISmithers	Apologies :D	07:06
Cosmo_	heh.. i just updated my local repository from another one and then synched	07:07
ISmithers	I don't really know what's preferable in this case (regarding submodules), though I am anticipating other developers being a little cautious if they are in a detached state, as usually for them that means something has gone awry, so if I can friendlify it at least early on it will help them get on board.	07:07
jast	people would be right to be cautious in submodules	07:07
	and I think the ref tracking mode detaches the submodule's HEAD, too	07:08
Cosmo_	thing is, is it ok that i now have like 'merge remote-tracking branch' etc ? it appears if i start a new branch	07:08
jast	not completely sure about that, though	07:08
cbreak	Cosmo_: synced?	07:08
	what do you mean?	07:08
	are you sure you use git?	07:08
Cosmo_	tldr> http://imgur.com/a/TdCqJ	07:08
	i'm a pleb and use the desktop client. sorry :p	07:08
cbreak	which one?	07:08
jast	Cosmo_: well, if you use 'git merge' or 'git pull' to bring in new updates from an upstream repository or any other branch, that's what you typically get. it's a merge commit, making a record of which strands of history you combined and when	07:09
cbreak	there are really shitty clients...	07:09
Cosmo_	GitHub Desktop?	07:09
cbreak	never tried that one	07:09
jast	unfortunately the desktop clients like to dumb things down and it's not always easy to tell what they mean	07:09
	'sync' isn't an "official" term in git, for instance	07:09
	most people here use the command line interface which is why we have this nice canned response... !gui	07:10
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	07:10
cbreak	Cosmo_: normally, when updating a local repository from a remote, you'd do something like	07:10
Cosmo_	i had a local repository which was behind a few commits from another one, i updated the local from that one and got said merge remote-tracking etc	07:10
cbreak	git pull or git rebase	07:10
jast	which isn't to say we can't make random guesses, of course :}	07:10
	→ darth_platypus joined	07:10
cbreak	if you do a git pull, it'll either fast forward, or merge	07:10
	if it merges, you get a new merge commit	07:10
	nothing should start a new branch though	07:11
jast	well if you do start a new branch, it's based on whatever you did in the branch you based off of (by default, the branch you were on when you started that new branch)	07:11
	← overlord_tm left	07:12
	→ odamn joined	07:12
Cosmo_	i think that was it, i started the branch before the update	07:13
odamn	if I have multiple branches in a repo, and ive pulled down someone elses branch, then I made some edits to a document in that branch, is it good enough to just "git add" then "git push" or do I also each time need to set the --set-upstream value to the specific branch?	07:13
	assuming I have checkedout the branch in question and it shows in "git status"	07:13
cbreak	odamn: I normally just git push -u to set upstreams	07:13
	a local branch XXX gets the upstream origin/XXX or similar	07:14
	→ wandering_vagran joined	07:14
odamn	if I last pushed to a diff branch, if I dont set the upstream, it will try to push to the previous branch then, right?	07:14
cbreak	why would you want to do that?	07:16
	set the upstream to the upstream branch	07:16
	and push to other branches manually if needed	07:16
	if no upstream is set, the branch won't be pushed unless you tell it where to explicitly	07:16
odamn	so I have to set upstream every time I switch branches right?	07:17
grawity	branches remember their configured upstream	07:17
cbreak	odamn: no	07:17
odamn	why dont they know it from where you pulled it from?	07:17
cbreak	odamn: you have to set upsteam every time you want a different upstream	07:18
	odamn: they do	07:18
odamn	ok thanks	07:18
	so as long as my git status shows I am in the right branch, any git push I do will only push to that branch right	07:18
ISmithers	That's cute, I never noticed Git Bash adds a "(GIT_DIR!)" to your prompt if you are inside the .git directory. :)	07:18
cbreak	odamn: git push will push what it is configured to or told to	07:19
	there are many different things that can be configured	07:19
	← cagedwisdom left	07:20
	→ seschwar joined	07:21
	← thiago left	07:22
	← justan0theruser left	07:23
	← chachasmooth left	07:26
	→ chachasmooth joined	07:28
	→ high_fiver joined	07:28
	← ISmithers left	07:28
	← oxymoron93 left	07:30
	→ sbasso joined	07:32
	→ cagedwisdom joined	07:32
	→ TomyWork joined	07:33
	→ robertparkerx joined	07:34
	← sbasso left	07:37
	→ Murii joined	07:38
	← ahr3n left	07:40
	← dre_ left	07:42
	← Cabanossi left	07:43
	← agnki left	07:43
	→ Cabanossi joined	07:45
	→ barduck joined	07:48
	→ Karazhan joined	07:50
	← darth_platypus left	07:51
	← jimmyrcom left	07:53
	→ j08nY joined	07:54
	→ lss8 joined	07:56
	← lss8 left	07:56
	→ lss8 joined	07:56
	→ darth_platypus joined	07:59
	→ redtail joined	08:00
	→ insolfrac joined	08:00
	← dermoth left	08:01
	← YuGiOhJCJ left	08:01
	← bitmod left	08:01
	← Sharker left	08:01
	→ insol_fract joined	08:02
	→ pbandark joined	08:02
	→ mikecmpbll joined	08:02
	→ oxymoron93 joined	08:03
	← insol_fract left	08:04
	→ insol_fract joined	08:04
	← Goplat left	08:06
	→ dre_ joined	08:07
	→ ketas- joined	08:09
	← insolfrac left	08:09
	→ Borg- joined	08:09
	← redtail left	08:09
	← arthurb_ left	08:11
	→ db8093246 joined	08:11
	← insol_fract left	08:12
	← cagedwisdom left	08:14
	→ dermoth joined	08:16
	→ YuGiOhJCJ joined	08:16
	→ _Floflobel_ joined	08:17
	→ arthurb_ joined	08:17
	← Guest82927 left	08:18
	→ lxnr joined	08:18
	← guideline left	08:19
	→ bitmod joined	08:19
	→ SerusWork joined	08:19
	← _ADN_ left	08:19
	→ vvanta joined	08:19
	← svm_invictvs left	08:19
	← kaldoran left	08:19
	← Neon left	08:21
	→ redtail joined	08:22
	→ kaldoran joined	08:23
	→ digs joined	08:23
	→ aielima joined	08:23
	digs → Guest23720	08:23
	→ kurkale6ka joined	08:26
	→ cagedwisdom joined	08:27
	→ indistylo joined	08:28
	→ xaa joined	08:30
	→ guideline joined	08:31
	→ high_fiver_ joined	08:33
	← high_fiver left	08:36
	→ catphish joined	08:40
	→ Sharker joined	08:40
	← ZyX-I left	08:42
	→ checkItO_ joined	08:42
	→ lyxus joined	08:43
	← Cabanossi left	08:43
	→ _ADN_ joined	08:44
	→ Cabanossi joined	08:45
	← checkItOut left	08:45
	→ ChiLL_SurF joined	08:47
	→ Silenced joined	08:49
	← Murii left	08:49
	← pbandark left	08:50
	← _ADN_ left	08:51
	→ Murii joined	08:51
	→ pbandark joined	08:51
	← darth_platypus left	08:52
	← j08nY left	08:53
	→ zulutango joined	08:53
	← raynold left	08:53
	→ MACscr joined	08:54
	← checkItO_ left	08:54
	← tharkun left	08:54
	→ checkItOut joined	08:54
	← checkItOut left	08:54
	→ checkItOut joined	08:55
	→ high_fiver joined	08:55
	← in1t3r_ left	08:58
	← edvb left	08:58
	→ in1t3r_ joined	08:58
	← high_fiver_ left	08:59
	→ ogny joined	08:59
	→ King_Hual joined	09:02
	→ _ADN_ joined	09:03
	← checkItOut left	09:03
	← ketas- left	09:03
	→ manuelschneid3r joined	09:03
	→ checkItOut joined	09:03
	← checkItOut left	09:04
	→ checkItOut joined	09:04
	← checkItOut left	09:07
	→ checkItOut joined	09:07
	→ shodan` joined	09:08
	→ checkItO_ joined	09:08
	← wxg left	09:09
	← checkItO_ left	09:10
	→ checkItO_ joined	09:11
	← checkItO_ left	09:11
	← checkItOut left	09:11
	→ checkItO_ joined	09:11
	← tarkus left	09:15
	→ chll_ joined	09:16
	→ notebox joined	09:16
	→ HurricaneHarry joined	09:17
	← j416 left	09:17
	→ j416 joined	09:18
	→ test123456 joined	09:20
	← Karazhan left	09:21
	→ j08nY joined	09:22
	→ tarkus joined	09:24
	→ tharkun joined	09:25
	→ theoceaniscool joined	09:25
	← j08nY left	09:27
	→ Unconformed joined	09:29
Unconformed	Hi	09:29
	← redtail left	09:30
	→ kurkale61 joined	09:30
	→ Gurkenglas joined	09:32
	← Unconformed left	09:32
	← kurkale6ka left	09:32
	← microgamer left	09:33
	← tharkun left	09:34
	→ vickyakshay joined	09:35
	→ CheckDavid joined	09:35
	← vickyakshay left	09:36
	→ brillenfux joined	09:37
	→ kurkale6ka joined	09:37
	← kurkale61 left	09:38
	→ tharkun joined	09:41
	← chachasmooth left	09:42
	→ chachasmooth joined	09:43
	→ masuberu joined	09:44
	→ overlord_tm joined	09:45
	→ IniGit1 joined	09:49
	← MeltedLux left	09:52
	← netj left	09:53
	→ netj joined	09:54
	← sim590 left	09:54
	← kaldoran left	09:55
	← dre_ left	09:56
	→ Swey_Hey joined	09:57
	→ fahadash joined	09:57
	← lb1c left	09:59
	→ kaldoran joined	10:00
	→ sim590 joined	10:00
	→ lb1c joined	10:01
	→ doev joined	10:01
	→ sz0 joined	10:02
	← dedondesta left	10:04
	→ MeltedLux joined	10:07
	→ EdwardIII joined	10:08
EdwardIII	guys i'm trying to setup vscode as a difftool (mainly for merges) - https://gist.github.com/EdwardIII/a3117aec8c1edb376404dc20afdf867c#file-gistfile1-txt-L14-L17	10:09
	← oxymoron93 left	10:09
EdwardIII	but whenever i do git diff or git difftool it just uses gnu diff	10:09
	→ oxymoron93 joined	10:10
	← esc left	10:10
	→ esc joined	10:10
	← esc left	10:10
	→ esc joined	10:10
zofrex	you haven't set the tool	10:11
	https://git-scm.com/docs/git-difftool	10:11
	"If a diff tool is not specified, git difftool will use the configuration variable diff.tool"	10:11
EdwardIII	zofrex: i tried doing this too, but `git difftool` still uses gnu diff: https://gist.github.com/EdwardIII/a3117aec8c1edb376404dc20afdf867c#file-gistfile1-txt-L14-L17	10:12
	seems to be coming out of the config ok? https://gist.github.com/EdwardIII/a3117aec8c1edb376404dc20afdf867c#file-gistfile2-txt	10:13
	← Puffball left	10:13
zofrex	oh I see	10:14
	is this a custom one rather than a built in?	10:14
	→ Puffball joined	10:14
zofrex	does it show in the list if you do `git difftool --tool-help` ?	10:14
EdwardIII	zofrex: https://gist.github.com/EdwardIII/a3117aec8c1edb376404dc20afdf867c#file-gistfile3-txt-L13	10:15
	it's a custom one, right	10:15
	well - it's one git doesn't have baked-in support for	10:16
zofrex	what happens if you explicitly run `git difftool --tool=vscode`	10:17
	← mikecmpbll left	10:18
EdwardIII	zofrex: it uses gnu diff: https://gist.github.com/EdwardIII/a3117aec8c1edb376404dc20afdf867c#file-gistfile4-txt	10:18
zofrex	well I'm stumped	10:18
	sorry	10:18
	→ mikecmpbll joined	10:20
EdwardIII	me too hehe	10:21
	one thing zofrex - it says vscode.cmd - not sure where that .cmd is coming from? is that just git's way of saying it's a cli command or something?	10:22
	→ albel727 joined	10:23
zofrex	I too was confused by that	10:24
	let me see if I can replicate	10:24
AndreasLutro	many executable files on windows are named with the extension .cmd, though I'm not sure what exactly it signifies	10:24
zofrex	user-defined: custom.cmd echo blah blah	10:25
	looks the same for me	10:25
	← ChiLL_SurF left	10:25
grawity	they're cmd.exe batch scripts	10:25
zofrex	"git difftool --tool=custom" gives me "blah blah"	10:25
	I'm on OS X	10:25
	← cqi left	10:26
EdwardIII	me too	10:26
	i mean i' on osx	10:26
zofrex	I think this is just git's way of saying it's a custom command	10:26
EdwardIII	if i try and use mergetool it gives a message that's a bit more helpful: "git config option merge.tool set to unknown tool: vscode"	10:26
	→ dgarstang joined	10:28
EdwardIII	seems like maybe i need to do something to force git to use a non-default mergetool	10:31
	but whenever try and google for this issue it's just people using supported difftools that git already knows how to use heh	10:32
	→ navidr joined	10:32
EdwardIII	out of interest which merge tool do you use zofrex?	10:37
zofrex	p4merge	10:37
	← leeN left	10:37
zofrex	but I got a custom command working really quick using the same method as you just now	10:37
	→ cdown joined	10:40
zofrex	if I copy paste the relevant lines from your config they seem to have the intended effect (in my case, complaining that the executable does not exist)	10:41
	what version of git are you using?	10:41
	← Murii left	10:42
	→ leeN joined	10:42
	← lxnr left	10:42
EdwardIII	git version 2.14.1	10:42
zofrex	same :/	10:42
EdwardIII	i did only upgrade it this morning though	10:43
	after seeing this problem	10:43
	→ dedondesta joined	10:43
	← _hero_ left	10:45
	← dgarstang left	10:46
	← cdown left	10:48
	← lyxus left	10:48
	→ cdown joined	10:49
	← heroux left	10:50
	→ phinxy joined	10:54
	← bybb left	10:56
	→ Puggy joined	10:56
	→ King_Hual` joined	10:57
	← in1t3r_ left	10:57
	← King_Hual left	10:59
	→ in1t3r joined	11:01
	→ Murii joined	11:02
catphish	i'm trying to get my head around submodules, i'm trying to do something slightly unusual with them, i want to be able to clone and interact with a submodule that isn't yet in the working copy, is this possible?	11:02
	→ ovoldemorto joined	11:03
catphish	submodules seem somewhat set up around the idea of them having a home in a working copy, but what i want is the ability to look at a non-checked-out tree (maybe a remote branch), see a submodule, and examine its contents	11:04
	→ wxg joined	11:05
dostoyevsky	Hey, what's the best way to see when I changed what line in a certain file? I think I accidentally deleted a line in a c file in the last two weeks or so	11:05
grawity	`tig blame` or `git blame` for existing lines, `git log -p` or just `tig` for deleted ones	11:06
	→ ZexaronS joined	11:07
	← zulutango left	11:08
	→ styx_ joined	11:09
	← EdwardIII left	11:11
	→ bomb-on joined	11:11
	← chachasmooth left	11:12
	← wandering_vagran left	11:13
	→ EdwardIII joined	11:13
	→ chachasmooth joined	11:13
	→ brillenfux_ joined	11:17
	→ heroux joined	11:17
	← hwoarang left	11:18
	← aielima left	11:19
	← brillenfux left	11:19
	→ hwoarang joined	11:19
	→ brillenfux__ joined	11:21
	→ Cavallari joined	11:22
	← brillenfux_ left	11:23
	→ brillenfux_ joined	11:23
	← BenderRodriguez left	11:23
	→ bybb joined	11:24
	← brillenfux__ left	11:25
	← wxg left	11:26
	→ wandering_vagran joined	11:27
	→ MineCoins joined	11:27
	← brillenfux_ left	11:28
dostoyevsky	grawity: thanks!!!	11:28
	← Cabanossi left	11:29
	← sunri5e left	11:30
	→ lxnr joined	11:30
	→ Cabanossi joined	11:30
	← Cavallari left	11:32
	← checkItO_ left	11:32
	← Swey_Hey left	11:32
	→ ak102 joined	11:33
	→ Squarism joined	11:33
Squarism	Are there some solid arguments for not using http based repositories?	11:34
	→ sunri5e joined	11:34
	→ sbasso joined	11:34
Squarism	I read they are not transactional. Is that reason enough?	11:35
	← cdown left	11:36
	→ cdown joined	11:37
sonOfRa	Auth is annoying	11:37
	Also, actually HTTP, or HTTPS?	11:37
	If HTTP, auth is insecure.	11:37
	→ ioprev joined	11:38
	← sbasso left	11:39
ak102	wow git just did a mindfuk on me at this point.	11:39
	→ kurkale61 joined	11:39
ak102	i looked for ways to figure out how to sync a repo with a subdirectory in it	11:39
	ended up looking for hours not able to find a solution	11:40
	← kurkale6ka left	11:41
	← ioprev left	11:42
	→ dviola joined	11:42
	← chachasmooth left	11:42
	← dviola left	11:42
	→ dviola joined	11:42
	→ whitby joined	11:43
	→ chachasmooth joined	11:43
	→ hvxgr_ joined	11:45
	← overlord_tm left	11:46
	gitinfo set mode: +v	11:47
Borg-	LOL	11:47
	whitby hostlen is 63!!	11:47
	← PtxDK left	11:47
	→ Tobbi joined	11:47
	→ PtxDK joined	11:48
	→ Fiouz joined	11:48
	← dedondesta left	11:49
	→ misosoup joined	11:51
	← jaggz left	11:53
	→ dcvdr joined	11:54
	← cagedwisdom left	11:55
	← lxnr left	11:58
	→ synthroid joined	11:58
	← Cabanossi left	11:58
	← Raging_Hog left	11:59
	← Andrew_K left	12:00
	← leeN left	12:00
	→ Cabanossi joined	12:00
	→ wxg joined	12:01
	→ leeN joined	12:02
	← db8093246 left	12:06
	→ tvw joined	12:08
	→ justan0theruser joined	12:10
	← MineCoins left	12:12
	→ brillenfux joined	12:13
	→ jeffreylevesque joined	12:13
	→ vargas joined	12:14
	→ linuxenko joined	12:15
	→ debosi joined	12:16
	→ holodoc joined	12:19
	← debo left	12:19
	→ h12o joined	12:22
	→ Godoshian joined	12:25
	→ Commander_Cody joined	12:26
Commander_Cody	My manually edited a hunk after splitting is not enough in 'git add --patch' gets rejected.	12:27
	I replaced the leading '-' of lines I did not wish to have removed for the staging area with a space, ' '.	12:27
	← Cabanossi left	12:27
	→ svm_invictvs joined	12:28
Commander_Cody	This leads to two error messages: 'error: patch failed file:line-number; error file: patch does not apply'.	12:29
	What am I doing wrong?	12:29
	→ _hero_ joined	12:30
	→ Cabanossi joined	12:30
	← whitby left	12:31
	← kurkale61 left	12:32
	← wandering_vagran left	12:32
	→ kurkale61 joined	12:33
	→ jstein_ joined	12:34
	jstein_ → jstein	12:34
	← jstein left	12:35
	→ gugah joined	12:36
	kurkale61 → kurkale6ka	12:36
	→ whitby joined	12:37
	→ phluks joined	12:37
	← ogny left	12:38
	→ ogny joined	12:38
	← chachasmooth left	12:42
	→ chachasmooth joined	12:43
	→ nhorton joined	12:44
	→ xall joined	12:45
	→ dedondesta joined	12:45
	← fahadash left	12:46
	→ wandering_vagran joined	12:49
	← dedondesta left	12:50
	← dcvdr left	12:50
	→ HardlySeen joined	12:51
	→ str joined	12:51
	← howdoi left	12:53
	→ ankit01ojha joined	12:53
	← PioneerAxon left	12:55
	← theoceaniscool left	12:56
	← _hero_ left	12:57
	→ imack joined	12:58
	← brillenfux left	12:59
	← dec0n left	12:59
	→ PioneerAxon joined	13:00
	← Yatekii left	13:01
	← wxg left	13:02
	→ granitosaurus joined	13:02
granitosaurus	I have a dev branch and now I want to have a release branch to which I could submit a merge request. In other words I want a orphan(?) branch that can be auto merged in by gitlab. How do I approach this?	13:04
	I've tried spawning an orphan, giving it 1 empty commit but then I end up with unrelated history issue which prevents the auto merge	13:06
canton7	granitosaurus, you can create the orphan branch with something like 'git checkout --orphan foo; git rm -rf .; git commit --allow-empty -m "Initial Orphan Commit"	13:06
granitosaurus	uuu, TIL of --allow-empty	13:06
canton7	or you could branch from the first-ever commit in the repo, if that makes sense	13:06
	(don't use --allow-empty if you're interopping with another vcs like SVN - they don't like it)	13:06
	← xall left	13:07
granitosaurus	canton7, worked perfectly, exactly what I wanted. Thanks!	13:10
	← chachasmooth left	13:11
	→ robotrolll joined	13:11
	← Oatmeal left	13:11
	→ ZexaronS-2 joined	13:12
	→ xall joined	13:12
	← xall left	13:12
	→ Swey_Hey joined	13:13
	← h12o left	13:13
	→ chachasmooth joined	13:13
	← robotroll left	13:13
	robotrolll → robotroll	13:14
	← shodan` left	13:14
	← ZexaronS left	13:14
	→ Oatmeal joined	13:15
	→ chichou joined	13:17
	→ ekinmur joined	13:17
	→ peacememories joined	13:17
	← ekinmur left	13:19
canton7	granitosaurus, :)	13:19
	← ZexaronS-2 left	13:21
	→ cbonobo joined	13:23
	→ TSS_ joined	13:24
	→ perlpilot joined	13:25
	← notebox left	13:27
	→ theoceaniscool joined	13:28
	→ cqi joined	13:28
	← perrier-jouet left	13:28
	← cqi left	13:30
	→ cqi joined	13:31
	→ [Kid] joined	13:31
	← Godoshian left	13:35
	→ Es0teric joined	13:37
	→ AaronMT joined	13:38
	← bgamari left	13:38
	→ sigma__ joined	13:41
	→ jstein_ joined	13:42
	jstein_ → jstein	13:42
sigma__	If I add a tracked file to .gitignore, run `git rm --cached <file>`, and commit/push the change, do I need to do anything additional after pulling this change down on another host where the project is deployed?	13:43
	→ cdg joined	13:43
	→ dedondesta joined	13:46
	→ notebox joined	13:49
kus	What do you want to happen?	13:49
sigma__	I just want my change -- the removal of the tracked files from version control -- to take effect on other hosts where my project is deployed.	13:50
	← dedondesta left	13:51
sigma__	Not sure if I need to run git rm or anything on the other hosts after git pull.	13:51
	→ narendraj9 joined	13:51
osse	sigma__: you do not	13:52
sigma__	thanks osse	13:52
osse	but you have to check that file out if you want it to remain on disk physically	13:52
sigma__	In this case, the file I'm removing is put there by another process, so I don't want it to be version controlled.	13:52
	So that other process will handle that.	13:53
	→ j08nY joined	13:53
	→ Dougie187 joined	13:53
	← Trel left	13:54
	← str left	13:55
	← manuelschneid3r left	13:55
osse	\o/	13:55
	→ str joined	13:56
	→ Trel joined	13:57
	← chachasmooth left	13:57
	→ chachasmooth joined	13:58
	→ bgamari joined	13:59
	← Murii left	14:00
	← ogny left	14:00
	← kurkale6ka left	14:01
	→ kurkale6ka joined	14:01
	→ MineCoins joined	14:01
	← MineCoins left	14:01
	← dodobrain left	14:01
	→ dodobrain joined	14:02
	← peacememories left	14:03
	→ xall joined	14:03
	→ agnki joined	14:05
	→ Brski joined	14:07
	← oxymoron93 left	14:07
	← xall left	14:07
	→ dreiss joined	14:08
	← cbonobo left	14:14
	→ Cesario_ joined	14:14
	← narendraj9 left	14:15
	← exotime left	14:15
	→ xcesariox joined	14:15
	→ cbonobo joined	14:15
	← Sharker left	14:16
	← dermoth left	14:16
	← bitmod left	14:17
	→ Darren_ joined	14:18
	← xcesariox left	14:19
	← Cesario_ left	14:19
	← quarters left	14:19
	→ quarters joined	14:19
	← quarters left	14:19
	→ quarters joined	14:19
	← tkore left	14:19
Commander_Cody	How do I manually split a hunk into two if 'git add --patch' can't do it?	14:19
jast	e	14:19
	→ xcesariox joined	14:19
mud	Commander_Cody: The 'e'dit option	14:19
Commander_Cody	I know that 'e' allows editing, but the results of my editing are rejected.	14:19
jast	I meant to write more than one letter but my answer stands :}	14:19
	← cbonobo left	14:20
mud	It allowed you to win the race handily xD	14:20
jast	editing takes a little bit of getting used to, that's for sure	14:20
mud	Commander_Cody: It can be tricky to get right, yeah. Quit and try again? Make sure you read the spec carefully.	14:20
	← Dougie187 left	14:20
	→ Dougie187 joined	14:20
mud	By "the spec" I mean the little help thing at the bottom	14:20
Commander_Cody	I replaced the '-' in front of some lines I wanted not to put in the staging area with an empty space. That didn't work out.	14:20
	Deleting lines completely also leads to errors.	14:21
jast	well if you're adding things, removing 'minus' signs actually stops the line from being removed	14:21
	if that makes any sense. it's hard to talk about. ;)	14:21
mud	Maybe you can gist.github.com the stuff from the editor and we can try to work it out?	14:22
	→ ResidentBiscuit joined	14:22
mud	I still mess it up fairly often though, to be honest. It's not the best interface that could possibly exist.	14:23
	← nanga left	14:23
	→ nanga joined	14:24
	← nanga left	14:24
	→ nanga joined	14:24
Commander_Cody	mud: http://sprunge.us/LRbR	14:25
	I do not want to stage the first few lines that change an audio option.	14:26
	← Es0teric left	14:27
mud	Commander_Cody: So it looks like the first 4 lines after // cd audio, that's changing 2 lines (by removing and then readding them, since that's what diff does). So you just want that change not to be happening?	14:27
Commander_Cody	mud: Yes. Or to be precise, the changes should persist in my working directory, but not be added to staging.	14:28
	← Cabanossi left	14:28
	→ hagridaaron joined	14:28
	→ ogny joined	14:28
	→ Es0teric joined	14:28
mud	https://gist.github.com/kadoban/2ec4fcde20654651b11d0abae1d6f754 I think that would be this. (replaced the first two - with space, and deleted the + lines)	14:29
	Yep, exactly. That's a better statement of it.	14:29
	→ dermoth joined	14:29
	→ exotime joined	14:29
	→ BSaboia joined	14:30
Commander_Cody	mud: Thanks. I'll try that.	14:30
	→ Cabanossi joined	14:30
mud	No promises unfortunately, I can't test it obviously :(	14:30
	→ Ice_Strike joined	14:30
	← felipedvorak left	14:31
	→ re1 joined	14:32
	← fatihgenc left	14:32
	← SirPole left	14:33
Commander_Cody	mud: It worked :)	14:33
	The lesson is, of course, to make more small commits next time.	14:34
	← bgamari left	14:34
	→ Sharker joined	14:34
mud	Cool. Yeah, ideally, it's hard though sometimes.	14:34
	→ bgamari joined	14:36
	← snowkidimd left	14:37
	← hagridaaron left	14:37
	← bgamari left	14:38
	→ fission6 joined	14:39
	→ dedondesta joined	14:41
	→ bitmod joined	14:41
	→ voldemort joined	14:42
	→ Murii joined	14:42
	→ hagridaaron joined	14:42
	→ Acerific joined	14:42
	← bomb-on left	14:44
	→ bgamari joined	14:44
	→ felipedvorak joined	14:44
	← ovoldemorto left	14:45
	→ Karazhan joined	14:47
	← bgerber left	14:47
	→ oxymoron93 joined	14:48
	← bgamari left	14:50
	→ lzybassist joined	14:50
	← Acerific left	14:50
	← Brski left	14:50
	→ Raging_Hog joined	14:51
	← Tobbi left	14:51
	→ bgerber joined	14:52
	← lordjancso left	14:52
	→ kurkale61 joined	14:53
	→ cdg_ joined	14:53
	→ digidog joined	14:54
	← ogny left	14:56
	← cdg left	14:56
	← kurkale6ka left	14:56
	→ kurkale6ka joined	14:57
	← dedondesta left	14:58
	→ peterbecich joined	14:58
	→ kpease joined	14:58
	← kurkale61 left	14:59
	→ ZexaronS joined	14:59
	→ ams__ joined	15:01
	→ nuked0ne joined	15:02
	← ankit01ojha left	15:03
	← YuGiOhJCJ left	15:05
	→ Elon_Satoshi joined	15:07
	← dreiss left	15:08
	→ dedondesta joined	15:09
	← Raging_Hog left	15:09
	← Darren_ left	15:10
	← chachasmooth left	15:10
	← netj left	15:11
	→ SirPole joined	15:11
	→ netj joined	15:11
	→ chachasmooth joined	15:13
	← voldemort left	15:13
	→ frem joined	15:14
	← cqi left	15:16
	← notebox left	15:16
	→ Raging_Hog joined	15:17
	→ Darren_ joined	15:17
	← govg left	15:21
	← doev left	15:21
	← TomyWork left	15:24
	→ Tobbi joined	15:24
	→ notebox joined	15:25
	→ bgamari joined	15:26
	← synthroid left	15:27
	→ karolis joined	15:27
	→ synthroid joined	15:27
	← Cabanossi left	15:27
	→ tristanp joined	15:28
	← Tobbi left	15:29
	→ Cabanossi joined	15:30
	← tristanp left	15:32
	← synthroid left	15:32
	→ synthroid joined	15:32
	← imack left	15:33
	← bgamari left	15:33
	← dedondesta left	15:33
	→ cqi joined	15:39
	→ todd_dsm joined	15:39
	→ jimmyrcom joined	15:40
	→ dgarstang joined	15:40
	← akushner___ left	15:41
	→ dedondesta joined	15:42
	→ mel00010 joined	15:42
	← peterbecich left	15:44
	→ brent__ joined	15:44
	→ nsh joined	15:44
	→ sborza joined	15:45
	← bybb left	15:46
	→ Gustavo6046 joined	15:46
	← zefferno left	15:47
	→ madewokherd joined	15:47
	→ TomyLobo joined	15:47
	← wandering_vagran left	15:52
	← svm_invictvs left	15:53
	→ npgm joined	15:53
	→ thiago joined	15:54
	← CheckDavid left	15:54
	← chachasmooth left	15:56
	ResidentBiscuit → MarioToledo	15:58
	← Sonderblade left	15:58
	→ chachasmooth joined	15:58
	→ myhau joined	16:00
	← dgarstang left	16:00
	Maple__ → Maple	16:01
paskl	how do I restore the workdir when I only have the .git folder on my hands?	16:01
	→ SwiftMatt joined	16:02
	← synthroid left	16:03
mud	paskl: Clone from it?	16:04
	→ synthroid joined	16:05
mud	Was it a bare repo to start with, or was it a normal repo you pulled the .git from? Or did you just change things in the working directory?	16:05
paskl	git clone worked, thanks!	16:05
mud	'welcome	16:06
	← ujjain left	16:07
paskl	I thought there was some command to it, like git reset (to have the files generated in this current directory)	16:07
	the .git folder was restored from a DIY backup	16:08
	← cdg_ left	16:08
mud	If it wasn't a bare repo, there is. Or you can convert it away from a bare repo. But the clone was my first guess just because then fewer details matter	16:08
	Then yeah you can just throw it in some directory, foo/ and then go into foo and I think 'git checkout -- .' might work? or some invocation of reset	16:09
paskl	git reset --hard HEAD gave "fatal: This operation must be run in a work tree"	16:10
	← rda-mac left	16:10
paskl	same with "git checkout -- ."	16:10
	MarioToledo → MarioCanoli	16:10
	→ orbyt_ joined	16:11
	← Raging_Hog left	16:12
mud	paskl: Where'd you run it, in the .git directory?	16:15
paskl	yes	16:17
	← in1t3r left	16:17
	→ in1t3r joined	16:18
mud	paskl: Yeah, that won't work. Note I said to put it in some other directory first. You should do something like mkdir foo && mv .git/ foo && cd foo && git checkout -- .	16:18
	The .git is supposed to be inside of the working directory, and then you work in the working directory. In a non-bare repo anyway.	16:18
	← hagridaaron left	16:20
	← fission6 left	16:20
	→ ujjain joined	16:20
	← ujjain left	16:20
	→ ujjain joined	16:20
	→ CheckDavid joined	16:20
	→ boombatower joined	16:21
	← Murii left	16:22
	← Puggy left	16:23
	← chichou left	16:23
	← thiago left	16:24
	→ svm_invictvs joined	16:25
	→ hagridaaron joined	16:25
	→ Zialus joined	16:26
	← konsolebox left	16:27
	→ akushner___ joined	16:27
	→ thiago joined	16:28
	→ EvilPenguin joined	16:28
	← dedondesta left	16:29
	→ narendraj9 joined	16:30
	→ rominronin joined	16:30
	→ ozcanesen joined	16:32
	← IniGit1 left	16:33
	→ IniGit1 joined	16:33
	→ bgamari joined	16:33
	← IniGit1 left	16:34
	→ IniGit joined	16:34
IniGit	hello	16:35
mud	Hello	16:35
IniGit	how can I know if a repository on github is a fork and a fork from what?	16:35
	← kurkale6ka left	16:35
	← bgamari left	16:35
IniGit	I cannot find an answer to this on the internet	16:36
	← mikecmpbll left	16:36
IniGit	pretty weird	16:36
	← SwiftMatt left	16:37
IniGit	does somebody know?	16:37
	→ lafleurdubien joined	16:38
	← EdwardIII left	16:38
mud	IniGit: Under the title-ish thing in the main view it'll say "forked from blah/blah"	16:38
IniGit	mud: where is this	16:39
	ahh I see	16:39
	thx	16:39
Dougie187	IniGit: It depends on what you mean by a fork though. If you mean an official fork, you see it where mud said.	16:39
	If you just mean a clone that someone manually made, it won't look like a fork.	16:40
IniGit	so you mean if he pressed clone or fork initially	16:40
Dougie187	Sure, if you it locally, make a new repo on github, and push it to that. That's not a fork as far as github is concerned.	16:40
	but if you click fork, it shows up around the title (it also shows up in the network graph, and list of members)	16:41
	→ konsolebox joined	16:41
IniGit	But fork only makes sense if you want to create your own brand right?	16:41
	← chachasmooth left	16:41
mud	If it doesn't look like a fork, it isn't a fork IMO. Though your last two messages support that.	16:42
Dougie187	IniGit: No. Fork makes sense if you want to contribute stuff back to the original repo as well.	16:42
	← Commander_Cody left	16:42
mud	Forks are how you usually do pull requests and etc. on github.	16:42
	← phluks left	16:42
IniGit	so you should always fork?	16:42
	never clone	16:42
	?	16:42
	→ bybb joined	16:42
	← Es0teric left	16:42
Dougie187	IniGit: It's up to you. If you care about the connection between the two repos, you should always fork.	16:43
	→ chachasmooth joined	16:43
Dougie187	If you want to make your own project, and never have them communicate, you could think of cloning instead, but it's not super important.	16:43
	You can always change from one to the other as well.	16:43
	← theoceaniscool left	16:44
	→ SteffanW joined	16:44
Dougie187	It's a bit less effort on your part to fork though.	16:44
	← orbyt_ left	16:44
IniGit	ok	16:44
	thank you	16:44
mud	I can't think of any practical time I'd ever avoid forking.	16:44
	→ Commander_Cody joined	16:45
	→ SwiftMatt joined	16:47
	← Commander_Cody left	16:47
	→ Tobbi joined	16:47
	← netj left	16:48
	→ netj joined	16:48
	← SirPole left	16:49
	← myhau left	16:50
	← cqi left	16:50
	→ Es0teric joined	16:50
	→ SirPole joined	16:50
	→ dedondesta joined	16:50
	← bybb left	16:51
	→ peterbecich joined	16:51
	→ Rich_ joined	16:53
	→ bybb joined	16:53
	→ cbonobo joined	16:54
	← cbonobo left	16:54
	→ orbyt_ joined	16:54
	← hagridaaron left	16:54
	→ fission6 joined	16:55
	→ cbonobo joined	16:56
	← masuberu left	16:56
	→ cr34ton joined	16:57
	← _Floflobel_ left	16:57
	← tvw left	16:57
	← Tobbi left	16:58
	← thiago left	16:58
	← mel00010 left	16:58
	→ wilbert_ joined	17:00
	← oskarkv left	17:01
	← Es0teric left	17:02
	← CarlFK left	17:03
	← orbyt_ left	17:04
	← chll_ left	17:05
	→ oskarkv joined	17:06
	→ antfoo joined	17:06
	→ orbyt_ joined	17:07
	→ theoceaniscool joined	17:08
	→ rkta joined	17:08
	→ bgamari joined	17:08
	→ nezen joined	17:15
	→ Tobbi joined	17:17
	← Elon_Satoshi left	17:18
	← wizardedit left	17:18
	← nezen left	17:18
	→ wizardedit joined	17:18
	← seschwar left	17:20
	← jason237 left	17:20
	→ Elon_Satoshi joined	17:20
	→ ogny joined	17:21
	← ogny left	17:21
	→ ogny joined	17:21
	→ Murii joined	17:22
	→ myhau joined	17:22
	← _ADN_ left	17:23
	← Murii left	17:26
	← notebox left	17:28
	→ Es0teric joined	17:29
	← bybb left	17:29
	← barduck left	17:32
	← cdown left	17:36
	← rominronin left	17:40
	← SwiftMatt left	17:41
	← akushner___ left	17:41
	← orbyt_ left	17:41
	→ azonenberg joined	17:42
	← Gurkenglas left	17:42
azonenberg	Hi guys, I have an interesting problem	17:42
	→ EGreg joined	17:42
EGreg	hey all	17:42
_ikke_	hai both	17:42
EGreg	can someone help, I ran into a situation	17:42
_ikke_	!just_ask	17:42
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	17:42
azonenberg	I'm in the process of taking a lot of work I've done in a branch and preparing clean pull requests (one per feature) to send to the original maintainer of the project	17:42
	So i create a new branch, cherry-pick the commits for that one feature, and push to a public location	17:43
EGreg	I am working on a project, and my local workspace is versioned with mercurial. But also, to work with others, I use git on the SAME workspace.	17:43
azonenberg	So the maintainer can merge my features one branch at a time	17:43
EGreg	Anyway long story short, I made a bunch of changes and they are stored in mercurial. They were also in my working copy. Everything was fine.	17:43
_ikke_	EGreg: Doesn't sound like the best workflow to me	17:43
EGreg	Then I pulled some changes from upstream master	17:43
azonenberg	Problem is, I accidentally created one of these feature branches on top of a previous one, instead of the remote master	17:43
_ikke_	azonenberg: ah	17:44
EGreg	Thees changes ere done by others	17:44
azonenberg	So I'm trying to figure out the best way of removing those specific commits from that branch	17:44
EGreg	And it complained that auto-merge could not be done and recommended git-stash, which I did	17:44
azonenberg	Basically i have a branch that has (say) ten commits on top of master	17:44
	← vvanta left	17:44
azonenberg	I want to remove the first five	17:44
EGreg	in other words - I stashed all MY changes	17:44
azonenberg	ideally having them not even show up in history of that branch	17:44
EGreg	and then I pulled from upstream master	17:44
	but now I want to MERGE the stash	17:44
	what do I do?	17:44
	← NeXTSUN left	17:44
EGreg	forget that I haev mercurial.	17:44
	Let's just say the working copy changes can also be restored from mercurial, and I am not relying on the git stash to save it.	17:45
_ikke_	azonenberg: git rebase --onto master A B; where A is the branch where B is created on	17:45
EGreg	How do I merge a stash with the stuff I just pulled	17:45
	The git stash and git pull upstream master has now COMPLETELY WIPED OUT my changes	17:45
_ikke_	EGreg: git stash pop already merges changes	17:45
EGreg	oh it does??	17:45
_ikke_	yes	17:45
oxymoron93	it pops	17:45
	→ nixjdm joined	17:45
EGreg	Please commit your changes or stash them before you merge.	17:45
	Aborting"	17:45
	that's what it said when I did git stash pop just now	17:46
	error: Your local changes to the following files would be overwritten by merge:	17:46
_ikke_	ah, you have uncomitted changes	17:46
azonenberg	_ikke_: now it's complaining the tip of my branch is beyond the remote	17:46
	and won't let me push	17:46
	(I found this problem out after pushing to the remote)	17:46
_ikke_	azonenberg: right, you have to force push	17:46
EGreg	ah, hold on	17:46
azonenberg	oh fun	17:46
Vampire0	azonenberg, but beware of !rewrite	17:46
gitinfo	azonenberg: 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:46
_ikke_	git push --force-with-lease <remote> <branch>	17:46
EGreg	now it seems to have worked	17:46
	Dropped refs/stash@{0} (53425a4ee6e7bde8f24bd687620c2ef0e317eb3a)	17:46
	what does that mean	17:46
_ikke_	If these are personal feature branches, it should not be a problem	17:46
EGreg	no more stash?	17:46
_ikke_	EGreg: yeah, the stash is removed	17:47
	→ orbyt_ joined	17:47
_ikke_	EGreg: as it is applied in your working tree	17:47
oxymoron93	check with git stash list	17:47
EGreg	woohoo, it seems to have merged everything	17:47
	thanks guys	17:47
azonenberg	_ikke_: thanks, seems fixed - and yes i'm aware rewriting history is a pain	17:47
	but i fix this before anyone pulled it, i think - it was a private feature branch i hadn't yet submitted a PR for	17:47
_ikke_	azonenberg: That was Vampire0 who mentioned it	17:47
	azonenberg: Private feature branches should not be a problem to rewrite	17:48
	azonenberg: To update pull requests, that's even required	17:48
azonenberg	tl;dr i'm trying to take azonenberg/project/master and pull request to maintainer/project/master	17:48
	in multiple smaller PRs	17:48
	← austin_laptop left	17:48
_ikke_	right	17:48
azonenberg	Which means splitting my original work out into multiple branches retroactively	17:48
_ikke_	EGreg: yw	17:48
EGreg	:D	17:48
	← tanuki_ left	17:49
	← narendraj9 left	17:49
	← ogny left	17:50
	← karolis left	17:51
	← azonenberg left	17:51
_ikke_	solving 2 problems in parallelm:P	17:51
	← savoir-faire left	17:52
	← bgamari left	17:53
	→ tanuki joined	17:54
	→ darth_platypus joined	17:54
	→ thiago joined	17:56
	→ JanC_ joined	17:57
	← JanC left	17:58
	JanC_ → JanC	17:58
	→ g0d355__ joined	17:59
	→ nezen joined	17:59
	← Cabanossi left	17:59
	→ Cabanossi joined	18:00
	→ Goplat joined	18:00
	→ Murii joined	18:01
	→ savoir-faire joined	18:01
	→ Sasazuka joined	18:02
	→ MattMaker joined	18:02
	← darth_platypus left	18:03
	→ duderonomy joined	18:04
	← Es0teric left	18:05
	→ raynold joined	18:05
	→ shs joined	18:06
	→ BSAlb joined	18:06
	← MattMaker left	18:07
	← Tobbi left	18:07
	→ bgamari joined	18:07
	← sborza left	18:07
	→ jceb joined	18:08
	→ cagedwisdom joined	18:08
	← BSaboia left	18:10
	← chachasmooth left	18:11
	← bgamari left	18:11
	→ webdev007 joined	18:11
	→ chachasmooth joined	18:13
	→ bgamari joined	18:13
amosbird	hi, how can I move three of head commits to a commit long before head?	18:14
mud	amosbird: rebase -i is the answer usually to that kind of thing. Of course that modifies history, have you shared this history yet?	18:15
amosbird	no	18:15
	it's a local repo	18:15
	how can I use rebase -i to achieve that?	18:15
mud	Then, yep, usually rebase -i. You have to be careful if there's merges in the part you're modifying though. rebase -i and merges doesn't usually do so well.	18:16
amosbird	i tried rebase on to that commit	18:16
	but nothing happends	18:16
mud	amosbird: Look at the "Interactive Rebase" section of the manpage, it's fairly well written.	18:16
	← bgamari left	18:17
	→ redtail joined	18:18
	→ bgamari joined	18:19
	→ SegFaultAX joined	18:20
amosbird	great, thanks!	18:20
thiago	rebase to the parent of the commit where you want those to appear at	18:20
	← CBF16888 left	18:21
	→ Tobbi joined	18:23
	← cr34ton left	18:24
	→ cr34ton joined	18:25
	← gugah left	18:25
	→ edvb joined	18:26
	→ bgamari- joined	18:26
	→ Gurkenglas joined	18:27
	← bgamari left	18:29
	← Bock left	18:29
	→ lzybassi_ joined	18:29
	→ maryo joined	18:29
	← catphish left	18:30
	← lzybassist left	18:32
	→ Sasazuka__ joined	18:33
	← salamanderrake left	18:33
	→ crem joined	18:34
	← cr34ton left	18:34
	→ dreiss joined	18:35
	← Sasazuka left	18:35
	→ salamanderrake joined	18:36
	→ df0 joined	18:36
	← Elon_Satoshi left	18:37
crem	I've committed some changes to master and then realized that the feature is going to take longer than I expected so I should have been started it in a separate branch. Is there anything better than "commit rollback into master"+"create a branch"+"commit patch to a branch" to move latest changes to a separate branch? (no other changes happened to the repo during that time, but I did push to remote repo for backup	18:38
	reasons)	18:38
_ikke_	crem: create a new branch on master, reset master back	18:38
	← df0 left	18:39
crem	Thanks, will try.	18:39
_ikke_	You will need to force push master afterwards	18:39
	← dtrott left	18:39
	← Silenced left	18:40
	→ Elon_Satoshi joined	18:41
	← King_Hual` left	18:42
	→ denimsoft joined	18:44
	→ perrier-jouet joined	18:47
	← SteffanW left	18:47
	← nixjdm left	18:48
	← saidelike_ left	18:50
	→ sammyo joined	18:51
	→ MattMaker joined	18:52
	← schleppel left	18:53
	← bgamari- left	18:53
	← MattMaker left	18:54
	→ SwiftMatt joined	18:54
	→ MattMaker joined	18:54
	puff` → puff	18:54
	→ bgamari joined	18:54
	← cbonobo left	18:56
	→ cbonobo joined	18:57
	← Cabanossi left	18:58
	→ gopar joined	18:58
	→ notebox joined	18:59
	← MattMaker left	18:59
	← CheckDavid left	18:59
	← orbyt_ left	19:00
	→ MattMaker joined	19:00
	← mud left	19:00
	→ Cabanossi joined	19:00
	← notebox left	19:00
	→ nixjdm joined	19:02
	→ morenoh149 joined	19:02
	→ Conder joined	19:02
	→ _ikke_ joined	19:05
	→ saidelike joined	19:05
	→ orbyt_ joined	19:06
	← r3c0d3x- left	19:06
	→ EvilPeng1 joined	19:06
	← SwiftMatt left	19:06
	← wilbert_ left	19:06
	→ rkta_ joined	19:06
	→ mud joined	19:07
	→ r3c0d3x joined	19:07
	← EvilPenguin left	19:08
	← dedondesta left	19:08
	← navidr left	19:08
	← rkta left	19:09
	rkta_ → rkta	19:09
	← oskarkv left	19:10
	→ paul424 joined	19:10
	← dreiss left	19:11
	← chachasmooth left	19:11
	→ ZyX-I joined	19:12
	→ chachasmooth joined	19:13
	← EvilPeng1 left	19:13
	← shs left	19:14
	→ lyxus joined	19:14
	→ ecuanaso joined	19:14
	← Darren_ left	19:14
	← perrier-jouet left	19:14
	→ johnflux joined	19:16
johnflux	I have a large commit that adds a bunch of files and removes a bunch of files	19:16
	← saidelike left	19:16
johnflux	I want to 'undo' the removal of those files	19:17
	so that I have a new commit that only adds the files	19:17
	← afuentes left	19:17
johnflux	any ideas how?	19:17
	← bgamari left	19:17
	→ afuentes joined	19:17
	← thiago left	19:17
	→ bgamari joined	19:18
_ikke_	is it the last commit?	19:18
	← djc left	19:18
johnflux	yes	19:18
	← paul424 left	19:18
johnflux	_ikke_: yes	19:18
	← lyxus left	19:18
oxymoron93	git reset --soft	19:19
	HEAD~	19:19
	actually without soft	19:19
	← orbyt_ left	19:19
oxymoron93	after that add files in chunks and commit the way you want	19:20
	→ paul424 joined	19:20
_ikke_	commit=$(git rev-parse HEAD); git reset --soft HEAD~; for file in $(git diff --name-only --diff-filter=D HEAD); do git checkout HEAD "$file"; done; git commit -C $COMMIT	19:21
	Untested..	19:21
	$commit, not $COMMIT	19:21
	→ overlord_tm joined	19:22
	mud → kadoban	19:22
_ikke_	oxymoron93: --soft makes it easier to just undo the deletions, but keep the rest	19:22
	← lzybassi_ left	19:22
oxymoron93	right, thanks	19:22
	→ HcsOmot_ joined	19:22
	→ lzybassist joined	19:23
	← maryo left	19:23
	→ akushner___ joined	19:24
	→ lzybassi_ joined	19:25
	← gopar left	19:25
johnflux	_ikke_: it's messing up with the spaces in the filename - I think I need to use xargs or something	19:25
	← lzybassi_ left	19:25
	← lzybassist left	19:25
	→ SwiftMatt joined	19:26
	→ lzybassist joined	19:26
	→ gopar joined	19:26
_ikke_	hmm, I did quote $file	19:26
	← cagedwisdom left	19:26
_ikke_	not sure any other place where it could mess that up	19:26
	→ saidelike joined	19:26
johnflux	_ikke_: in the 'for'. for seperates by spaces	19:27
	kadoban → mud	19:28
	← Cabanossi left	19:28
	← ecuanaso left	19:29
_ikke_	ah, bash does, zsh doesn't	19:29
	add IFS='\n	19:29
	add IFS='\n'; in front of it	19:29
	→ Cabanossi joined	19:30
	← ams__ left	19:30
	← jceb left	19:33
	→ dedondesta joined	19:33
	← overlord_tm left	19:35
johnflux	_ikke_: fwiw: git diff --name-only --diff-filter=D HEAD \| while read p; do git checkout HEAD "$p"; done	19:35
	_ikke_: I couldn't get the IFS version to work	19:36
	→ Disgeae joined	19:37
_ikke_	alright	19:37
	but you got the idea at least	19:37
	← SwiftMatt left	19:38
Disgeae	So I've got a git project running, using 'master' as main branch and using feature/bugfix branches which I usually merge to master. So I fixed some bug now, merged it with master, but I need it in the feature branch as well. What's the best practice for this? 'git merge master' in the feature branch?	19:38
	← high_fiver left	19:38
_ikke_	That should do	19:39
	→ cagedwisdom joined	19:39
	← Oatmeal left	19:39
Disgeae	It will only add 'Merge branch 'master' into feature/FEATURENAME', is there a way to avoid this somehow? As I don't want it in my master tree later on.	19:40
	Or won't it add that commit to the master if I merge back to master?	19:40
	← linuxmodder left	19:40
	→ SwiftMatt joined	19:40
_ikke_	Disgeae: merge doesn't add commits	19:40
	it merges trees	19:41
	← bgamari left	19:41
Disgeae	But it will show as an commit r ight?	19:41
_ikke_	yeah, on the feature branch side	19:41
	→ bgamari joined	19:41
_ikke_	but git log would show it	19:41
	← HcsOmot_ left	19:41
Disgeae	But there is no way to avoid that?	19:41
_ikke_	but you cannot add something to the feature branch without something showing up	19:41
	← guampa left	19:41
	→ dreiss joined	19:41
	← HardlySeen left	19:41
Disgeae	Alright, is this the best practice tho?	19:42
	The way I explained	19:42
_ikke_	you can also merge just that bugfix branch	19:42
	← chachasmooth left	19:42
Disgeae	Like 'git merge bugfix/NAMEOFTHEBUGFIX'?	19:42
_ikke_	yeah	19:43
	a third option is to cherry-pick the commits	19:43
Disgeae	That would be cleaner I assume	19:43
	→ brontosaurusrex joined	19:43
_ikke_	but then you will have them also duplicated in your history	19:43
Disgeae	Does cherry picking avoid the commit message?	19:43
	→ chachasmooth joined	19:43
Disgeae	Will just merge the bugfix then	19:43
brontosaurusrex	something that would explain tags and branches for mortals/doomies?	19:43
_ikke_	I think the usual practice is to back-port fixes instead of forward porting	19:44
	brontosaurusrex: Have you read progit already?	19:44
	→ HcsOmot_ joined	19:44
_ikke_	!learn_git_branching also	19:44
gitinfo	A nice tutorial visualizing git branching: http://pcottle.github.io/learnGitBranching/	19:44
	→ manithree joined	19:44
brontosaurusrex	_ikke_, the book? Actually i did about 12%.	19:44
_ikke_	yes, the book	19:45
	it does give you a solid basis for git	19:45
	https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell	19:45
brontosaurusrex	Ok, ill refraze the question: If I tag certain point in (for example master branch), is that a pointer to some specific commit/state or what? Does it even have anything to do with branching or not?	19:47
_ikke_	Disgeae: It's indeed a point to a specific commit	19:47
	Disgeae: It uses the same mechanism as branches (refs), but a tag ref is not moved	19:47
	→ sp33drac3r joined	19:48
_ikke_	brontosaurusrex: ^	19:48
	Disgeae: sorry for the wrong highlight	19:48
brontosaurusrex	_ikke_, thanks.	19:48
	→ aruns__ joined	19:48
	← nixjdm left	19:49
brontosaurusrex	so if I say: git tag -a 01 -m "v 01", when in my master, then that tag points to master branch?	19:49
_ikke_	brontosaurusrex: then there are also annotated tags	19:49
	← dedondesta left	19:49
	← indistylo left	19:49
Disgeae	_ikke_: np	19:49
brontosaurusrex	yeah, that was annotated one i think.	19:49
_ikke_	brontosaurusrex: correct	19:49
	an annotated tag means an extra tag object is created to store some extra data	19:49
	It points to last commit in your master branch	19:50
	brontosaurusrex: if you make a new commit, the tag still points to the same commit	19:50
	← bgamari left	19:50
brontosaurusrex	_ikke_, right, so a user could say: git clone url && git checkout 01 ?	19:51
_ikke_	yes	19:51
	→ bgamari joined	19:51
	← nezen left	19:51
_ikke_	note that that would detach HEAD	19:51
	So if they just want to look at / use the files, that's no issue	19:51
brontosaurusrex	right, at that point its in some other branch?	19:51
_ikke_	but they should not create new commits in that state	19:51
	No, not really	19:52
	you are checking out commit directly	19:52
brontosaurusrex	ah, i get it, basically they are in master - new commits after the tag?	19:52
	- = minus	19:53
_ikke_	let me try to illustrate it	19:53
	← HcsOmot_ left	19:53
	→ nd- joined	19:55
	→ EricPoe joined	19:56
	→ linuxmodder joined	19:56
	← nd left	19:57
	← Cabanossi left	19:57
	→ Mattiaslndstrm joined	19:58
Mattiaslndstrm	Hello! I have a branch that is behind master. I would like to update those changes but still keep the changes I have done since then. Is that possible?	19:59
moritz	Mattiaslndstrm: that's what a merge does	19:59
Mattiaslndstrm	moritz: But I don’t want to merge my branch into master. Can I only merge the master into the branch?	20:00
	→ Cabanossi joined	20:00
	→ wilbert_ joined	20:00
	→ HcsOmot_ joined	20:00
mud	Mattiaslndstrm: Sure, git doesn't care.	20:00
	There's nothing at all magical about 'master', it's just the default default branch name.	20:00
	→ emoji joined	20:01
	→ nixjdm joined	20:01
	→ jnavila joined	20:01
	← emoji left	20:01
	← bgamari left	20:01
Mattiaslndstrm	mud: Ah, of course. I’ll try that! Thank you!	20:01
	→ bgamari joined	20:03
	← akushner___ left	20:03
Mattiaslndstrm	mud: It worked. Thank you for your help!	20:03
mud	Anytime	20:04
	→ orbyt_ joined	20:04
	← sbeller_ left	20:05
	→ apotry joined	20:07
	→ thiago joined	20:07
	← cbonobo left	20:07
brontosaurusrex	_ikke_, should i wait for illustration? :)	20:07
_ikke_	brontosaurusrex: Sorry, toke some time	20:07
	→ cbonobo joined	20:07
_ikke_	yeah	20:07
	http://g.jk.gs/EM.png	20:07
	← oojacoboo left	20:08
	← johnflux left	20:08
_ikke_	Do you follow what is happening there?	20:08
	Do you see HEAD is pointing to a branch right now?	20:09
	This is a repo that has 4 commits	20:09
brontosaurusrex	Ok, HEAD is currently active head, right.	20:09
_ikke_	and the 3rd commit (c) is tagged as 01	20:09
	yes, HEAD is the currently checked out commit or branch	20:10
	← opalepatrick left	20:10
_ikke_	so let me show you what happens when you checkout the tag	20:10
	← SwiftMatt left	20:10
	← bgamari left	20:11
	→ cr34ton joined	20:12
	→ crose joined	20:12
	← cr34ton left	20:12
_ikke_	brontosaurusrex: http://g.jk.gs/EN.png	20:13
	Do you see that HEAD is no longer pointing to a branch, but directly to a commit?	20:13
	→ bgamari joined	20:13
brontosaurusrex	yes.	20:13
_ikke_	That happens when you would do git checkout 01	20:13
	→ cdg joined	20:13
	→ oojacoboo joined	20:14
_ikke_	If you would commit right now	20:14
brontosaurusrex	yes?	20:15
_ikke_	whttp://g.jk.gs/EO.png	20:15
	A new commit is created, but it's no longer contained in any branch	20:16
	or tag	20:16
	if you would checkout master again, there is no longer anything pointing to that commit	20:16
	That means it may be eventually removed	20:16
	→ al-damiri joined	20:17
	→ CheckDavid joined	20:17
_ikke_	That is what a detached HEAD is about	20:17
brontosaurusrex	sooo, one could solve that with 'git checkout master' before commiting anything or ...?	20:17
_ikke_	yes	20:17
	→ SwiftMatt joined	20:17
brontosaurusrex	_ikke_, ok, that was what they call online education, thanks.	20:17
_ikke_	so in summary: a branch is a ref that moves, a tag is a ref that stays put	20:18
brontosaurusrex	ok.	20:18
_ikke_	I like making these illustrations	20:19
brontosaurusrex	Well, honestly for me that's like the only way to understand anything.	20:19
	→ bgamari- joined	20:20
_ikke_	For git, it really helps if you understand how these graphs work, and how commands operate on it	20:22
	← bgamari- left	20:22
_ikke_	git commit == add commit, point it to parent, move branch	20:22
	git checkout = move HEAD, update index + working tree	20:22
	← bgamari left	20:22
	→ Es0teric joined	20:23
	→ thiago_ joined	20:23
	← sz0 left	20:23
brontosaurusrex	Lots of moving parts actually.	20:24
	← thiago left	20:24
	← tunekey left	20:24
	← denimsoft left	20:24
	→ tunekey joined	20:25
	← chachasmooth left	20:25
	→ darth_platypus joined	20:26
	← ContessaTP left	20:27
	→ perrier-jouet joined	20:27
	→ chachasmooth joined	20:28
	→ cust joined	20:28
	← tarkus left	20:29
	→ cdown joined	20:29
	→ akushner___ joined	20:31
	→ denimsoft joined	20:31
	← tunekey left	20:31
	→ high_fiver joined	20:32
	← Tobbi left	20:33
	← nhorton left	20:33
	← ShekharReddy left	20:33
	← gopar left	20:35
	→ ecuanaso joined	20:35
	→ gopar joined	20:36
nedbat	is there a way to alias ci to commit so that "git ci --help" shows the help for the commit command instead of showing me that it's an alias for commit?	20:36
_ikke_	nedbat: Hmm, I think there was a mailing list topic about that	20:37
nedbat	_ikke_: there's a way to make the tab-completion carry over nicely, but the help always annoys me :)	20:37
_ikke_	nedbat: https://public-inbox.org/git/1498070489.32360.14.camel@gmail.com/	20:38
	→ m0viefreak joined	20:39
nedbat	_ikke_: hmm, ok, so no simple way. thanks for the history pointer at least.	20:40
	← thiago_ left	20:40
	← gopar left	20:40
_ikke_	Did you wait long enough for them to be removed?	20:40
	sorry, wrong channel	20:41
	→ Vortex35 joined	20:41
	→ lzybassi_ joined	20:41
	→ energizer joined	20:42
	→ thiago joined	20:42
	→ tymczenko joined	20:43
	← Vortex34 left	20:43
	← lzybassist left	20:44
	← in1t3r left	20:45
	→ in1t3r joined	20:45
	→ gopar joined	20:45
	→ nezen joined	20:47
	→ TheFuzzball joined	20:47
	← bwn left	20:47
	← nixjdm left	20:48
	→ dmarr joined	20:48
	← jnavila left	20:50
	→ NeverTired joined	20:50
	← myhau left	20:50
	→ Tobbi joined	20:50
	→ kriskropd joined	20:50
	← Tobbi left	20:53
	← granitosaurus left	20:53
	← Murii left	20:53
	← synthroid left	20:55
	← aruns__ left	20:55
	← chachasmooth left	20:56
	→ kfoonamalik joined	20:58
	→ chachasmooth joined	20:58
	→ happy-dude joined	20:58
	→ sbeyer joined	20:58
	← Phylock left	20:59
	← brontosaurusrex left	20:59
	← akushner___ left	20:59
	← paul424 left	21:00
	→ akushner___ joined	21:01
	→ nixjdm joined	21:01
	→ bwn joined	21:02
	→ sentriz joined	21:03
demize	nedbat: Simplest would probably be to just write a shell script called git-ci that just calls `exec git commit "$@"`	21:07
	← Remramm left	21:07
	← heftig left	21:07
	→ Walex joined	21:07
	← JerkyMcJerkface[ left	21:07
	← M[m]8 left	21:07
	← Miguelngel[m] left	21:07
	← primeos[m] left	21:07
	← dreadful[m] left	21:07
	← reactormonk[m] left	21:07
	← aviraldg left	21:07
	← musicmatze[m] left	21:07
	← ushaNg6i[m] left	21:07
	← patrickr[m] left	21:07
	← hiq[m] left	21:07
	← abithvijayan[m] left	21:07
	← Demos[m] left	21:07
	← UncleCJ left	21:07
	← olbat[m] left	21:07
	← spinningarrow[m] left	21:07
	← unclechu left	21:07
	← KevinMGranger left	21:08
	← nappy[m] left	21:08
	← Techie[m] left	21:08
	← am2on left	21:08
	← swalladge[m] left	21:08
	← dyce[m] left	21:08
	← aidalgol left	21:08
	← waltervargas[m] left	21:08
	→ overlord_tm joined	21:08
	← flo[m] left	21:08
	← monomon[m] left	21:08
	← kdeal left	21:08
	→ guampa joined	21:09
	→ Sazhen86 joined	21:10
	← ribasushi left	21:11
nedbat	demize: that's an option.	21:11
	← dikiaap left	21:11
	→ _ADN_ joined	21:12
	→ sz0 joined	21:13
	← EGreg left	21:13
	← high_fiver left	21:13
	← guampa left	21:14
	← thiago left	21:15
	← dave0x6d left	21:15
	→ robattila256 joined	21:15
	→ Tobbi joined	21:15
	← crose left	21:16
	→ BeerLover joined	21:17
	← netj left	21:19
	→ netj joined	21:19
	Sasazuka__ → Sasazuka	21:21
	← Borg- left	21:21
	← linuxenko left	21:22
	→ Oatmeal joined	21:24
	→ tvw joined	21:25
	← Oatmeal left	21:26
	← AaronMT left	21:26
	← madewokherd left	21:26
	→ thiago joined	21:27
	← robattila256 left	21:28
	← stfn left	21:30
	→ hahuang65 joined	21:30
	→ stfn joined	21:30
	→ tarkus joined	21:30
	← tarkus left	21:30
	← orbyt_ left	21:31
	← TheFuzzball left	21:31
	→ orbyt_ joined	21:33
	← theskillwithin left	21:34
	← xcm left	21:34
	→ theskillwithin joined	21:34
	→ TheFuzzball joined	21:34
	→ xcm joined	21:34
	← grawity left	21:35
	← TheFuzzball left	21:35
	← test123456 left	21:35
	← dersand left	21:35
	→ grawity joined	21:35
	← afuentes left	21:36
	← gopar left	21:36
	→ gopar joined	21:37
	← thiago left	21:37
	→ Ploppz joined	21:37
	→ \drew joined	21:38
	← redtail left	21:38
	← wilbert_ left	21:40
	← Jak_o_Shadows left	21:40
Ploppz	I don't know if this is bad practice.. When I contribute to a repo and repeatedly add pull requests, I have a remote 'origin' which is my fork (on github) and 'upstream' is the upstream repository. Before making the pull request, I rebase so that my commits form only one commit. Then I push to 'origin' and make the pull request. Then I see a tiny thing that has to be changed, however, so I make a new tiny commit	21:40
	with the message ".". Then I do `git rebase @~~` and squash the tiny commit. Finally I do `git push --force origin mybranch`. In the end I end up force-pushing a lot to my fork. Is it better to just let there be tiny commits even in pull requests?	21:40
	Is this question better for #github?	21:40
mud	Ploppz: Usually you do sane commits for pull requests, and then if for some reason they want them squished, you do that right before someone accepts the PR. It depends on the project though. By the way, isn't that a longwinded way of doing 'git commit --amend' ?	21:42
	→ monomon[m] joined	21:42
mud	Also also, you probably don't have to specify so often where you're pushing to, 'git push -u origin stuff:stuff' and then you never have to specify again, which is good because -f makes things pretty sketchy, if you say it wrong it'll overwrite some other thing which will be annoying.	21:43
Ploppz	ah -u is a good idea	21:43
	← hahuang65 left	21:44
	→ Brain joined	21:44
Ploppz	git commit --amend.. yeah now I see the connection	21:44
	I used the latter only for revising commit messages	21:44
	doesn't it just do that?	21:44
	→ ribasushi joined	21:44
_ikke_	No, you can ammend everything in a commit	21:44
	← Cabanossi left	21:44
Ploppz	ok I'll have to try that next time. Thanks	21:44
	→ Cabanossi joined	21:45
Ploppz	does git push -u actually push any data, or is it just a local setting?	21:45
_ikke_	Ploppz: It depends on how large the change is, but I would rather prefer more smaller commits than one big commit	21:45
	→ EY joined	21:45
_ikke_	Ploppz: It does actually push data	21:45
	→ dave0x6d joined	21:45
	→ dilijev joined	21:46
Ploppz	Some repos' guidelines recommend one single commit per PR	21:46
_ikke_	I wonder how they review large PRs	21:46
	One big commit makes it harder to follow what changed imo	21:47
	→ Jak_o_Shadows joined	21:47
	← Jak_o_Shadows left	21:47
	→ Jak_o_Shadows joined	21:47
	← brent__ left	21:47
	← mud left	21:47
	→ raijin joined	21:47
	→ hahuang65 joined	21:48
	→ brent__ joined	21:48
	→ mud joined	21:48
	← \drew left	21:49
	← nixjdm left	21:49
Ploppz	perhaps I am mistaken and they suggest just rebasing (obviously)	21:49
_ikke_	Ploppz: I know some projects require squashing	21:50
	But I never understand it	21:50
	'better history' they say	21:50
	→ Musk_Nakamoto joined	21:50
_ikke_	but imo they loose a lot more than they gain	21:50
	← brent__ left	21:51
	→ brent__ joined	21:51
	← tymczenko left	21:52
	← Elon_Satoshi left	21:52
	→ belmoussaoui joined	21:52
	← dreiss left	21:53
	← EricPoe left	21:54
	→ scan joined	21:55
	← Dougie187 left	21:55
	← Musk_Nakamoto left	21:55
	← Es0teric left	21:55
	→ Gurkenglas_ joined	21:56
	← chachasmooth left	21:56
	→ Elon_Satoshi joined	21:56
	→ EvilPenguin joined	21:56
	← fission6 left	21:57
	→ dreiss joined	21:58
	← Gurkenglas left	21:58
	→ chachasmooth joined	21:58
	← ecuanaso left	21:58
	← IniGit left	21:59
	← lzybassi_ left	21:59
	← pbandark left	22:01
	← denimsoft left	22:01
	→ nixjdm joined	22:01
	← re1 left	22:01
	→ lzybassist joined	22:02
	→ cagomez joined	22:02
	← Mattiaslndstrm left	22:04
	→ Oatmeal joined	22:04
	← scan left	22:05
	← SwiftMatt left	22:06
	→ flo[m] joined	22:09
	→ M[m]6 joined	22:09
	→ olbat[m] joined	22:09
	→ primeos[m] joined	22:09
	→ reactormonk[m] joined	22:09
	→ nappy[m] joined	22:09
	→ unclechu joined	22:09
	→ UncleCJ joined	22:09
	→ dikiaap joined	22:09
	→ patrickr[m] joined	22:09
	→ spinningarrow[m] joined	22:09
	→ abithvijayan[m] joined	22:09
	→ hiq[m] joined	22:09
	→ dyce[m] joined	22:09
	→ waltervargas[m] joined	22:09
	→ heftig joined	22:09
	→ swalladge[m] joined	22:09
	→ aidalgol joined	22:09
	→ Demos[m] joined	22:09
	→ dreadful[m] joined	22:09
	→ Miguelngel[m] joined	22:09
	→ Techie[m] joined	22:09
	→ aviraldg joined	22:09
	→ Remramm joined	22:09
	→ am2on joined	22:09
	→ musicmatze[m] joined	22:09
	→ KevinMGranger joined	22:09
	→ ushaNg6i[m] joined	22:09
	→ JerkyMcJerkface[ joined	22:09
	← Disgeae left	22:11
	← BeerLover left	22:11
	→ BeerLover joined	22:13
	→ robattila256 joined	22:13
	← Anja_ left	22:13
	← hahuang65 left	22:14
	→ ContessaTP joined	22:15
	← ozcanesen left	22:18
	← svm_invictvs left	22:22
	→ Unconformed joined	22:24
Unconformed	hi	22:25
	→ svm_invictvs joined	22:25
	← dreiss left	22:25
	← peterbecich left	22:25
Unconformed	no more cli irc for me	22:25
	← Unconformed left	22:26
	← chachasmooth left	22:26
	← b0nn left	22:27
	→ Anja_ joined	22:27
	← kpease left	22:28
	→ redtail joined	22:28
	→ SwiftMatt joined	22:28
	→ chachasmooth joined	22:28
	← apotry left	22:29
	→ PioneerAxon_ joined	22:29
	← PioneerAxon left	22:30
	→ Flechette joined	22:30
	→ dreiss joined	22:32
	→ olalonde joined	22:33
	← ContessaTP left	22:34
	← nezen left	22:37
	← nixjdm left	22:40
	→ YuGiOhJCJ joined	22:43
	← darth_platypus left	22:43
	→ dtrott joined	22:44
	← cagomez left	22:45
	→ cagomez joined	22:46
	→ safe joined	22:49
	→ mikecmpbll joined	22:49
cjohnson	shame	22:51
	← sbeyer left	22:51
	→ lzybassi_ joined	22:54
	→ mizu_no_oto joined	22:54
	← overlord_tm left	22:55
	← wgrant left	22:56
	→ Guest15 joined	22:56
	← Anja_ left	22:56
	← lzybassist left	22:57
	← lzybassi_ left	22:58
	← NeverTired left	22:58
	→ belmoussaoui__ joined	22:59
	→ hahuang65 joined	22:59
	← energizer left	22:59
	→ energizer joined	22:59
	→ Anja_ joined	22:59
	← Ploppz left	23:00
	← belmoussaoui left	23:00
	belmoussaoui__ → belmoussaoui	23:01
	← Guest15 left	23:01
	← BeerLover left	23:01
	← Anja_ left	23:01
	← PioneerAxon_ left	23:02
	← finalbeta left	23:03
	← hahuang65 left	23:03
	→ Anja_ joined	23:04
	→ \drew joined	23:04
	→ PioneerAxon joined	23:04
	← ZyX-I left	23:04
	→ guampa joined	23:05
	← j08nY left	23:05
	← dege left	23:07
	← happy-dude left	23:07
	← \drew left	23:08
	→ \drew joined	23:08
	← CheckDavid left	23:08
	→ hahuang65 joined	23:10
	← Elon_Satoshi left	23:10
	← gopar left	23:11
	→ Elon_Satoshi joined	23:11
	→ gopar joined	23:11
	← xaa left	23:12
	→ aryon joined	23:14
	← hahuang65 left	23:14
	→ maestrojed joined	23:14
	← \drew left	23:16
	→ \drew joined	23:17
	← Anja_ left	23:17
	← PioneerAxon left	23:17
	← aryon left	23:17
	← dreiss left	23:18
maestrojed	I am having an odd auth error. Sometimes (once a week or so) all of a sudden when I interact with repos via SSH I start getting * Authorization Error or Repository Not Found *. I was interacting just a few minutes before with no issues. I confirm my public key is authorized on the remote server. I can connect with SSH without an error (this is why I am asking in #git). Typically I have to restart my laptop (OSX) to correct this. I	23:18
	can't explain this, Any ideas?	23:18
	← \drew left	23:18
	→ \drew joined	23:19
	→ PioneerAxon joined	23:19
	← msm left	23:20
	→ msm joined	23:20
	→ dreiss joined	23:22
	← mizu_no_oto left	23:22
	← \drew left	23:23
	Flechette → ContessaTP	23:23
cjohnson	what commands are you running when it happens maestrojed	23:23
	also does your ssh key have a passphrase	23:23
	← SwiftMatt left	23:24
	← gopar left	23:24
maestrojed	cjohnson I don't do a lot of complex stuff with git. Once the errors start they show for fetch and pull, at least (git pull origin branchName, git fetch origin, etc.).	23:25
	cjohnson no passphrase	23:25
	→ gopar joined	23:25
	← cdown left	23:25
maestrojed	cjohnson I just figured out how to add debugging on to ssh that spills out when I use git.	23:25
	→ \drew joined	23:25
	→ cdown joined	23:25
maestrojed	I am reading through this verbose now. (Similar to ssh -vvv)	23:25
	→ b0nn joined	23:26
	→ lzybassist joined	23:26
	→ masuberu joined	23:26
	← Elon_Satoshi left	23:28
	→ johnflux joined	23:28
	← johnflux left	23:28
	→ johnflux joined	23:28
	→ Elon_Satoshi joined	23:28
maestrojed	I think its the remote server personally. But I have opened tickets and they don't think so.	23:28
	← Cabanossi left	23:29
	← Gustavo6046 left	23:30
	← akushner___ left	23:30
	→ Cabanossi joined	23:30
	← lzybassist left	23:30
	← \drew left	23:31
	← Boobie left	23:31
	← dtrott left	23:32
	→ \drew joined	23:32
	→ Mattiaslndstrm joined	23:37
	← HcsOmot_ left	23:38
	← PioneerAxon left	23:39
	← masuberu left	23:39
	← netj left	23:42
	→ netj joined	23:42
	→ wxg joined	23:48
	← YuGiOhJCJ left	23:51
	← bitmod left	23:51
	← Sharker left	23:51
	← exotime left	23:51
	← dermoth left	23:51
	← msm left	23:51
	← Oatmeal left	23:51
	← Jak_o_Shadows left	23:51
	← EY left	23:51
	← reactormonk[m] left	23:51
	← Brain left	23:51
	← abithvijayan[m] left	23:51
	← ribasushi left	23:51
	← Remramm left	23:51
	← UncleCJ left	23:51
	← tvw left	23:51
	← _ADN_ left	23:51
	← linuxmodder left	23:51
	← salamanderrake left	23:51
	← savoir-faire left	23:51
	← Trel left	23:51
	← phinxy left	23:51
	← albel727 left	23:51
	← beerdrop left	23:51
	← donmichelangelo left	23:51
	← lkolstad left	23:51
	← iamthad left	23:51
	← sonOfRa left	23:51
	← AciD` left	23:51
	← kozy left	23:51
	← frobnic left	23:51
	← ssarah left	23:51
	← Hogofwar left	23:51
	← steven left	23:51
	← liste left	23:51
	← azwieg103 left	23:51
	← Xe left	23:51
	← peb` left	23:51
	← Pieter left	23:51
	← quarters left	23:51
	← meonkeys left	23:51
	← SkyPatrol left	23:51
	← plasticle left	23:51
	← qsx left	23:51
	← ^MillerBoss left	23:51
	← planigan left	23:51
	← ertes left	23:51
	← Peuc left	23:51
	← martybr left	23:51
	← Jackneill left	23:51
	← berndj left	23:51
	← adgtl left	23:51
	← dwmw2_gone left	23:51
	← meLon left	23:51
	← PeterReid left	23:51
	← hegge left	23:51
	← tribly left	23:51
	← Forkk left	23:51
	← Maple left	23:51
	← habbasi left	23:51
	← simon816 left	23:51
	← timewalker left	23:51
	← om_henners left	23:51
	← rk left	23:51
	← tobie left	23:51
	← smithbone left	23:51
	← rxo left	23:51
	← cworth left	23:51
	← bigjazzsound left	23:51
	← ghoti left	23:51
	← bremner left	23:51
	← gitinfo left	23:51
	← ochorocho_ left	23:51
	← AndreSomers left	23:51
	← pmn left	23:51
	← Arkaniad left	23:51
	← ojacobson left	23:51
	← forrestv left	23:51
	← quizzi left	23:51
	← swalladge left	23:51
	← relrod left	23:51
	← pizzaops left	23:51
	← BytesBacon left	23:51
	← telephone left	23:51
	← _flow_ left	23:51
	← kutenai left	23:51
	← dmj` left	23:51
	← DuncanT left	23:51
	← byte512 left	23:51
	← fury left	23:51
	← averell left	23:51
	← tjbp left	23:51
	← miklcct left	23:51
	← zifnab left	23:51
	← Ieuan left	23:51
	← Grum left	23:51
	← musca left	23:51
	← fieldmapper left	23:51
	← n\|nsei left	23:51
	← Cork left	23:51
	← ntnn left	23:51
	← marlinc left	23:51
	← dilfridge left	23:51
	← maxorator left	23:51
	← confluency left	23:51
	← tomek left	23:51
	← styler2go left	23:51
	← abra0 left	23:51
	← tomaw left	23:51
	← tilpner left	23:51
	← krabat left	23:51
	← stevenbenner left	23:51
	← hurricanehrndz left	23:51
	← shampine left	23:51
	← Kamilion left	23:51
	← dmc left	23:51
	← aviraldg left	23:51
	← dyce[m] left	23:51
	← weltall left	23:51
	← belmoussaoui left	23:51
	← cbonobo left	23:51
	← sammyo left	23:51
	← theoceaniscool left	23:51
	← xcesariox left	23:51
	← hvxgr_ left	23:51
	← hwoarang left	23:51
	← heroux left	23:51
	← styx_ left	23:51
	← lb1c left	23:51
	← kaldoran left	23:51
	← HurricaneHarry left	23:51
	← MACscr left	23:51
	← g0d355__ left	23:51
	← robertparkerx left	23:51
	← SpeakerToMeat left	23:51
	← askb left	23:51
	← nivag left	23:51
	← watersoul left	23:51
	← _Patrick_ left	23:51
	← kculpis left	23:51
	← rtjure left	23:51
	← snits left	23:51
	← infernix left	23:51
	← cite left	23:51
	← alyptik left	23:51
	← cyberz left	23:51
	← nicoulaj left	23:51
	← LeMike left	23:51
	← Peng_ left	23:51
	← BlackPanx left	23:51
	← bsanford left	23:51
	← chitopunk left	23:51
	← Incepti0n left	23:51
	← felixsanz left	23:51
	← thejoecarroll left	23:51
	← Razesdark left	23:51
	← apeiros left	23:51
	← deltam left	23:51
	← spritian left	23:51
	← valkyr2e left	23:51
	← Milos left	23:51
	← MajorPayne left	23:51
	← Daviey left	23:51
	← MissionCritical left	23:51
	← paskl left	23:51
	← AustinIncognito left	23:51
	← kanzure left	23:51
	← APic left	23:51
	← stux\|RC-only left	23:51
	← kaosine left	23:51
	← ColdKeyboard left	23:51
	← ewitz left	23:51
	← imMute left	23:51
	← mozzarella left	23:51
	← XVar left	23:51
	← thesquib left	23:51
	← butterthebuddha left	23:51
	← bambams left	23:51
	← mattp_ left	23:51
	← Jonno_FTW left	23:51
	← Kuukunen- left	23:51
	← soerenb left	23:51
	← hplar left	23:51
	← WebDawg left	23:51
	← Tykling left	23:51
	← Techie[m] left	23:51
	← KevinMGranger left	23:51
	← hiq[m] left	23:51
	← Miguelngel[m] left	23:51
	← spinningarrow[m] left	23:51
	← cdg left	23:51
	← morenoh149 left	23:51
	← BSAlb left	23:51
	← duderonomy left	23:51
	← TomyLobo left	23:51
	← frem left	23:51
	← MarioCanoli left	23:51
	← [Kid] left	23:51
	← Puffball left	23:51
	← SerusWork left	23:51
	← armyriad left	23:51
	← Wulf left	23:51
	← Cerise left	23:51
	← raffo left	23:51
	← visual left	23:51
	← fk left	23:51
	← dustinm left	23:51
	← scottjl left	23:51
	← thecomedian left	23:51
	← rnsanchez left	23:51
	← Loomaanaatii left	23:51
	← quite left	23:51
	← qqx left	23:51
	← SReject left	23:51
	← Shakeel_ left	23:51
	← thinkpad left	23:51
	← bket left	23:51
	← iota_pi left	23:51
	← ephemera_ left	23:51
	← johnlage left	23:51
	← MLM_____ left	23:51
	← rdz left	23:51
	← Pilfers left	23:51
	← ruskie left	23:51
	← parliament left	23:51
	← am55 left	23:51
	← Frogging101 left	23:51
	← bipolar left	23:51
	← hakzsam left	23:51
	← trelane left	23:51
	← DistantStar left	23:51
	← _cyril_ left	23:51
	← TooLmaN left	23:51
	← adamus1red left	23:51
	← tango_ left	23:51
	← Squarism left	23:51
	← kirb left	23:51
	← joeytwiddle left	23:51
	← AlgorithmWizard left	23:51
	← linuxdaemon left	23:51
	← rossome left	23:51
	← ejnahc left	23:51
	← qassim left	23:51
	← sudoman left	23:51
	← XDS2010 left	23:51
	← [diecast] left	23:51
	← elliottcable left	23:51
	← yena left	23:51
	← Orphis left	23:51
	← robinsmidsrod left	23:51
	← omnigoat left	23:51
	← daurnimator left	23:51
	← sebhoss left	23:51
	← bttf left	23:51
	← odamn left	23:51
	← \drew left	23:51
	← johnflux left	23:51
	← cdown left	23:51
	← svm_invictvs left	23:51
	← Walex left	23:51
	← sp33drac3r left	23:51
	← manithree left	23:51
	← SirPole left	23:51
	← bgerber left	23:51
	← Karazhan left	23:51
	← holodoc left	23:51
	← justan0theruser left	23:51
	← jab416171 left	23:51
	← ed_ left	23:51
	← a3Dman left	23:51
	← tchan left	23:51
	← cliluw left	23:51
	← przemoc left	23:51
	← Zialus left	23:51
	← MacWinner left	23:51
	← permalac left	23:51
	← Twyrfher left	23:51
	← Celelibi left	23:51
	← danmackay left	23:51
	← Peng left	23:51
	← cbreak left	23:51
	← Eryn_1983_FL left	23:51
	← lohfu left	23:51
	← rudi_s left	23:51
	← atomi left	23:51
	← rebrec left	23:51
	← hiroki left	23:51
	← thoros- left	23:51
	← Shavik` left	23:51
	← Mindi left	23:51
	← nikow left	23:51
	← jidar left	23:51
	← iveqy_ left	23:51
	← Renter_ left	23:51
	← robogoat_ left	23:51
	← roxlu left	23:51
	← TinkerTyper left	23:51
	← ExeciN left	23:51
	← tijensse left	23:51
	← leonarth_ left	23:51
	← hue left	23:51
	← Guest17892 left	23:51
	← chrisml left	23:51
	← tureba left	23:51
	← fibo_mach left	23:51
	← cyberzeus left	23:51
	← timvisher left	23:51
	← vishal left	23:51
	← hyperair left	23:51
	← markus-k left	23:51
	← brewmaster left	23:51
	← Lunatrius left	23:51
	← Dev0n left	23:51
	← jhattara left	23:51
	← jaeckel left	23:51
	← SlashLife left	23:51
	← jorj left	23:51
	← Map left	23:51
	← davidstrauss left	23:51
	← vdl left	23:51
	← Kronuz left	23:51
	← sns left	23:51
	← AndreasLutro left	23:51
	← tsunamie left	23:51
	← kini left	23:51
	← kevr left	23:51
	← sword left	23:51
	← Cybergeek left	23:51
	← Cosmo_ left	23:51
	→ savoir-faire joined	23:51
	→ Maple__ joined	23:51
	→ yaiyan joined	23:51
	→ liste joined	23:51
	→ orzo joined	23:51
	→ bigjazzsound joined	23:51
	→ pmn joined	23:51
	→ laumann joined	23:51
	→ tango_ joined	23:51
	→ qqx joined	23:52
	→ sudoman joined	23:52
	→ watersoul joined	23:52
	→ ^MillerBoss joined	23:52
	→ Squarism joined	23:52
	→ Puffball joined	23:52
	→ StephenS joined	23:52
	→ qassim joined	23:52
	→ rdz joined	23:52
	→ visual joined	23:52
	→ _ADN_ joined	23:52
	→ joeytwiddle joined	23:52
	→ morenoh149 joined	23:52
	→ raffo joined	23:52
	→ am55 joined	23:52
	→ robinsmidsrod joined	23:52
	→ SReject joined	23:52
	→ SerusWork joined	23:52
	→ dustinm joined	23:52
	→ [Kid] joined	23:52
	→ Orphis joined	23:52
	→ Virox joined	23:52
	→ Wulf joined	23:52
	→ ejnahc joined	23:52
	→ bket joined	23:52
	→ Cerise joined	23:52
	→ lkolstad joined	23:52
	→ bttf joined	23:52
	→ quite joined	23:52
	→ bipolar joined	23:52
	→ odamn joined	23:52
	→ Joost joined	23:52
	→ rnsanchez joined	23:52
	→ AlgorithmWizard joined	23:52
	→ trelane joined	23:52
	→ daurnimator joined	23:52
	→ swalladge joined	23:52
	→ cdg joined	23:52
	→ rossome joined	23:52
	→ tctara joined	23:52
	→ hakzsam joined	23:52
	→ boshhead joined	23:53
	→ DistantStar joined	23:53
	→ ephemera_ joined	23:53
	→ Gustavo6046 joined	23:53
	→ plasticle joined	23:53
	→ da5id joined	23:53
	→ thecomedian joined	23:53
	→ kutenai joined	23:53
	→ justan0theruser joined	23:53
	← jscob left	23:53
	← seitensei left	23:53
	→ parliament joined	23:53
	→ iota_pi joined	23:53
	→ adamf joined	23:53
	→ DuncanT joined	23:53
	← bladdezz left	23:54
	→ hsiktas joined	23:54
	→ dmj` joined	23:54
	→ yena joined	23:54
	→ MLM_____ joined	23:54
	→ pizzaops joined	23:54
	→ asedeno joined	23:54
	→ bladdezz joined	23:54
	→ frem joined	23:54
	→ aleb joined	23:54
	← prg318 left	23:54
	→ [diecast] joined	23:54
	→ elliottcable joined	23:54
	→ zeller joined	23:54
	→ hlieberman joined	23:54
	← guampa left	23:55
	→ sebhoss joined	23:55
	← monomon[m] left	23:55
	→ Iacobus joined	23:55
	→ omnigoat joined	23:55
	← am2on left	23:55
	→ kwmiebach joined	23:55
	→ kirb joined	23:55
	→ quadz joined	23:55
	→ belmoussaoui joined	23:55
	→ dyce[m] joined	23:55
	→ cbonobo joined	23:55
	→ sammyo joined	23:55
	→ theoceaniscool joined	23:55
	→ xcesariox joined	23:55
	→ hvxgr_ joined	23:55
	→ hwoarang joined	23:55
	→ heroux joined	23:55
	→ styx_ joined	23:55
	→ lb1c joined	23:55
	→ kaldoran joined	23:55
	→ HurricaneHarry joined	23:55
	→ MACscr joined	23:55
	→ robertparkerx joined	23:55
	→ SpeakerToMeat joined	23:55
	→ askb joined	23:55
	→ nivag joined	23:55
	→ stevenbenner joined	23:55
	→ hurricanehrndz joined	23:55
	→ _Patrick_ joined	23:55
	→ Kamilion joined	23:55
	→ shampine joined	23:55
	→ rtjure joined	23:55
	→ snits joined	23:55
	→ infernix joined	23:55
	→ cite joined	23:55
	→ alyptik joined	23:55
	→ cyberz joined	23:55
	→ LeMike joined	23:55
	→ dmc joined	23:55
	→ weltall joined	23:55
	→ Peng_ joined	23:55
	→ BlackPanx joined	23:55
	→ bsanford joined	23:55
	→ chitopunk joined	23:55
	→ Incepti0n joined	23:55
	→ felixsanz joined	23:55
	→ thejoecarroll joined	23:55
	→ Razesdark joined	23:55
	→ spritian joined	23:55
	→ apeiros joined	23:55
	→ deltam joined	23:55
	→ valkyr2e joined	23:55
	→ Milos joined	23:55
	→ MajorPayne joined	23:55
	→ Daviey joined	23:55
	→ paskl joined	23:55
	→ AustinIncognito joined	23:55
	→ APic joined	23:55
	→ stux\|RC-only joined	23:55
	→ kaosine joined	23:55
	→ ColdKeyboard joined	23:55
	→ ewitz joined	23:55
	→ imMute joined	23:55
	→ mozzarella joined	23:55
	→ XVar joined	23:55
	→ thesquib joined	23:55
	→ butterthebuddha joined	23:55
	→ bambams joined	23:55
	→ mattp_ joined	23:55
	→ Jonno_FTW joined	23:55
	→ Kuukunen- joined	23:55
	→ soerenb joined	23:55
	→ hplar joined	23:55
	→ WebDawg joined	23:55
	→ Tykling joined	23:55
	→ belak joined	23:55
	← ahrs left	23:55
	← aidalgol left	23:55
	← dikiaap left	23:55
	← musicmatze[m] left	23:55
	← ak102 left	23:55
	→ wizonesolutions joined	23:55
	← dyce[m] left	23:55
	← flo[m] left	23:55
	← unclechu left	23:55
	→ XDS2010 joined	23:55
	→ Captain_Beezay joined	23:55
	← dwts left	23:55
	← ushaNg6i[m] left	23:55
	← M[m]6 left	23:55
	← nappy[m] left	23:55
	← primeos[m] left	23:55
	← Demos[m] left	23:55
	→ graingert joined	23:55
	→ CEnnis91 joined	23:55
	← heftig left	23:55
	← elliottcable left	23:55
	→ thiago joined	23:55
	← hvxgr_ left	23:55
	← BlackPanx left	23:55
	← infernix left	23:55
	← stux\|RC-only left	23:55
	← Jonno_FTW left	23:55
	← APic left	23:55
	← belmoussaoui left	23:55
	← felixsanz left	23:55
	← rtjure left	23:55
	← Tykling left	23:55
	← mozzarella left	23:55
	← AustinIncognito left	23:55
	← alyptik left	23:55
	← WebDawg left	23:55
	← butterthebuddha left	23:55
	← xcesariox left	23:55
	→ ribasushi joined	23:55
	→ cmosguy joined	23:55
	← chu left	23:56
	→ Cosmo_ joined	23:56
	adams.freenode.net set mode: +v	23:56
	→ APic joined	23:56
	→ Ownix joined	23:56
	→ rodarmor joined	23:56
	← patrickr[m] left	23:56
	← olbat[m] left	23:56
	← JerkyMcJerkface[ left	23:56
	← dreadful[m] left	23:56
	← swalladge[m] left	23:56
	← orbyt_ left	23:56
	→ hvxgr_ joined	23:56
	→ Jonno_FTW joined	23:56
	→ shennyg joined	23:56
	→ Cork joined	23:56
	→ ntnn joined	23:56
	→ marlinc joined	23:56
	→ dilfridge joined	23:56
	→ maxorator joined	23:56
	→ confluency joined	23:56
	→ tomek joined	23:56
	→ styler2go joined	23:56
	→ abra0 joined	23:56
	→ tomaw joined	23:56
	→ tilpner joined	23:56
	→ krabat joined	23:56
	→ rtjure joined	23:56
	→ stux\|RC-only joined	23:56
	→ BlackPanx joined	23:56
	→ angular_mike_ joined	23:56
	→ elliottcable joined	23:56
	→ msm joined	23:56
	→ Jak_o_Shadows joined	23:56
	→ EY joined	23:56
	→ Brain joined	23:56
	→ tvw joined	23:56
	→ salamanderrake joined	23:56
	→ Trel joined	23:56
	→ phinxy joined	23:56
	→ beerdrop joined	23:56
	→ donmichelangelo joined	23:56
	→ iamthad joined	23:56
	→ sonOfRa joined	23:56
	→ WABLKCK joined	23:56
	→ kozy joined	23:56
	→ frobnic joined	23:56
	→ meonkeys joined	23:56
	→ peb` joined	23:56
	→ azwieg103 joined	23:56
	→ Pieter joined	23:56
	→ quarters joined	23:56
	→ qsx joined	23:56
	→ planigan joined	23:56
	→ ertes joined	23:56
	→ Peuc joined	23:56
	→ martybr joined	23:56
	→ Jackneill joined	23:56
	→ berndj joined	23:56
	→ adgtl joined	23:56
	→ dwmw2_gone joined	23:56
	→ meLon joined	23:56
	→ PeterReid joined	23:56
	→ hegge joined	23:56
	→ tribly joined	23:56
	→ Forkk joined	23:56
	→ habbasi joined	23:56
	→ simon816 joined	23:56
	→ timewalker joined	23:56
	→ om_henners joined	23:56
	→ rk joined	23:56
	→ tobie joined	23:56
	→ smithbone joined	23:56
	→ rxo joined	23:56
	→ cworth joined	23:56
	→ ghoti joined	23:56
	→ bremner joined	23:56
	→ gitinfo joined	23:56
	→ ochorocho_ joined	23:56
	adams.freenode.net set mode: +o	23:56
	→ AndreSomers joined	23:56
	→ Arkaniad joined	23:56
	→ ojacobson joined	23:56
	→ forrestv joined	23:56
	→ quizzi joined	23:56
	→ relrod joined	23:56
	→ BytesBacon joined	23:56
	→ telephone joined	23:56
	→ _flow_ joined	23:56
	→ fury joined	23:56
	→ miklcct joined	23:56
	→ zifnab joined	23:56
	→ Grum joined	23:56
	→ musca joined	23:56
	→ fieldmapper joined	23:56
	→ n\|nsei joined	23:56
	→ ulkesh joined	23:56
	→ RiPer joined	23:56
	→ devhost joined	23:56
	→ JelmerD joined	23:56
	→ Tykling joined	23:56
	← waltervargas[m] left	23:56
	← elliottcable left	23:56
	→ elliottcable joined	23:56
	→ belmoussaoui joined	23:56
	→ ionelmc joined	23:56
	→ \drew joined	23:56
	→ johnflux joined	23:56
	→ cdown joined	23:56
	→ svm_invictvs joined	23:56
	→ Walex joined	23:56
	→ sp33drac3r joined	23:56
	→ manithree joined	23:56
	→ SirPole joined	23:56
	→ Zialus joined	23:56
	→ bgerber joined	23:56
	→ Karazhan joined	23:56
	→ holodoc joined	23:56
	→ jab416171 joined	23:56
	→ ed_ joined	23:56
	→ a3Dman joined	23:56
	→ tchan joined	23:56
	→ cliluw joined	23:56
	→ przemoc joined	23:56
	→ MacWinner joined	23:56
	→ permalac joined	23:56
	→ Twyrfher joined	23:56
	→ Celelibi joined	23:56
	→ danmackay joined	23:56
	→ Peng joined	23:56
	→ cbreak joined	23:56
	→ Eryn_1983_FL joined	23:56
	→ lohfu joined	23:56
	→ rudi_s joined	23:56
	→ atomi joined	23:56
	→ rebrec joined	23:56
	→ thoros- joined	23:56
	→ hiroki joined	23:56
	→ Shavik` joined	23:56
	→ Mindi joined	23:56
	→ nikow joined	23:56
	→ jidar joined	23:56
	→ iveqy_ joined	23:56
	→ Renter_ joined	23:56
	→ robogoat_ joined	23:56
	→ roxlu joined	23:56
	→ TinkerTyper joined	23:56
	→ tijensse joined	23:56
	→ leonarth_ joined	23:56
	→ hue joined	23:56
	→ Guest17892 joined	23:56
	→ chrisml joined	23:56
	→ tureba joined	23:56
	→ fibo_mach joined	23:56
	→ cyberzeus joined	23:56
	→ timvisher joined	23:56
	→ vishal joined	23:56
	→ hyperair joined	23:56
	→ markus-k joined	23:56
	→ jhattara joined	23:56
	→ brewmaster joined	23:56
	→ Lunatrius joined	23:56
	→ Dev0n joined	23:56
	→ jaeckel joined	23:56
	→ SlashLife joined	23:56
	→ jorj joined	23:56
	→ Cybergeek joined	23:56
	→ Map joined	23:56
	→ davidstrauss joined	23:56
	→ vdl joined	23:56
	→ Kronuz joined	23:56
	→ sns joined	23:56
	→ AndreasLutro joined	23:56
	→ tsunamie joined	23:56
	→ kini joined	23:56
	→ kevr joined	23:56
	→ sword joined	23:56
	→ zeroed joined	23:56
	→ Ankhers joined	23:56
	→ evil-god joined	23:56
	→ naf joined	23:56
	→ midnightmagic joined	23:56
	→ Gabemo joined	23:56
	→ BooK_ joined	23:56
	→ tterrag joined	23:56
	→ db` joined	23:56
	→ PaulePanter joined	23:56
	→ Jguy joined	23:56
	→ rogerraymond joined	23:56
	→ Soliton joined	23:56
	→ Mekkis_ joined	23:56
	→ bond joined	23:56
	→ kloeri joined	23:56
	← Cosmo_ left	23:56
	← MuffinMedic left	23:56
	← atomi left	23:56
	← svm_invictvs left	23:56
	← Zialus left	23:56
	← Map left	23:56
	← kini left	23:56
	← Guest17892 left	23:56
	← lohfu left	23:56
	← nikow left	23:56
	← hue left	23:56
	← timvisher left	23:56
	← a3Dman left	23:56
	← cliluw left	23:56
	← phinxy left	23:56
	← devhost left	23:56
	← beerdrop left	23:56
	← ghoti left	23:56
	← cagomez left	23:57
	→ ghoti joined	23:57
	→ mozzarella joined	23:57
	→ Zialus joined	23:57
	← Cork left	23:57
	← ntnn left	23:57
	← marlinc left	23:57
	← dilfridge left	23:57
	← maxorator left	23:57
	← confluency left	23:57
	← tomek left	23:57
	← styler2go left	23:57
	← abra0 left	23:57
	← tomaw left	23:57
	← tilpner left	23:57
	← krabat left	23:57
	→ phinxy joined	23:57
	→ timvisher joined	23:57
	→ Xe joined	23:57
	← stevenbenner left	23:57
	← hurricanehrndz left	23:57
	← shampine left	23:57
	← Kamilion left	23:57
	← dmc left	23:57
	← kirb left	23:57
	← weltall left	23:57
	← quadz left	23:57
	← cbonobo left	23:57
	← sammyo left	23:57
	← theoceaniscool left	23:57
	← hwoarang left	23:57
	← heroux left	23:57
	← styx_ left	23:57
	← lb1c left	23:57
	← kaldoran left	23:57
	← HurricaneHarry left	23:57
	← MACscr left	23:57
	← robertparkerx left	23:57
	← SpeakerToMeat left	23:57
	← askb left	23:57
	← nivag left	23:57
	← _Patrick_ left	23:57
	← snits left	23:57
	← cite left	23:57
	← cyberz left	23:57
	← LeMike left	23:57
	← Peng_ left	23:57
	← bsanford left	23:57
	← chitopunk left	23:57
	← Incepti0n left	23:57
	← thejoecarroll left	23:57
	← Razesdark left	23:57
	← apeiros left	23:57
	← deltam left	23:57
	← spritian left	23:57
	← valkyr2e left	23:57
	← Milos left	23:57
	← MajorPayne left	23:57
	← Daviey left	23:57
	← paskl left	23:57
	← kaosine left	23:57
	← ColdKeyboard left	23:57
	← ewitz left	23:57
	← imMute left	23:57
	← XVar left	23:57
	← thesquib left	23:57
	← bambams left	23:57
	← mattp_ left	23:57
	← Kuukunen- left	23:57
	← soerenb left	23:57
	← hplar left	23:57
	→ ak102 joined	23:57
	→ ggherdov joined	23:57
	→ Map joined	23:57
	← phinxy left	23:57
	→ a3Dman joined	23:57
	→ SkyPatrol joined	23:57
	→ beerdrop joined	23:57
	→ devhost joined	23:58
	→ jason237 joined	23:58
	← elliottcable left	23:58
	→ lohfu joined	23:58
	← sim590 left	23:58
	← themayor left	23:58
	← Derperperd left	23:58
	← daynaskully left	23:58
	← ollien left	23:58
	→ elliottcable joined	23:58
	← bwn left	23:59
	→ chu joined	23:59
	→ Pilfers joined	23:59
	→ nikow joined	23:59
	← ygeLN left	23:59
	→ atomi joined	23:59
	→ ollien joined	23:59
	→ kirb joined	23:59
	→ quadz joined	23:59
	→ cbonobo joined	23:59
	→ sammyo joined	23:59
	→ theoceaniscool joined	23:59
	→ hwoarang joined	23:59
	→ heroux joined	23:59
	→ styx_ joined	23:59
	→ lb1c joined	23:59
	→ kaldoran joined	23:59
	→ HurricaneHarry joined	23:59
	→ MACscr joined	23:59
	→ robertparkerx joined	23:59
	→ SpeakerToMeat joined	23:59
	→ askb joined	23:59
	→ nivag joined	23:59
	→ stevenbenner joined	23:59
	→ hurricanehrndz joined	23:59
	→ _Patrick_ joined	23:59
	→ Kamilion joined	23:59
	→ shampine joined	23:59
	→ snits joined	23:59
	→ cite joined	23:59
	→ cyberz joined	23:59
	→ LeMike joined	23:59
	→ dmc joined	23:59
	→ weltall joined	23:59
	→ Peng_ joined	23:59
	→ bsanford joined	23:59
	→ chitopunk joined	23:59
	→ Incepti0n joined	23:59
	→ thejoecarroll joined	23:59
	→ Razesdark joined	23:59
	→ spritian joined	23:59
	→ apeiros joined	23:59
	→ deltam joined	23:59
	→ valkyr2e joined	23:59
	→ Milos joined	23:59
	→ MajorPayne joined	23:59
	→ Daviey joined	23:59
	→ paskl joined	23:59
	→ kaosine joined	23:59
	→ ColdKeyboard joined	23:59
	→ ewitz joined	23:59
	→ imMute joined	23:59
	→ XVar joined	23:59
	→ thesquib joined	23:59
	→ bambams joined	23:59
	→ mattp_ joined	23:59
	→ Kuukunen- joined	23:59
	→ soerenb joined	23:59
	→ hplar joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation