IRCloggy #git 2016-08-07

Provider of IRC logs since 2005.

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

	2016-08-07
	← mablae_ left	00:01
	→ magicTurtle joined	00:05
	→ tesuji_ joined	00:05
	→ sargas joined	00:06
	→ ytl_ joined	00:06
	← tesuji left	00:06
	← Seveas left	00:07
	→ Seveas joined	00:07
	→ interne7y joined	00:07
Vampire0	damjan, you only have to add --tags to get tags in branches you are not fetching. One software I regularly fetch (I forgot which right now) does not have the tags in the branches, but commits unique to the tag, so those tags are only fetched if I fetch with --tags	00:08
	← ytl left	00:08
	→ IWishIKnew joined	00:09
	→ sargas_ joined	00:11
	← sargas_ left	00:11
	← interne7y left	00:12
	→ JanC_ joined	00:13
	← sargas left	00:13
	JanC → Guest32764	00:14
	JanC_ → JanC	00:14
	← magicTurtle left	00:14
	→ arescorpio joined	00:15
	← Guest32764 left	00:15
	← SwiftMatt left	00:16
	← Ewtl left	00:16
	→ valar joined	00:16
	← IWishIKnew left	00:16
	→ SwiftMatt joined	00:17
	→ Lyqyd joined	00:18
	← Seveas left	00:19
	← garethdaine left	00:19
	← cyphase left	00:20
	→ Seveas joined	00:20
	→ crose joined	00:20
	← jaequery left	00:21
	← crose left	00:21
	→ fuchstronaut joined	00:21
	→ aidalgol joined	00:22
	← Barteks2x left	00:23
	→ Goplat joined	00:24
	→ ShekharReddy joined	00:24
	← fuchstronaut left	00:26
	← SwiftMatt left	00:28
	→ sd512 joined	00:29
	← Lyqyd left	00:29
	→ cyphase joined	00:29
sd512	Hello, If i have forked another repository, how to I bring the latest changes from the "parent" project into my fork?	00:31
	(on git hub if it matters)	00:31
damjan	sd512: add a new remote	00:32
	→ m0viefreak joined	00:32
damjan	pul or fetchl remote branch into a local branch	00:32
	then either rebase or merge that branch into yours	00:33
	→ SwiftMatt joined	00:34
	→ hahuang65 joined	00:35
sd512	damjan, ok thanks. do you know if that is something I can do from the github website, or do I run that on my local copy only?	00:36
damjan	on your local	00:36
	→ stevenbenner joined	00:36
	← stevenbenner left	00:36
	→ stevenbenner joined	00:38
	→ spudowiar joined	00:38
	gitinfo set mode: +v	00:38
	← Seveas left	00:39
	← hahuang65 left	00:40
	→ Seveas joined	00:40
	← Seveas left	00:41
	→ ash_workz joined	00:41
	→ Seveas joined	00:42
	← Seveas left	00:42
	→ Seveas joined	00:45
	← ksolv left	00:46
	← FelixVi left	00:47
	← ArchNoob left	00:48
	← wgrant left	00:50
	→ livingstn joined	00:50
	← valar left	00:52
	← darkbit left	00:55
	← Maple__ left	01:00
	→ Maple__ joined	01:02
	← jstein left	01:04
	→ Dougie187 joined	01:09
	← xaa left	01:10
	→ wxg joined	01:16
	← Vampire0 left	01:20
	← durham left	01:22
	→ valar joined	01:24
	← cagedwisdom left	01:24
	→ wgrant joined	01:25
	← pks left	01:30
	← wxg left	01:31
	→ pks joined	01:31
	← xlegoman left	01:31
	→ Lyqyd joined	01:34
	← sangy left	01:36
	→ hahuang65 joined	01:36
	← hahuang65 left	01:41
	→ wxg joined	01:44
	← ilbot3 left	01:46
	← ahmedelgabri left	01:46
	→ unbalancedparen joined	01:46
	→ zynx joined	01:47
	→ ilbot3 joined	01:48
	→ dreiss joined	01:49
	← d^sh left	01:51
	→ d^sh joined	01:52
	→ BSaboia joined	01:58
	← zacts left	02:00
	→ jaequery joined	02:00
	→ interne7y joined	02:09
	← ResidentBiscuit left	02:09
	→ magicTurtle joined	02:11
	← dreiss left	02:11
	→ dreiss joined	02:12
	← interne7y left	02:13
	→ trelane joined	02:16
	← trelane left	02:16
	→ trelane joined	02:16
	→ sdothum joined	02:17
	← frogonwheels left	02:17
	← magicTurtle left	02:17
	→ claudiop joined	02:17
claudiop	Hi. Lets say that I have my dotfiles on git, and there is a branch for the Laptop, another for the Desktop, with slight modifications such as the display settings. Can I commit to every single branch at the same without merging them (invalidating the specific settings)?	02:20
	And will the commits be in duplicate?	02:20
	→ fuchstronaut joined	02:23
	→ sangy joined	02:24
	← fuchstronaut left	02:28
	→ kam270 joined	02:28
	→ Orbitrix joined	02:29
	→ realz joined	02:29
	← valar left	02:29
	→ mischat joined	02:30
	← kam270 left	02:30
	→ kam270 joined	02:31
	← unreal left	02:32
	← kam270 left	02:32
	→ kam270 joined	02:33
	← jaequery left	02:33
	→ frogonwheels joined	02:34
	← kam270 left	02:34
	→ ljc joined	02:35
	← mischat left	02:35
	→ kam270 joined	02:36
	← kam270 left	02:37
	→ hahuang65 joined	02:37
	→ kam270 joined	02:37
	← frogonwheels left	02:38
	← kam270 left	02:38
	→ kam270 joined	02:39
	← unbalancedparen left	02:40
	← kam270 left	02:40
	→ kam270 joined	02:41
	← hahuang65 left	02:42
	← harish_ left	02:42
	← kam270 left	02:43
	← sagerdearia left	02:43
	→ clevodearia joined	02:43
	→ moneylotion joined	02:43
	→ zumba_addict joined	02:43
	← Dougie187 left	02:44
moneylotion	hey, i was using phabricator on an old machine, but wondering if there are any simpler alternatives out there??? i want to be able to virtually parse commits, more than git log, or git diff	02:44
	← hexagoxel left	02:44
	← Derperperd left	02:46
	→ Derperperd joined	02:47
	→ lagothrix joined	02:47
	→ Limes__ joined	02:49
HedgeMage	moneylotion: Can you tell us exactly which subset of phabricator's features you want/need? It's kind of a monster.	02:49
moneylotion	i really only need to view commits, and track developments	02:50
	← skylite left	02:50
	← lagothri1 left	02:50
	→ hexagoxel joined	02:51
moneylotion	hedgemage, i was looking at gitlab, and it looks a bit lighter weight compared to phab	02:52
	← Maple__ left	02:52
	→ skylite joined	02:53
	→ linuxmint joined	02:53
	← SwiftMatt left	02:55
	→ harish_ joined	02:56
	→ SwiftMatt joined	02:57
	← ljc left	02:58
	← chachasmooth left	02:58
	← dreiss left	03:00
	→ chachasmooth joined	03:00
	← SwiftMatt left	03:07
	← zumba_addict left	03:08
	→ SwiftMatt joined	03:09
	→ zumba_addict joined	03:10
	→ leehambley joined	03:14
	← diegoviola left	03:14
	← leehambley left	03:16
	← mikecmpbll left	03:18
	→ leehambley joined	03:18
	← Izabia left	03:19
	→ Izabia joined	03:19
	← SwiftMatt left	03:19
	→ SwiftMatt joined	03:21
	→ fuchstronaut joined	03:24
	→ fahadash joined	03:24
	→ fstd_ joined	03:24
	← fuchstronaut left	03:28
	← fstd left	03:28
	fstd_ → fstd	03:28
	← SwiftMatt left	03:31
	→ xall joined	03:32
	→ zacts joined	03:32
	→ SwiftMatt joined	03:33
	← diphtherial left	03:35
	→ hahuang65 joined	03:38
	← snowkidind left	03:40
	← zacts left	03:41
	← hahuang65 left	03:42
	← SwiftMatt left	03:43
	← Sazhen86 left	03:44
	→ SwiftMatt joined	03:45
	← dsdeiz left	03:45
	← Fabricio20 left	03:48
	→ nettoweb joined	03:52
	← NeonSynth left	03:52
	→ akitada joined	03:52
	→ stoopkid joined	03:53
	← SwiftMatt left	03:55
	→ fairuz joined	03:57
HedgeMage	moneylotion: If you're just looking for the web UI for your git repo, yes gitlab should fit the bill nicely.	03:58
	← leehambley left	03:58
	→ tinajohnson___ joined	03:58
	← zumba_addict left	03:58
HedgeMage	moneylotion: there are some other phabricator features gitlab doesn't have...but if you aren't using them, there's no sense in dealing with the associated overhead IMO	03:58
	← semantipc left	03:59
	→ kadoban joined	03:59
	← thecomedian left	04:00
	← kadoban left	04:00
	→ kadoban joined	04:00
	→ thecomedian joined	04:02
	← vdv left	04:02
	→ vdv joined	04:03
	→ frogonwheels joined	04:05
	→ semantipc joined	04:05
	→ cdown joined	04:06
	← kisonecat left	04:07
	← semantipc left	04:08
	→ gtristan joined	04:08
	→ interne7y joined	04:09
	→ MrWoohoo joined	04:11
	← madewokherd left	04:11
	→ leehambley joined	04:11
	← cdown left	04:12
	→ semantipc joined	04:13
	← interne7y left	04:14
	← lolmac left	04:17
	→ shmuli joined	04:18
	← shmuli left	04:19
	→ xlegoman joined	04:21
	→ lolmac joined	04:21
	← tango_ left	04:22
	→ cdown joined	04:24
	→ fuchstronaut joined	04:24
	→ tango_ joined	04:28
	← fuchstronaut left	04:29
	← nivag left	04:31
	← Cabanossi left	04:31
	→ nivag joined	04:31
	← arescorpio left	04:33
	→ SwiftMatt joined	04:34
	→ Cabanossi joined	04:34
	← gfixler2 left	04:37
	→ jaequery joined	04:37
	→ gfixler joined	04:38
	← nettoweb left	04:38
	gitinfo set mode: +v	04:38
	→ hahuang65 joined	04:39
	← fairuz left	04:39
	← cdown left	04:40
	← Shentino left	04:40
	→ mattsl joined	04:40
	→ fairuz joined	04:40
	← sdothum left	04:42
	← hahuang65 left	04:43
	→ zacts joined	04:43
	← SwiftMatt left	04:44
	← qpdb left	04:44
	→ SwiftMatt joined	04:46
	← languitar left	04:47
	→ languitar joined	04:47
mattsl	I'm using a third party django app that has a small bugfix that is very simple and I need it. I only know the bare minimum of git. Is there a way to apply just that one patch?	04:48
	It's just 3 lines, so I can just copy and paste the changes into my lib source, but that seems really messy.	04:50
kadoban	mattsl: Where is the "patch" you want to apply, and in what format is it? Is it really a .patch file? Those aren't specific to git.	04:51
mattsl	kadoban: It's just a commit that was made to the master.	04:52
	kadoban: I'm assuming I can't really do anything with that without applying everything that may have come before it?	04:52
kadoban	mattsl: 'git cherry-pick' is probably what you want then, you just specify a commit you want to copy over to whatever branch you're on.	04:52
mattsl	Oh, nice. But that doesn't work if I installed via, pip, right?	04:53
	← jaequery left	04:53
	← SwiftMatt left	04:53
kadoban	I doubt it. You're just working with sourcecode at that point and would have to build and install it however.	04:54
	→ SwiftMatt joined	04:54
	← SwiftMatt left	04:55
mattsl	Ok. Thanks. So in theory, if I wanted to keep it as clean as possible, I could install the lastest stable via git instead of pip and then cherry-pick that one commit?	04:55
kadoban	I guess? I don't really know pip at all.	04:55
	← eka left	04:57
mattsl	Well the "problem" is that pip will just install the numbered releases. So it doesn't have all the bleeding edge patches. However, I don't want everything, I want the stable version plus this one minor fix.	04:57
kadoban	Sounds right then	04:58
mattsl	Cool. Thanks. My Googling wasn't getting me the cherry-pick for some reason.	04:59
	→ Shentino joined	04:59
	→ zumba_addict joined	04:59
kadoban	Yeah, git has a lot of parts, and cherry-pick is not necessarily in the toolbox an absolute beginner would use very much (usually you want to merge or rebase)	05:01
	← m0viefreak left	05:01
	← Shentino left	05:02
	← rivarun left	05:05
	← ash_workz left	05:05
	→ Shentino joined	05:05
	→ rivarun joined	05:05
bremner	cherry-pick is actually a bit less confusing / powerful than rebase IMHO	05:06
	→ phaleth joined	05:10
	← madebymarkca left	05:11
	← CheckDavid left	05:13
	← moei left	05:13
	← xall left	05:14
kadoban	It is, but it's still not really part of the really basic toolset. Of course neither necessarily are merges or rebases, but people tend to learn those first, since they're a part of a lot of basic workflows.	05:19
	← stoopkid left	05:20
	→ freimatz joined	05:20
	→ jaequery joined	05:21
	← jaequery left	05:22
	→ jaequery joined	05:23
	→ stoopkid joined	05:23
	→ fuchstronaut joined	05:25
	← jaequery left	05:27
	→ jaequery joined	05:27
	→ st0opkid joined	05:28
	← jaequery left	05:29
	← fuchstronaut left	05:30
	→ ae__ joined	05:31
	← stoopkid left	05:31
	← fahadash left	05:33
	← claudiop left	05:33
	← semantipc left	05:35
	→ leeN joined	05:36
	→ soham joined	05:37
DANtheBEASTman	is there a way to 'cherry-pick' lines for a commit, without resorting to git gui or manually editing patches?	05:38
	→ semantipc joined	05:38
	→ hahuang65 joined	05:39
kadoban	DANtheBEASTman: 'git add -p' perhaps?	05:41
DANtheBEASTman	ah, that' what i'm having trouble with, it only wants to add in hunks and i only want to commit a single line, the rest in a different commit	05:42
kadoban	If you want more granular than it'll do by specifying you want to 's'plit the hunk it's asking you about, you'll have to manually 'e'dit it.	05:43
DANtheBEASTman	bah, i'm perpetually messing up the patch	05:43
tango_	I find that a UI tool in this case can be very helpful, for what it's worth	05:44
	even a TUI like tig	05:44
	← hahuang65 left	05:44
DANtheBEASTman	oo tig i haven't used that. `git gui` is complaining about my font choice, says Error in startup script: expected integer but got "Sans" (database entry for "-font" in widget ".branch.l1")	05:45
	if this were a bash script i'd think someone forgot their quotes, but this is my first time looking at tcl source	05:46
tango_	DANtheBEASTman: tig is my go-to "graphical" tool for git. very practical for these little things	05:49
	an alternative would be something like the fugitive plugin for vim, if that's your editor	05:49
	← zacts left	05:50
DANtheBEASTman	y'know, i do have fugitive installed (and probably half a dozen other plugins for git that i have yet to fully grok) but i never actually use it	05:50
tango_	I mostly don't use it either	05:50
	I only remember about it when I need to revert some edit	05:51
	→ zacts joined	05:51
tango_	often I actually switch to a different terminal and run git diff to even just see what I changed 8-)	05:51
boombatower	what was the new diff feature related to space boundaries?	05:51
tango_	not exactly smart of me 8-P	05:51
boombatower	can't seem to find anything in docs	05:51
	← netj left	05:51
	← fairuz left	05:51
	→ netj joined	05:52
tango_	boombatower: what do you mean by space boundaries?	05:52
	→ xall joined	05:52
boombatower	hmm, perhaps --compaction-heuristic	05:52
DANtheBEASTman	i've been trying to 'git gud' with just using `git` from the shell, but manually editing patches is so tedious.. i just want to add a single line, you'd think it wouldn't need a lot of fuss..	05:52
	→ eka joined	05:52
boombatower	tango_: something about not diffing outside of a function or something to try and improve diffs	05:52
	ie where therre was a blank line or somehting	05:53
	I remember reading in release notes a little while back	05:53
	I have what I believe is a good test case, but can't seem to find it	05:53
tango_	boombatower: interesting, never heard about it though so I can't help	05:53
	DANtheBEASTman: well add interactive, edit chunk, remove everything but context and extra line	05:54
	or tig, enter add mode, 1 on the line you want to add 8-D	05:54
	→ fairuz joined	05:55
boombatower	tango_: this looks like it "beautiful diffs" https://github.com/blog/2188-git-2-9-has-been-released	05:55
	→ snowkidind joined	05:55
	← freimatz left	05:55
	← shinnya left	05:55
boombatower	unfortunately my case isn't affected	05:55
	:(	05:56
	show removing an entire function	05:56
	which is untouched (added back	05:56
	crappy diff	05:56
	oh well	05:56
DANtheBEASTman	tango_: yeah currently trying to figure out how to add with tig	05:57
	← fairuz left	05:57
boombatower	never seen a diff this misleading	05:58
	I see why it's doing it, but really bad	05:58
	← l4v2 left	05:59
	← Gamecubic left	06:00
	← sangy left	06:00
DANtheBEASTman	ahh, i just figured out how to git gud. git config --global alias.gud 'commit -a -m "git gud"'	06:00
	← gtristan left	06:00
	DANtheBEASTman apologizes for the memes	06:01
tango_	boombatower: if it's not private code you might see if the mailing list has help to offer	06:01
boombatower	tango_: yeah, see what you think. https://github.com/symfony/symfony/pull/19558/files	06:01
	note the close() addition	06:01
	it is actually untouched	06:02
	but since the setInput() is pulled from constructor	06:02
	it decided to represent it that way	06:02
	I guess I could just reorder it	06:02
	but seems silly	06:02
	→ fairuz joined	06:02
tango_	boombatower: can't actually have a look at it now, sorry, but thanks, I'm curious to see what happens	06:03
	tango_ has had his fair share of funky merges doing all sorts of silly things	06:03
boombatower	to be clear, nothing is "incorrect"	06:04
	just a very misleading diff	06:04
	tango_ is currently in console and without a mouse, so clicking on links is non-trivial	06:05
tango_	hm let me see if I can arrange something with tmux and elinks	06:06
	does github work with elinks I wonder 8-D	06:06
	← Celelibi left	06:06
boombatower	tango_: for a text version https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/19558.patch	06:06
	← mkoskar left	06:07
tango_	hm I always enter tmux's selection mode by mistake, and how I don't remember how it's done, lol	06:08
	just a sec	06:08
	← felher left	06:08
	→ sto0pkid joined	06:10
	→ interne7y joined	06:10
tango_	boombatower: so what exactly should I be looking for?	06:12
boombatower	tango_: close() appears to be added, but it is infact untouched	06:12
	reason being constructor was moved into setInput()	06:12
	and called fromt there	06:13
	close() was in between constructor and new function	06:13
	so it kinda nuked it and added it back to keep constructor body	06:13
tango_	oh I see now	06:13
boombatower	nothing wrong, just very hard to read	06:13
	← st0opkid left	06:13
boombatower	if I put setInput above close()	06:13
	I imagine it'd look at a lot better	06:13
tango_	what do other diff algorithms think of it?	06:13
boombatower	tango_: tried them all and got same	06:14
	including the new deal	06:14
tango_	hm	06:14
	boombatower: do ask on the ML	06:14
	they might have a hint	06:14
boombatower	alright	06:14
	← interne7y left	06:14
	→ mkoskar joined	06:15
	← snowkidind left	06:16
DANtheBEASTman	tango_: speaking of hints, care to share the trick for using tig to stage changes? can't seem to find adding anywhere in the man page or in the :help	06:16
	← zacts left	06:16
	→ Celelibi joined	06:16
	← Codfection left	06:19
tango_	DANtheBEASTman: as I said I'm a bit limited now but IIRC 's' brings you to the status view where you can do things such as stage/unstage files/hunks/lines	06:20
	not entirely sure it's s	06:21
	even just <enter> on the Unstaged changes in the main view might do it	06:21
	→ Codfection joined	06:24
tango_	on an unrelated note, if anybody has experience with a robust esata and/or usb3 jbod with at least 4 bays, suggestions welcome	06:26
	→ fuchstronaut joined	06:26
	→ stoopkid joined	06:26
	← Mannn left	06:27
	← xlegoman left	06:27
	← sto0pkid left	06:29
	→ flavster joined	06:29
	← zynx left	06:30
	← jeffreylevesque left	06:30
	← fuchstronaut left	06:31
	← Codfection left	06:32
	→ Aljone joined	06:35
	→ Codfection joined	06:36
	← fairuz left	06:39
	→ hahuang65 joined	06:40
	← piling left	06:43
	→ Fabricio20 joined	06:44
	← leehambley left	06:45
	← hahuang65 left	06:45
	→ OnBrokenWings joined	06:45
	→ fairuz joined	06:46
	→ xpk joined	06:49
	→ SwiftMatt joined	06:51
	→ piling joined	06:51
	← OnBrokenWings left	06:52
	← xall left	06:56
	← blackwind_123 left	07:02
	← SwiftMatt left	07:02
	→ blackwind_123 joined	07:02
	→ SwiftMatt joined	07:04
	Thorn__ → Thorn	07:06
	← semantipc left	07:09
	→ semantipc joined	07:10
	← SwiftMatt left	07:11
	→ st0opkid joined	07:11
	← stoopkid left	07:11
	→ SwiftMatt joined	07:12
	← SwiftMatt left	07:12
	→ Jon28_ joined	07:14
	← semantipc left	07:14
	← Jon28__ left	07:14
	← jaafar left	07:15
	→ ambro718 joined	07:16
	→ mischat joined	07:18
	← nwkj86 left	07:18
	← fairuz left	07:21
	→ cyan__ joined	07:21
	← mischat left	07:23
	→ zacts joined	07:23
	→ Harwood joined	07:24
	← Harwood left	07:25
	→ vuoto joined	07:26
	← ytl_ left	07:26
	→ fuchstronaut joined	07:27
	← ambro718 left	07:27
	→ jost joined	07:28
	← fuchstronaut left	07:31
	→ ytl joined	07:31
	→ sto0pkid joined	07:32
	→ mohabaks joined	07:33
	→ subhojit777 joined	07:33
	← Orbitrix left	07:34
	→ SteffanW joined	07:34
	← st0opkid left	07:35
	← Lyqyd left	07:38
	→ hahuang65 joined	07:41
	→ kevlarman joined	07:44
kevlarman	is there a nice way to get the commit id back from git-describe output that has had the commit id prefix stripped?	07:45
	← hahuang65 left	07:45
kevlarman	(in this case i know that it is unambiguous)	07:46
	← sd512 left	07:51
	→ GavinMagnus joined	07:51
	← moneylotion left	07:53
	← Goplat left	07:53
	→ jstein joined	07:53
	← Fabricio20 left	07:53
	← blackwind_123 left	07:54
	→ blackwind_123 joined	07:54
	→ fairuz joined	07:57
	→ Fabricio20 joined	07:58
	→ moneylotion joined	07:59
	← vuoto left	08:01
	→ vuoto joined	08:04
	← thiago left	08:05
	→ Fabricio20_ joined	08:05
	← Fabricio20 left	08:07
	← Motoko left	08:09
	→ interne7y joined	08:11
	← Jidoor left	08:12
	→ mariuscc joined	08:13
	→ tomog999 joined	08:13
	← tomog999_ left	08:15
	← interne7y left	08:15
	← ytl left	08:16
	→ kisonecat joined	08:16
	→ star_prone joined	08:21
	← GavinMagnus left	08:24
	← NeverDie left	08:26
	← jstein left	08:27
	→ fuchstronaut joined	08:27
	→ eivarv joined	08:28
	→ Orbitrix joined	08:28
	← Orbitrix left	08:28
	→ Orbitrix joined	08:29
	→ dsdeiz joined	08:31
	← fuchstronaut left	08:32
	→ NeverDie joined	08:34
	→ meloc joined	08:35
	← meloc left	08:36
	→ meloc joined	08:36
	→ ArchNoob joined	08:38
	→ LiohAu joined	08:39
	← cyan__ left	08:39
	→ slayerjain joined	08:39
	→ hahuang65 joined	08:41
	→ onurrunoonur joined	08:45
	← hahuang65 left	08:46
	→ moei joined	08:48
	→ khmarbaise joined	08:50
	→ jguillen_ joined	08:50
	→ johnny56 joined	08:50
	← johnny56_ left	08:51
	← eivarv left	08:52
	→ zarubin joined	08:52
	→ st0opkid joined	08:54
	→ nitin joined	08:57
	← sto0pkid left	08:57
	← spudowiar left	09:00
	← nitin left	09:02
	→ eivarv joined	09:02
	→ The_Phoenix joined	09:03
cbreak	kevlarman: do it yourself?	09:03
	find the tag that it uses	09:03
	then find the commits that are n after that	09:03
	← The_Phoenix left	09:04
kevlarman	cbreak: n is in the high thousands	09:04
cbreak	kevlarman: and you never merged?	09:04
	← jguillen_ left	09:05
cbreak	kevlarman: well, you can do a git log --oneline --decorate	09:05
	→ The_Phoenix joined	09:05
cbreak	kevlarman: load the output into a text editor with line numbers	09:05
	and subtract :)	09:05
	maybe you find the right one	09:05
kevlarman	cbreak: i was hoping for something in shell script	09:05
cbreak	you could awk something too I guess	09:05
kevlarman	git log --one-line --reverse tag..\|sed -n "1234p" was my attempt, but it only produces something close, not exact	09:07
	so i'm not understanding how something works	09:07
cbreak	or something with git log --reverse -n thatnumber thattag \| tail -n 1	09:08
kevlarman	git log tag produces commits older than the tag	09:08
cbreak	kevlarman: maybe you have to use --first-parent	09:09
	kevlarman: oh, yes	09:09
	kevlarman: git log --oneline --reverse tag..HEAD	09:09
	with -n to limit the output	09:09
	and tail to cut away all but the last output	09:10
	wonder if that works...	09:10
	anyway, I doubt this is reliable	09:10
	← akitada left	09:10
cbreak	I don't know how the number semantic in tags is, does it count merges?	09:10
	does it count the merged-in commits?	09:10
	if not, which path does it follow to count?	09:10
	that's why I said you might have to use --first-parent	09:11
	→ [Brain] joined	09:11
	→ phanimahesh joined	09:11
kevlarman	--first-parent causes it to produce much newer commits than it should	09:11
cbreak	so it probably counts merge participants	09:13
kevlarman	also it looks like -n limits the results before the reversing	09:14
	← Brain left	09:14
kevlarman	so that part needs to happen after the first pipe anyway	09:14
	→ xaa joined	09:16
	→ GavinMagnus joined	09:16
	← GavinMagnus left	09:16
	← catsup left	09:17
	→ catsup joined	09:17
	← onurrunoonur left	09:17
	→ jguillen_ joined	09:18
	← catsup left	09:18
	← kadoban left	09:19
	→ Dyonisos joined	09:20
	← mariuscc left	09:24
	→ stoopkid joined	09:24
	← tinajohnson___ left	09:25
	← rardiol left	09:26
	← st0opkid left	09:27
Aljone	Counting objects: 9486, done.Delta compression using up to 4 threads.Compressing objects: 100% (9266/9266), done.Writing objects: 100% (9429/9429), 460.77 MiB \| 3.72 MiB/s, done.Total 9429 (delta 1198), reused 0 (delta 0)efrror: RPC failed; result=22, HTTP code = 413	09:27
	atal: The remote end hung up unexpectedlyfatal: The remote end hung up unexpectedlyEverything up-to-date	09:27
	anyone can help me out	09:28
	i was put my limit to 1250m so it should be problem with nginx configurations , i have no idea whats happening	09:28
	← fairuz left	09:28
	→ fuchstronaut joined	09:28
kevlarman	Aljone: check njinx's logs	09:29
	→ davisonio joined	09:31
Aljone	client intended to send too large body: 483153085 bytes, clie	09:31
	← iveqy left	09:32
	← jguillen_ left	09:33
	→ jguillen joined	09:33
	← fuchstronaut left	09:33
	← NeverDie left	09:34
	→ st0opkid joined	09:35
kevlarman	Aljone: that's ~500mb, sounds like you either got the wrong setting or forgot to restart nginx	09:35
	← st0opkid left	09:35
	→ Fabricio20__ joined	09:36
	→ playfullyExist joined	09:36
Aljone	i restarted and rebooted the server	09:37
	← jguillen left	09:37
cbreak	Aljone: SSH, tried it? :)	09:37
	← stoopkid left	09:37
	→ cyan__ joined	09:37
Aljone	im loged in the terminal	09:39
	ssh yes	09:39
	→ jguillen joined	09:39
	← Fabricio20_ left	09:39
	← khmarbaise left	09:40
	→ satifant joined	09:40
kevlarman	cbreak: my dad got stuck working with the old version of microsoft's git server that doesn't support ssh, attempting to set up continuous integration in that environment was ...interesting :P	09:41
Aljone	cbreak: something fishy is going on	09:41
	i stoped nginx but the website still up	09:41
	→ hahuang65 joined	09:42
	→ Anderson69s_Deb joined	09:43
	→ garethdaine joined	09:44
	← aidalgol left	09:44
Aljone	root 778 767 0 04:42 ? 00:00:00 runsv nginxroot 784 778 0 04:42 ? 00:00:00 svlogd -tt /var/log/gitlab/nginx root 2678 778 0 04:54 ? 00:00:00 nginx: master process /opt/gitlab/embedded/sbin/nginx -p /var/opt/gitlab/nginx 2003 2679 2678 0 04:54 ? 00:00:00 nginx: worker process	09:45
	ideas?	09:45
	→ iveqy joined	09:45
	← Derperperd left	09:45
	→ zeroed joined	09:46
	← hahuang65 left	09:47
	→ freimatz joined	09:49
	← cyan__ left	09:52
	← boombatower left	09:53
kevlarman	Aljone: how did you stop it?	09:53
	→ Fabricio20 joined	09:53
	← Fabricio20__ left	09:56
	← freimatz left	09:59
	← eivarv left	10:00
	← davisonio left	10:01
	→ davisonio joined	10:02
	← jguillen left	10:02
	→ Jackneill joined	10:03
	← kevlarman left	10:03
cbreak	Aljone: I mean instead of http	10:05
Aljone	im upgrading my centos	10:05
	← playfullyExist left	10:06
	← rbern left	10:08
	→ fairuz joined	10:12
	← vuoto left	10:13
	→ eivarv joined	10:13
	← zeroed left	10:14
	→ khmarbaise joined	10:15
	→ dlaboratory joined	10:17
	→ lohfu joined	10:17
	← zarubin left	10:20
	← SteffanW left	10:22
	→ Fabricio20_ joined	10:25
	← soham left	10:25
	→ zeroed joined	10:25
	← Fabricio20 left	10:27
	→ fuchstronaut joined	10:29
	← ArchNoob left	10:32
	← fuchstronaut left	10:34
	→ xall joined	10:39
	→ sdothum joined	10:41
	→ hahuang65 joined	10:43
	← mohabaks left	10:46
	← hahuang65 left	10:47
	← slayerjain left	10:48
	← dlaboratory left	10:49
	← LiohAu left	10:51
	→ zarubin joined	10:54
	← harish_ left	10:55
	← fairuz left	10:56
	→ fairuz joined	10:57
	→ dlaboratory joined	10:58
	← zarubin left	10:59
	← zeroed left	11:00
	→ LiohAu joined	11:01
	← davisonio left	11:01
	← The_Phoenix left	11:03
	← romerocesar left	11:04
	← subhojit777 left	11:04
	→ davisonio joined	11:06
	← BenderRodriguez left	11:06
	→ stasmakarov joined	11:07
	← ojdo left	11:08
	→ aard_ joined	11:09
	← star_prone left	11:09
	← fairuz left	11:10
	→ robotroll joined	11:12
	→ fairuz joined	11:13
	→ felher_ joined	11:13
GlenK	hey. so if I've forked something from github, and added upstream. is there anything wrong with updating like so? git pull upstream master	11:15
	other stuff I see says git merge, so yeah. I'm not sure if it really matters either way at this point. Frick, suppose I really need to buckle down and learn git better, eh?	11:16
	think there's a udacity course floating around I've been meaning to do...	11:17
damjan	i ussualy work on a separate branch, but `git fetch upstream master:master`	11:17
	so I have both in my repo before doing any merging or rebasing	11:17
	→ ojdo joined	11:18
	← SoItBegins left	11:20
	→ Maple__ joined	11:21
	→ swift1 joined	11:25
	← swift1 left	11:25
	→ carsten__ joined	11:25
	→ swift1 joined	11:26
	→ LarArT joined	11:27
	← cyphase left	11:27
	→ cyphase joined	11:28
	← swift1 left	11:29
	→ swift1 joined	11:29
	← b1tchcakes left	11:29
	← swift1 left	11:29
	→ fuchstronaut joined	11:30
	→ swift1 joined	11:31
	← fuchstronaut left	11:34
	← fairuz left	11:36
	← vdv left	11:38
	→ vdv joined	11:38
	→ harish_ joined	11:39
	→ hahuang65 joined	11:44
	← harish_ left	11:44
	← phanimahesh left	11:48
	← carsten__ left	11:48
	← hahuang65 left	11:49
	→ Fabricio20 joined	11:52
	→ zarubin joined	11:52
	← Fabricio20_ left	11:54
	→ star_prone joined	11:55
	← ae__ left	11:57
	→ ae__ joined	11:58
	← zarubin left	11:58
	→ bartosz_ joined	12:03
	→ harish_ joined	12:04
	→ sanketdg joined	12:08
	→ awt joined	12:08
	← star_prone left	12:08
	→ SteffanW joined	12:09
	← davisonio left	12:10
	→ Fabricio20_ joined	12:12
	→ sea-gull joined	12:15
	← Fabricio20 left	12:15
	→ fahadash joined	12:16
	← Orbitrix left	12:16
	← linuxmint left	12:17
	→ anuxivm joined	12:17
	← wxg left	12:21
	← LarArT left	12:27
	→ davisonio joined	12:27
	→ paul424 joined	12:30
	→ fuchstronaut joined	12:31
	→ Rodya_ joined	12:34
	→ usm4n joined	12:34
	← fuchstronaut left	12:35
	→ The_Phoenix joined	12:41
	→ lucid joined	12:41
	→ dlab joined	12:41
	← dlaboratory left	12:42
	→ Fabricio20__ joined	12:42
lucid	I'm using git under osx and windows. Under Windows git-diff is saying "warning: LF will be replaced by CRLF in..." but I have core.autocrlf=false... so why will it be converted?	12:42
	← khmarbaise left	12:42
	→ nettoweb joined	12:43
lucid	and more importantly, how can I stop that?	12:44
	→ jeffreylevesque joined	12:44
lucid	is it just for the purposes of the diff? at the end it says "	12:44
	→ hahuang65 joined	12:44
lucid	is it just for the purposes of the diff? at the end it says "The file will have its original line endings in your working directory."	12:44
	→ djb-irc joined	12:45
	← Fabricio20_ left	12:45
	← LiohAu left	12:45
	→ NeonSynth joined	12:46
	→ vuoto joined	12:46
	← hahuang65 left	12:49
	← djb-irc left	12:50
	→ unknownIdentity joined	12:51
	→ mikecmpbll joined	12:51
	← dlab left	12:51
	← usm4n left	12:52
	→ iCrusader joined	12:54
	← awt left	12:54
	← nettoweb left	12:57
	← Rodya_ left	12:58
	→ dlaboratory joined	13:02
	→ khmarbaise joined	13:02
	← unknownIdentity left	13:06
	→ zeroed joined	13:11
	→ Orbitrix joined	13:15
	→ nettoweb joined	13:20
	← paul424 left	13:21
	→ Tachyon_ joined	13:27
	← ae__ left	13:27
	→ cdown joined	13:28
	← jeffreylevesque left	13:29
	→ fuchstronaut joined	13:31
	← The_Phoenix left	13:33
	← liuzhen left	13:33
	→ liuzhen joined	13:33
	→ The_Phoenix joined	13:34
	← fuchstronaut left	13:36
	→ wwwi joined	13:38
	← vuoto left	13:40
	← Harzilein left	13:42
	→ HanClinto joined	13:42
	← wwwi left	13:43
	→ vuoto joined	13:43
	← lel left	13:44
	→ wxg joined	13:44
	→ lel joined	13:45
	← lel left	13:45
	→ lel joined	13:45
	← lel left	13:45
	→ hahuang65 joined	13:45
	← davisonio left	13:46
	→ xlegoman joined	13:47
	← inflex left	13:49
	← hahuang65 left	13:50
	→ davisonio joined	13:50
	← piling left	13:52
	→ awt joined	13:52
	→ peroht joined	13:53
	→ peroht_ joined	13:54
	→ piling joined	13:54
	→ rbern joined	13:57
	→ slayerjain joined	13:57
	← wxg left	14:05
	← Jon28_ left	14:07
	→ Jon28_ joined	14:08
	→ catsup joined	14:08
	← xall left	14:13
	→ interne7y joined	14:14
	← nettoweb left	14:15
	← awt left	14:16
	← jost left	14:18
	← interne7y left	14:18
	← peroht_ left	14:18
	→ non_linux_expert joined	14:19
	← peroht left	14:19
	→ peroht joined	14:20
	→ peroht_ joined	14:20
	→ GenZai joined	14:21
	← The_Phoenix left	14:21
	→ str joined	14:21
	→ LeMike joined	14:22
	→ shinnya joined	14:23
	← fahadash left	14:23
	→ Cassiopaya joined	14:24
	← HanClinto left	14:25
	← GenZai left	14:25
	← blackwind_123 left	14:25
	→ IlNominePatre joined	14:26
	← cdown left	14:27
	→ GenZai joined	14:27
	← non_linux_expert left	14:27
	← peroht_ left	14:28
	← peroht left	14:28
	→ blackwind_123 joined	14:28
	→ jaafar joined	14:28
	← zacts left	14:29
	→ cdown joined	14:30
	→ The_Phoenix joined	14:30
	← GenZai left	14:31
	→ GenZai joined	14:31
	→ fuchstronaut joined	14:32
	→ mischat joined	14:34
	← The_Phoenix left	14:35
	→ Darcidride joined	14:35
	→ peroht joined	14:35
	→ peroht_ joined	14:35
	→ Impaloo joined	14:35
	→ wrouesnel joined	14:35
	← vuoto left	14:35
	← harish_ left	14:37
	← fuchstronaut left	14:37
	→ harish_ joined	14:37
	→ unbalancedparen joined	14:37
	→ cagmz joined	14:37
	← mischat left	14:38
	→ rardiol joined	14:39
	← eka left	14:40
	→ zacts joined	14:40
	← shymega left	14:42
	→ shymega joined	14:43
	→ happy-dude joined	14:44
	→ kus joined	14:44
	← kus left	14:44
	→ vuoto joined	14:45
	← peroht_ left	14:45
	← peroht left	14:45
	→ hahuang65 joined	14:46
	← Fabricio20__ left	14:47
duarteper	portugalfriends channel	14:47
	→ magicTurtle joined	14:48
	→ zivester joined	14:50
	← davisonio left	14:51
	← hahuang65 left	14:51
	→ Lomex joined	14:51
	→ peroht_ joined	14:53
	→ peroht joined	14:53
	← magicTurtle left	14:54
	→ l4v2 joined	14:54
	← peroht left	14:56
	← wrouesnel left	14:56
	→ peroht joined	14:57
	→ phanimahesh joined	14:57
	→ UTAN_dev joined	14:59
	← peroht left	14:59
	← iCrusader left	14:59
	→ davisonio joined	15:01
	← dlaboratory left	15:01
	← UTAN_dev_ left	15:01
	← Darcidride left	15:02
	← peroht_ left	15:03
	→ LarArT joined	15:05
	← HappyLoa- left	15:07
	← davisonio left	15:08
	← unbalancedparen left	15:09
	← SteffanW left	15:10
	← zeroed left	15:11
	→ zincrokx joined	15:12
	← zincrokx left	15:13
	→ peroht joined	15:13
	→ jpzfw joined	15:13
	← j416 left	15:13
	← anuxivm left	15:14
	→ j416 joined	15:15
	→ anuxivm joined	15:16
	← anuxivm left	15:16
	← xlegoman left	15:19
	→ wrouesnel joined	15:19
	→ f3r70rr35f joined	15:20
	→ peroht_ joined	15:20
	→ BenderRodriguez joined	15:21
	← jpzfw left	15:21
	← peroht left	15:22
	→ Mannn joined	15:23
	→ peroht joined	15:23
	→ star_prone joined	15:25
	← peroht_ left	15:25
	← johnny56 left	15:26
	→ agiz joined	15:26
	→ peroht_ joined	15:27
	← agiz left	15:28
	← zumba_addict left	15:28
	→ zumba_addict joined	15:29
	← peroht left	15:29
	← peroht_ left	15:29
	← f3r70rr35f left	15:31
	→ HappyLoa- joined	15:32
	→ davisonio joined	15:32
	→ fuchstronaut joined	15:33
	→ zeroed joined	15:34
	← zumba_addict left	15:34
	→ mischat joined	15:34
	→ bjsz joined	15:36
	→ zumba_addict joined	15:36
	← fuchstronaut left	15:37
	← zacts left	15:38
	← bjsz left	15:39
	→ seishun joined	15:39
	→ orion joined	15:39
seishun	what does "Falling back to patching base and 3-way merge" mean? Google only gives results about conflicts, but I sometimes get it when it merges successfully	15:40
	← mischat left	15:40
orion	Hi. If I have a bare repository, what's the best way to view its contents?	15:40
	→ zacts joined	15:41
nedbat	orion: clone it to a full working tree?	15:41
	→ m0viefreak joined	15:41
	← eivarv left	15:42
	→ mischat joined	15:42
	← star_prone left	15:43
	← zumba_addict left	15:43
	→ star_prone joined	15:43
	← rardiol left	15:43
	← wrouesnel left	15:43
	→ madewokherd joined	15:43
orion	Ok, thanks.	15:44
	← orion left	15:44
	→ dreiss joined	15:46
	→ hahuang65 joined	15:47
	→ _Mica_ joined	15:47
	← jstimm left	15:48
	← ribasushi left	15:48
	← Codfection left	15:49
	← Spec-Chum left	15:49
	→ Codfection joined	15:50
	→ razieliyo joined	15:50
	→ zumba_addict joined	15:51
	← hahuang65 left	15:51
	→ ribasushi joined	15:52
	← _Mica_ left	15:52
	← star_prone left	15:52
	→ foist joined	15:53
	→ thiago joined	15:54
	→ _Mica_ joined	15:55
	← zumba_addict left	15:55
	← _Mica_ left	15:56
	→ zumba_addict joined	15:57
	→ FelixVi joined	15:58
	→ LiohAu joined	15:58
	→ wrouesnel1 joined	15:59
	→ mohabaks joined	16:00
	→ CheckDavid joined	16:00
	← Khisanth left	16:02
	→ romerocesar joined	16:03
	→ johnny56 joined	16:05
	→ Ma5ter joined	16:06
	← zacts left	16:06
	→ MrMojito joined	16:06
	← zumba_addict left	16:06
	→ zumba_addict joined	16:07
	→ zacts joined	16:07
	← LarArT left	16:07
	← HappyLoa- left	16:07
	→ a_thakur joined	16:08
	→ star_prone joined	16:11
	← cagmz left	16:12
	← rkazak left	16:13
	→ interne7y joined	16:15
raz	hrmph.. why doesn't 'git add -p' let me stage individual lines and refuses to split the hunk further :/	16:15
	is there some way to stage individual lines with the CLI, without resorting to error-prone patch editing?	16:15
	→ cagmz joined	16:16
	← star_prone left	16:16
osse	no	16:16
	← vuoto left	16:16
	→ vuoto joined	16:17
	← sdothum left	16:17
satifant	what a pity	16:17
osse	staging individual lines is not so hard in the patch edit thing. remove all the others	16:17
	→ kbs joined	16:17
	← zeroed left	16:18
	← Izabia left	16:18
	← interne7y left	16:19
	→ HappyLoa- joined	16:19
	← MrMojito left	16:20
	← cagmz left	16:20
	→ sdothum joined	16:20
	→ star_prone joined	16:23
	→ nilsi joined	16:23
	→ NeverDie joined	16:24
	← vuoto left	16:27
	→ ahmedelgabri joined	16:29
	← Ma5ter left	16:30
	→ mariuscc joined	16:30
	→ a_thakur_ joined	16:31
	→ ams__ joined	16:32
	← star_prone left	16:33
	→ fuchstronaut joined	16:34
	← a_thakur left	16:34
	→ claudiop joined	16:36
	→ jaequery joined	16:36
	← jaequery left	16:36
	→ Khisanth joined	16:37
	← a_thakur_ left	16:38
	→ xlegoman joined	16:38
	← fuchstronaut left	16:38
	→ star_prone joined	16:38
	→ eivarv joined	16:41
	← eivarv left	16:42
	← shinnya left	16:43
	→ eivarv joined	16:43
	→ tachoknight_ joined	16:44
	→ Oebele joined	16:46
	→ Fgeso joined	16:46
	← zivester left	16:46
	→ hahuang65 joined	16:47
	← eivarv left	16:49
	→ nilsi_ joined	16:49
	← mohabaks left	16:50
	← nilsi left	16:51
	← tachoknight_ left	16:51
	← Sonderblade left	16:52
	← hahuang65 left	16:52
	← LeMike left	16:53
	← Fgeso left	16:53
	→ Raging_Hog joined	16:54
	← dreiss left	16:54
	← khmarbaise left	16:57
	← zumba_addict left	17:01
	→ Rodya_ joined	17:01
	← nilsi_ left	17:01
	→ ksolv joined	17:03
	→ LarArT joined	17:03
	→ ytl joined	17:04
	→ jeffreylevesque joined	17:06
	← skylite left	17:06
	→ darkbit joined	17:07
	← LiohAu left	17:07
	← Rodya_ left	17:09
	→ The_Phoenix joined	17:09
	← johnny56 left	17:09
	← The_Phoenix left	17:09
	→ johnny56_ joined	17:10
	→ The_Phoenix joined	17:10
	→ cagmz joined	17:10
	← The_Phoenix left	17:10
phanimahesh	use magit/vimagit	17:11
	if you need it regularly	17:11
	→ skylite joined	17:11
	→ The_Phoenix joined	17:12
	← The_Phoenix left	17:12
	→ mohabaks joined	17:12
	→ VladGh_ joined	17:12
	→ The_Phoenix joined	17:13
	← The_Phoenix left	17:13
	← mischat left	17:14
	→ The_Phoenix joined	17:14
	← dsdeiz left	17:15
	→ Rodya_ joined	17:15
	← DJ_Spies left	17:15
	← VladGh left	17:15
	← leeN left	17:16
	← skylite left	17:16
	→ therealGent joined	17:18
	← therealGent left	17:18
	→ therealGent joined	17:18
	→ leeN joined	17:19
	→ eka joined	17:19
	→ SteffanW joined	17:20
	← Rodya_ left	17:20
	← eka left	17:21
	→ altendky joined	17:22
	→ eka joined	17:22
	→ skylite joined	17:23
	← LarArT left	17:25
	← heftig left	17:25
	→ heftig joined	17:26
	← skylite left	17:28
	← kbs left	17:28
	← SpeakerToMeat left	17:29
	← str left	17:30
	→ jstein_ joined	17:31
	jstein_ → jstein	17:33
	→ _Mica_ joined	17:33
	← _Mica_ left	17:33
	→ skylite joined	17:34
	→ fuchstronaut joined	17:34
	← wrouesnel1 left	17:35
	→ SpeakerToMeat joined	17:35
	→ eivarv joined	17:37
	← The_Phoenix left	17:39
	← fuchstronaut left	17:39
	→ Derperperd joined	17:40
	→ GavinMagnus joined	17:40
	→ kadoban joined	17:40
	→ dsdeiz joined	17:41
	← SpeakerToMeat left	17:46
	→ p4trix joined	17:47
	→ hahuang65 joined	17:48
	← hahuang65 left	17:53
	→ SpeakerToMeat joined	17:54
	← p4trix left	17:56
	→ Finnoloid joined	17:56
	← cagmz left	17:58
	→ shgysk8zer0 joined	17:59
	← shgysk8zer0 left	17:59
	← CheckDavid left	18:03
	← ksolv left	18:04
	← phanimahesh left	18:04
	→ ProbabilityMoon joined	18:04
	→ phanimahesh joined	18:05
	← phanimahesh left	18:06
	→ SoItBegins joined	18:07
	← eivarv left	18:08
	← tango_ left	18:09
	→ phanimahesh joined	18:10
	← ribasushi left	18:10
	→ circ-user-aUJuR joined	18:10
	→ cyan__ joined	18:14
	← phanimahesh left	18:16
	→ ribasushi joined	18:16
	→ phanimahesh joined	18:17
	← phanimahesh left	18:20
	→ beyertech joined	18:20
	← beyertech left	18:21
	→ beyertech joined	18:22
	← mohabaks left	18:22
	← beyertech left	18:23
	→ beyertech joined	18:24
	← beyertech left	18:25
	→ beyertech joined	18:26
	→ khmarbaise joined	18:27
	→ Brain joined	18:27
	← [Brain] left	18:31
	→ leehambley joined	18:33
	← beyertech left	18:34
	→ fuchstronaut joined	18:35
	← therealGent left	18:37
	→ phanimahesh joined	18:37
	← phanimahesh left	18:38
	← Tachyon_ left	18:39
	→ [Brain] joined	18:39
	← fuchstronaut left	18:40
	← Joel left	18:40
	← Brain left	18:41
	→ madebymarkca joined	18:42
	→ phanimahesh joined	18:42
	← phanimahesh left	18:42
	→ tango_ joined	18:44
	← GavinMagnus left	18:45
	→ Tachyon_ joined	18:46
	→ EvilDMP__ joined	18:46
	← Tachyon_ left	18:47
	→ Tachyon_ joined	18:47
	← EvilDMP__ left	18:48
	→ GavinMagnus joined	18:48
	← GavinMagnus left	18:48
	→ hahuang65 joined	18:49
	→ EvilDMP__ joined	18:50
	← Raging_Hog left	18:51
	→ astrofog joined	18:51
	← SteffanW left	18:51
	← EvilDMP__ left	18:53
	→ EvilDMP__ joined	18:53
	→ jguillen joined	18:53
	→ DJ_Spies joined	18:54
	← hahuang65 left	18:54
	← ams__ left	18:54
	← HappyLoa- left	18:56
	→ zincrokx joined	18:58
	→ ugjka_ joined	18:58
	← zincrokx left	18:58
	← ugjka_ left	18:59
	→ zincrokx joined	18:59
	← zincrokx left	18:59
	→ zincrokx joined	19:00
	← zincrokx left	19:00
	→ zincrokx joined	19:00
	← zincrokx left	19:01
	→ rardiol joined	19:01
	→ eivarv joined	19:01
	→ zincrokx joined	19:01
	← zincrokx left	19:02
	→ zincrokx joined	19:02
	← jhass left	19:02
	← zincrokx left	19:03
	→ jhass joined	19:03
	→ beyertech joined	19:05
	← beyertech left	19:06
	→ beyertech joined	19:07
	← BenderRodriguez left	19:10
	← EvilDMP__ left	19:12
	← khmarbaise left	19:13
	→ khmarbaise_ joined	19:13
	→ hahuang65 joined	19:14
	← TomyLobo left	19:14
	→ ericsupreme joined	19:14
	← ericsupreme left	19:15
	← PaulCapestany left	19:19
	→ LarArT joined	19:21
	→ p4trix joined	19:21
	← cdown left	19:23
	→ PaulCapestany joined	19:23
	← jeffreylevesque left	19:25
	← lss8 left	19:28
	← eivarv left	19:30
	→ lss8 joined	19:31
	→ ash_workz joined	19:32
	← Cassiopaya left	19:33
	← IlNominePatre left	19:33
	→ shinnya joined	19:35
	→ diegoviola joined	19:35
	→ tectonic joined	19:35
	← lss8 left	19:36
	← phaleth left	19:36
	→ fuchstronaut joined	19:36
	→ awt joined	19:41
	← fuchstronaut left	19:41
	→ lss8 joined	19:42
	← hahuang65 left	19:45
	← daurnimator left	19:45
	← Vaelatern left	19:45
	→ ki0 joined	19:48
	→ ningu joined	19:49
ningu	I have a remote branch that shows up in git branch -r, but not git branch, so I can't switch to it with git checkout. what do I need to do to fetch it?	19:50
	→ str joined	19:51
	← l4v2 left	19:52
ningu	hmm	19:53
	actually, apparently it does work to just do git checkout	19:53
	it sets it up with the right remote tracking etc.	19:53
	→ akiva joined	19:53
	← tectonic left	19:54
	← xpk left	19:58
	→ rkazak joined	20:00
	← davisonio left	20:00
	← lss8 left	20:03
	← robotroll left	20:04
	→ diego1 joined	20:05
	← diego1 left	20:05
	→ diego1 joined	20:05
	→ lss8 joined	20:05
	→ Darcidride joined	20:06
	diegoviola → Guest53630	20:06
	← ahmedelgabri left	20:06
	diego1 → diegoviola	20:06
	→ ahmedelgabri joined	20:07
	← Guest53630 left	20:07
	← ahmedelgabri left	20:10
	← sanketdg left	20:11
	→ eivarv joined	20:12
	← LarArT left	20:12
	← Darcidride left	20:14
	← khmarbaise_ left	20:15
	→ ahmedelgabri joined	20:16
	→ interne7y joined	20:16
	← leehambley left	20:16
	→ HoierM joined	20:16
	→ Darcidride joined	20:18
	← star_prone left	20:19
	← ki0 left	20:19
	← Darcidride left	20:19
	← xlegoman left	20:20
	→ Darcidride joined	20:20
	→ mgarate joined	20:21
	← interne7y left	20:21
	← Darcidride left	20:21
	→ khmarbaise joined	20:23
	← awt left	20:24
	← beyertech left	20:25
	→ beyertech joined	20:26
	→ ResidentBiscuit joined	20:27
	← beyertech left	20:27
	← stasmakarov left	20:27
	→ GavinMagnus joined	20:28
	→ beyertech joined	20:28
	← beyertech left	20:31
	← mgarate left	20:31
	→ beyertech joined	20:31
	← ahmedelgabri left	20:32
	→ Spec-Chum joined	20:33
	← beyertech left	20:33
	→ beyertech joined	20:34
	← beyertech left	20:36
	→ beyertech joined	20:36
	→ fuchstronaut joined	20:37
	← jguillen left	20:37
	← beyertech left	20:38
	→ beyertech joined	20:39
	→ mohabaks joined	20:41
	← beyertech left	20:41
	← fuchstronaut left	20:42
	→ beyertech joined	20:42
	→ xlegoman joined	20:43
	→ hahuang65 joined	20:43
	→ [R] joined	20:46
[R]	is there any way to get the server to modify the commit msg in a hook?	20:46
	← ningu left	20:47
kadoban	[R]: You wouldn't want to do that anyway, it'd be ... weird. Then the history you have wouldn't match what's actually on the remote.	20:47
[R]	yeah, that was the one thing i'd be worried about	20:47
	i'm using gerrit, and i love how they put info in the 'notes', but im using gitlab, and it has no way to visualize it, so i was hoping i could just stick them in the commit msg somehow	20:48
	→ yqt joined	20:48
	→ ahmedelgabri joined	20:49
	← hahuang65 left	20:50
	← Tachyon_ left	20:51
	← Derperperd left	20:51
	→ ksolv joined	20:52
	← ahmedelgabri left	20:52
	→ ahmedelgabri joined	20:53
	→ nettoweb joined	20:53
	← nettoweb left	20:54
	← beyertech left	20:54
	→ beyertech joined	20:55
	← GavinMagnus left	20:55
	← beyertech left	20:55
	← ahmedelgabri left	20:56
	→ xall joined	20:56
rewt	[R], if the commit message is changed, the commit hash will change along with it, so your next push will say the repos diverged, and you'd have to rebase before pushing	20:57
[R]	well that's no fun	20:58
	can't i just ninja go in ther eand change the message?	20:58
qsx	no.	20:59
	unless you break sha1 (hint: highly unlikely.)	20:59
[R]	:(	20:59
	→ ytl_ joined	21:00
damjan	[R]: exactly. no one wants fun with their source code :)	21:01
[R]	i guess if i reference the issue # in the message, and then have gerrit add a comment to the issue referening hte code review	21:01
	← rkazak left	21:01
	→ ahmedelgabri joined	21:01
	← circ-user-aUJuR left	21:02
	← ytl left	21:03
	→ Rodya_ joined	21:04
	→ jstimm joined	21:05
	→ Derperperd joined	21:05
	→ davisonio joined	21:05
	← ProbabilityMoon left	21:08
	→ cdown joined	21:13
	← Rodya_ left	21:17
	→ mellernoia joined	21:19
	→ star_prone joined	21:19
	→ spudowiar joined	21:20
	gitinfo set mode: +v	21:20
	← ahmedelgabri left	21:21
	→ HappyLoa- joined	21:21
	→ ahmedelgabri joined	21:21
	← diegoviola left	21:22
	← Maple__ left	21:23
	→ beyertech joined	21:23
	← ahmedelgabri left	21:23
	← Electrometro left	21:24
	→ Electrometro joined	21:24
	← star_prone left	21:24
	← p4trix left	21:25
	← beyertech left	21:25
	→ beyertech joined	21:25
	→ diegoviola joined	21:26
	→ mablae_ joined	21:27
	← beyertech left	21:28
	← aard_ left	21:28
	← seishun left	21:28
	→ beyertech joined	21:28
	← shinnya left	21:29
	← beyertech left	21:30
	← mablae__ left	21:31
	→ beyertech joined	21:31
	← justanotheruser left	21:32
	← eivarv left	21:32
	→ Brain joined	21:32
	→ justanotheruser joined	21:33
	← beyertech left	21:33
	→ CheckDavid joined	21:33
	← cyan__ left	21:33
	→ beyertech joined	21:34
	← beyertech left	21:34
	→ ahr3n joined	21:35
	← [Brain] left	21:35
	← netj left	21:36
	→ beyertech joined	21:36
	→ netj joined	21:37
	← jstein left	21:37
	→ fuchstronaut joined	21:38
	← SoItBegins left	21:38
	← bartosz_ left	21:39
	→ beyertech_ joined	21:40
	→ aidalgol joined	21:40
	← GenZai left	21:40
	← ytl_ left	21:41
	→ semantipc joined	21:41
	← beyertech_ left	21:41
	→ kbs joined	21:41
	← beyertech left	21:42
	→ beyertech joined	21:42
	← fuchstronaut left	21:42
	→ mablae__ joined	21:46
	→ mischat joined	21:47
	← mablae_ left	21:47
	→ crayon joined	21:48
	← dcpc007 left	21:50
	→ dcpc007 joined	21:51
	← jstimm left	21:52
	→ d4rklit3 joined	21:53
	← d4rklit3 left	21:53
	→ therealGent joined	21:53
	← therealGent left	21:53
	→ therealGent joined	21:54
	← semantipc left	21:55
	→ semantipc joined	21:55
	→ diego1 joined	21:56
	← sim590 left	21:56
	← diego1 left	21:56
	→ diego1 joined	21:56
	diegoviola → Guest61987	21:57
	diego1 → diegoviola	21:57
	← Guest61987 left	21:57
	→ sim590 joined	21:57
	← sim590 left	21:57
	→ ajacmac joined	21:57
	→ sim590 joined	21:57
	← semantipc left	21:58
	← slayerjain left	21:58
ajacmac	How do I setup a server as a remote?	21:58
	→ semantipc joined	21:58
	← vdv left	21:58
damjan	ajacmac: git remote add ...	21:58
ajacmac	That just allows me to connect to an existing remote, right?	21:59
	→ Rodya_ joined	21:59
	← beyertech left	21:59
ajacmac	What I want is to make an AWS instance and a raspberry pi remotes I can push to.	22:00
damjan	ajacmac: what was your question then?	22:00
	you only need ssh and git on them so that you push to them	22:00
kbs	One path of least resistance might just be to enable ssh access to it.?	22:00
	^^	22:00
	← davisonio left	22:00
damjan	unless you need fancy features like github has with protected branches and what not	22:01
	hell, you can even just rsync .git to a remote server	22:01
	← semantipc left	22:01
ajacmac	I'm just trying to figure out the easiest work flow for multiple production servers, etc.	22:01
	→ semantipc joined	22:02
ajacmac	Ok, rsync.git I haven't heard of	22:02
	← dsantiago left	22:02
	← Rodya_ left	22:02
damjan	that's all you need to recover everything from a git repo	22:02
kbs	you're probably going to do that over ssh I'd imagine, and at that point can simply just use git directly. likely ssh+git is the easiest combo	22:02
	← khmarbaise left	22:03
ajacmac	I'll look it up, thanks	22:03
	← satifant left	22:03
ajacmac	Can I script ssh ing into multiple servers and pulling, etc.?	22:03
osse	yes	22:04
kadoban	Pulling in a script is likely not a good idea. pull implies merge, which is a manual activity.	22:04
ajacmac	Cool, I'll keep that in mind too, then.	22:04
	→ beyertech joined	22:04
	kbs wonders if the goal is more around pushing configuration files to servers	22:05
kadoban	Sounds a lot like you're trying to use git for deployment? Doesn't seem like a very good idea.	22:05
	→ Rodya_ joined	22:05
ajacmac	Ya, I am. I've been trying and failing to find out what people do for deployment when they don't have money to spend on a paid service.	22:06
	← beyertech left	22:06
	← semantipc left	22:06
damjan	ajacmac: use ansible?	22:06
	salt puppet whatever?	22:07
ajacmac	It's been years since I've heard the name ansible, I'd forgotten it.	22:07
	Thanks!	22:07
damjan	ajacmac: you should've stated your original issue from the begining	22:07
	→ beyertech joined	22:07
	→ _Ra_ joined	22:09
	→ jstimm joined	22:09
	← beyertech left	22:09
	→ beyertech joined	22:10
	← Jackneill left	22:11
	→ rubyonrailed joined	22:14
	← rubyonrailed left	22:15
	→ rubyonrailed joined	22:15
	← therealGent left	22:15
	← Gitzilla left	22:16
	→ interne7y joined	22:17
	→ eivarv joined	22:18
	→ whitby joined	22:18
	→ blr joined	22:20
	← rubyonrailed left	22:20
	← rardiol left	22:20
	← _Ra_ left	22:21
	← interne7y left	22:22
	→ jeffreylevesque joined	22:23
	→ SoItBegins joined	22:23
	← Anupkumar left	22:24
	→ durham joined	22:24
	← durham left	22:24
	→ durham joined	22:25
	← mischat left	22:28
	→ Maple__ joined	22:28
	← str left	22:30
	→ dsantiago joined	22:30
	→ RedneckDonut joined	22:31
	→ sy joined	22:31
	→ Goplat joined	22:32
	→ askhader joined	22:33
askhader	I cloned a project with a submodule, but the submodule is missing despite having an entry in .gitmodules. How do I rectify this?	22:33
	← sy left	22:33
askhader	git submodule update has no output	22:33
bobdobbs	I've got an existing git project. I added a github repo as a remote. When I push, nothing gets added to github	22:34
	← RedneckDonut left	22:34
	→ boombatower joined	22:34
	← zacts left	22:34
bobdobbs	When I do 'git push -u origin master', the console responds: "Branch master set up to track remote branch master from origin"	22:34
	So then I go to my browser, and load the git page. The repo exists. If I navigate to 'code', I see the 'quick setup' instructions. No code was pushed.	22:35
	→ l4v2 joined	22:36
cbreak	bobdobbs: code doesn't matter	22:36
	bobdobbs: is the history there?	22:36
bobdobbs	I thought that maybe the remote doesn't exist. So I re-add it. The console returns a fatal error, saying that the remote already exists.	22:36
	cbreak:	22:36
cbreak	check if you have the same commits	22:37
damjan	bobdobbs: is origin the github repo?	22:37
	← Oebele left	22:37
bobdobbs	damjan: I don't know. I also have a bitbucket repo. So maybe the bitbucket repo is 'origin'.	22:37
damjan	bobdobbs: git remote -v	22:38
	how can you not know that??? how did you even add it then?	22:38
askhader	How do I install a submobule?	22:38
	The submodule is already in the project but the directory is absent after I cloned it.	22:38
bobdobbs	damjan: I added the project the way I usually do: just following the instructions that github provides.	22:38
	→ fuchstronaut joined	22:39
	← cdown left	22:40
bobdobbs	damjan: ah, I see. 'git remote -v' returns a listing. I can see the github entries listed with 'github' as the first field. So I guess that that is the name of the github repo.	22:40
	so I'll try 'git push github'	22:40
damjan	askhader: when you clone you can use --recursive, or after that "git submodule update --init"	22:40
	bobdobbs: right	22:40
bobdobbs	hey, that does it	22:41
	I know have that repo on github!	22:41
	thanks!	22:41
	← Limes__ left	22:42
	→ mibr0 joined	22:43
	← fuchstronaut left	22:43
	→ cagmz joined	22:45
	← Derperperd left	22:46
	← beyertech left	22:46
	→ hahuang65 joined	22:46
	← ksolv left	22:46
	→ p4trix joined	22:47
	→ ytl joined	22:48
	← kbs left	22:49
	→ rubyonrailed joined	22:49
askhader	damjan: None of these commands had any effect.	22:50
	The submodule's directory is still missing	22:50
damjan	what repo is that?	22:51
	→ nfk joined	22:51
	← hahuang65 left	22:51
askhader	Alamofire, does it matter?	22:51
	→ rorro joined	22:51
damjan	just to see it. since the commands are those	22:52
	← jeffreylevesque left	22:52
damjan	this one ? https://github.com/Alamofire/Alamofire ??	22:53
askhader	damjan: Here is my .gitmodule https://gist.github.com/679574b85939f5c786f0a107510149fa	22:53
	yes	22:53
	← dreamseeker left	22:53
	← mibr0 left	22:54
damjan	I hope you ment .gitmodules up there	22:54
	→ mibr0 joined	22:54
damjan	askhader: I don't understant what you're doing. you have a new repo, or you cloned some other repo??	22:55
	← mibr0 left	22:56
	→ mibr0 joined	22:56
askhader	cloned a repo	22:57
	And the Alamofire submodule Path is nowhere to be found	22:57
	→ reim joined	22:58
	→ omata joined	22:58
damjan	what next?	22:59
	← mibr0 left	22:59
askhader	That's the story. I need the submodule present.	22:59
	→ dreamseeker joined	22:59
	← omata left	23:00
	→ mach0ne joined	23:00
	→ aspiers joined	23:00
cbreak	askhader: just git submoudule update --init	23:01
	that's all you have to do	23:01
	askhader: IF your repo has a submodule	23:01
	askhader: you can check with git ls-tree -r HEAD	23:01
askhader	That command has no output and seemingly no effect.	23:01
cbreak	askhader: then you don't have a submodule	23:02
askhader	So what is the .gitmodules doing in my repository?	23:02
cbreak	askhader: maybe a leftover	23:02
	← mellernoia left	23:02
cbreak	or someone just created a file	23:02
	← mach0ne left	23:02
cbreak	.gitmodules is not relevant for the existence of a submodule	23:02
askhader	Fair enough. Thanks for the guidance.	23:02
cbreak	it is relevant for the initial URL and other meta data	23:02
	what matters is the entry in the tree	23:03
	the command I gave you above shows the tree	23:03
askhader	Perfect.	23:03
cbreak	is there a commit entry in the tree? That is a submodule	23:03
	← ajacmac left	23:04
cbreak	ah well, good night :)	23:07
	→ Noldorin joined	23:07
cbreak	if you want to add a submodule, use git submodule add	23:07
	← mikecmpbll left	23:09
	→ jeffreylevesque joined	23:09
	← Dyonisos left	23:09
	← xall left	23:10
	← Jon28_ left	23:11
	→ Jon28_ joined	23:13
	← ffabi left	23:18
	→ xall joined	23:21
	→ Gamecubic joined	23:21
	→ LeBlaaanc joined	23:21
	→ ffabi joined	23:22
	→ mablae_ joined	23:22
	← cagmz left	23:24
	← mablae__ left	23:26
	← ffabi left	23:26
	→ ffabi joined	23:28
	← xlegoman left	23:30
	← nfk left	23:30
	→ cagmz joined	23:30
	→ zacts joined	23:31
	← tanuki left	23:31
	← rubyonrailed left	23:33
	→ rubyonrailed joined	23:33
	← j416 left	23:34
	→ mischat joined	23:34
	← LeBlaaanc left	23:35
	→ BenderRodriguez joined	23:35
	→ j416 joined	23:36
	→ tanuki joined	23:37
	← rubyonrailed left	23:38
	← mischat left	23:39
	→ fuchstronaut joined	23:39
	→ Dreamer3 joined	23:40
	→ LeBlaaanc joined	23:41
	← zacts left	23:42
	→ johnchalekson joined	23:43
	← johnchalekson left	23:43
	→ underpantz joined	23:44
	→ johnchalekson joined	23:44
	← fuchstronaut left	23:44
	← jeffreylevesque left	23:45
	← p4trix left	23:47
	→ hahuang65 joined	23:47
	→ Izabia joined	23:47
	← dsdeiz left	23:48
	← moei left	23:48
	← rorro left	23:49
	→ moei joined	23:51
	← t0by left	23:52
	← hahuang65 left	23:52
	← Goplat left	23:56
	→ Gitzilla joined	23:57
	→ _28_ria joined	23:57
	← Spec-Chum left	23:57
	← reim left	23:59

Logs Search ←Prev date Next date→

Channels Documentation