IRCloggy #git 2020-01-25

Provider of IRC logs since 2005.

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

	2020-01-25
sveinse	i'm not sure what git terms a commit thou, different vcs use different names	00:00
	← williamboman left	00:00
sveinse	the unit of transactions	00:00
	→ williamboman joined	00:00
rafasc	the unit of transaction is commit in git.	00:01
	← CodeSlingerPaul left	00:02
	→ sidetrack joined	00:02
rafasc	you can take the tip commit of the "subtree" and do something like: git branch --contains "hash"	00:03
sveinse	thus, if this commit is present in both repos, the commit is shared. So I need to verify that all commits of a are in b, but not the other way round.	00:03
rafasc	that will list all branches that contain that commit.	00:03
sveinse	rafasc: yes, I use that a lot when working with detached heads and trying to figure out where it belong	00:04
	← lagothrix left	00:06
	← omnireq left	00:07
rafasc	fetch from both repos then: git log --all --not $(git rev-parse --remotes=upstream)	00:08
	→ jaziz joined	00:09
	→ causasui joined	00:09
rafasc	that will list commits from this repo that are not present in the other one.	00:10
	→ thiago joined	00:11
	→ lagothrix joined	00:11
rafasc	im stupid	00:12
	git log --graph --decorate --remotes=origin/ --not --remotes=upstream/	00:12
	← Gurkenglas left	00:13
sveinse	rafasc: there it is! Thanks! Perfect	00:15
rafasc	if you're using this for scripting, you should use rev-list instead of log	00:15
	but it's pretty much the same thing	00:15
	→ mbalmer joined	00:16
	← andreas303 left	00:16
	← sidetrack left	00:17
sveinse	rafasc: yeah, thanks. git log will do	00:17
rafasc	git log is not meant to be scripted around, unless you pass --format, I guess.	00:18
	→ andreas303 joined	00:18
	← mbalmer left	00:20
	→ Newami joined	00:20
	→ yonder joined	00:22
sveinse	linux kernel is peksy. It is well above the nag limit on bitbucket and github and very close to the stoplimit on bitbucket. Pity when everything else of ours is there	00:23
	→ sidetrack joined	00:28
	← Helenah left	00:31
	← sidetrack left	00:32
	← iNs_ left	00:32
	→ iNs joined	00:32
	→ Helenah joined	00:33
	← oatmealraisin left	00:35
	→ user____ joined	00:37
	← Newami left	00:38
	← tanuki_ left	00:38
	user____ → toastedoats	00:39
	→ tanuki joined	00:40
	← plexigras left	00:41
	← swalladge left	00:41
	thomasross → Guest4757	00:41
	→ thomasross_ joined	00:41
	← Guest4757 left	00:41
	thomasross_ → thomasross	00:41
	→ swalladge joined	00:42
	← Dirak left	00:48
	→ jcbitter joined	00:50
	← jetchisel left	00:52
	→ jetchisel joined	00:53
	← jcbitter left	00:55
	← m1dnight_ left	00:55
	→ Dirak joined	00:56
	→ jcbitter joined	00:56
	→ m1dnight_ joined	00:57
	→ g00s joined	00:57
	← jetchisel left	00:57
	→ jetchisel joined	00:58
	→ sidetrack joined	00:59
	→ Dirak_ joined	01:01
	← Dirak left	01:01
	← lucasb left	01:01
	← jcbitter left	01:02
	← jetchisel left	01:02
	→ jcbitter joined	01:02
	← m1dnight_ left	01:03
	← sidetrack left	01:04
	→ m1dnight_ joined	01:04
	← jcbitter left	01:08
	→ jcbitter joined	01:09
	→ mbalmer joined	01:10
	← oncall-pokemon left	01:11
	← rustyshackleford left	01:11
	← Aelius left	01:14
	← Lucas_Gray left	01:14
	← mbalmer left	01:14
	→ Aelius joined	01:16
	→ orbyt_ joined	01:17
	→ omnireq joined	01:18
	→ libertyprime joined	01:21
	← m1dnight_ left	01:27
	→ prepend joined	01:28
	← prepend left	01:28
	→ m1dnight_ joined	01:29
	→ igemnace joined	01:29
	→ dmc joined	01:33
	← Fernando-Basso left	01:39
	← g4570n left	01:40
	RonPaul → Hoff	01:41
	→ g4570n joined	01:42
	→ throstur` joined	01:45
	← igemnace left	01:47
	← throsturx left	01:48
	← m0viefreak left	01:49
	← austin987 left	01:49
	→ wildlander joined	01:52
	← Sasazuka left	01:53
	→ mud joined	01:56
	← Dirak_ left	01:57
	→ jetchisel joined	01:57
	→ Dirak joined	01:57
	← mowcat left	02:03
	→ mbalmer joined	02:04
	→ leeN joined	02:07
	← mbalmer left	02:09
	← Olipro left	02:13
	→ sidetrack joined	02:15
	← sidetrack left	02:19
	← cd left	02:20
	← Shentino left	02:20
	→ Shentino joined	02:24
	← dartmouthed left	02:30
	← CCR5-D32 left	02:31
	→ prepend joined	02:33
	← prepend left	02:36
	→ igemnace joined	02:37
	← duderonomy left	02:37
	→ thebope joined	02:37
	← libertyprime left	02:38
	← finalbeta left	02:38
	→ prepend joined	02:39
	→ thomasross_ joined	02:40
	thomasross → Guest88773	02:40
	thomasross_ → thomasross	02:40
	← Guest88773 left	02:42
	← netz left	02:44
	→ libertyprime joined	02:46
	→ finalbeta joined	02:48
	→ pandakekok9 joined	02:49
	← F0rTex left	02:51
	→ F0rTex joined	02:53
	← ketas left	02:58
	← Anthaas left	02:59
	→ ketas joined	02:59
	→ Anthaas joined	03:00
	← pandakekok9 left	03:03
	→ truthseeker_ joined	03:03
	← zulutango left	03:03
	→ zulutango joined	03:03
	→ pandakekok9 joined	03:09
	← statusf90 left	03:10
	← thomasross left	03:12
	← chandoo left	03:15
	← causasui left	03:18
	→ dionysus69 joined	03:18
	← Atlenohen left	03:19
	← lagothrix left	03:21
	→ lagothrix joined	03:21
	→ thomasross joined	03:23
	← toastedoats left	03:30
	→ Goplat joined	03:33
	→ statusf90 joined	03:36
	→ fattredd joined	03:40
	→ locrian9 joined	03:41
	→ delli3 joined	03:43
	→ pabs3 joined	03:46
	← thebope left	03:46
	← justinmrkva left	03:47
pabs3	is there a way to create custom objects in git? I was thinking I want a "built-from" object to link a tree of built objects to the source files they were built from. (this is in the context of building a static website)	03:48
	← justanotheruser left	03:49
	→ throstur_ joined	03:50
rafasc	that's a commit?	03:51
	a commit is literally a collection of files.	03:51
	with some extra metadata.	03:51
	← throstur` left	03:52
pabs3	commit is an object but a different type of object to what I want	03:52
rafasc	you can git hash-object -t blob <file>; to make blobs.	03:53
	← libertyprime left	03:54
rafasc	then write a key-value pair, or whatever.	03:54
	← Cabanossi left	03:54
	← fattredd left	03:55
rafasc	or make a commit with all the build files, then merge -s ours <source>;	03:55
	→ Cabanossi joined	03:55
rafasc	If you want the source, SHA^2, if you want the built files SHA^1 or just the merge SHA.	03:56
	→ libertyprime joined	03:57
rafasc	Or, if you prefer: No, it's not possible to have custom objects.	03:58
	→ omnireq_ joined	03:59
	→ fattredd joined	03:59
	← omnireq left	04:01
	→ monk12 joined	04:05
	→ mauz555 joined	04:07
	← ARoxdale left	04:09
	→ justanotheruser joined	04:10
	← libertyprime left	04:12
	→ beastDivision joined	04:14
	← omnireq_ left	04:14
	→ omnireq_ joined	04:15
	← Khisanth left	04:18
	← mauz555 left	04:18
	← dionysus69 left	04:22
	← kurahaupo left	04:23
	→ Khisanth joined	04:30
	← mud left	04:37
	← rafasc left	04:41
	← g4570n left	04:42
	← beastDivision left	04:46
statusf90	I know I'm probably going to get some biased answers asking here but I figured I may as well. If an employer asks for my github would it likely suffice to put my gitlab link and say I don't use github?	04:46
	→ mbalmer joined	04:47
pabs3	statusf90: when asked for that I usually link to the page on my website where I link to the many different development system accounts that I have	04:49
	→ beastDivision joined	04:50
	← mbalmer left	04:52
	→ duderonomy joined	05:00
	← bket left	05:01
	← pks left	05:02
	→ pks_ joined	05:02
	pks_ → pks	05:02
	→ bket joined	05:04
	→ sidetrack joined	05:10
	→ dtux joined	05:13
	← bvdw left	05:13
	→ bvdw joined	05:14
	← locrian9 left	05:15
	← sidetrack left	05:20
	→ locrian9 joined	05:21
	← xcm left	05:22
	→ xcm joined	05:22
	← Dirak left	05:23
	← begui left	05:26
	→ FH_thecat joined	05:27
	→ begui joined	05:31
	← begui left	05:32
	→ P1RATEZ joined	05:32
	→ begui joined	05:39
	→ localhorse joined	05:40
	← wildlander left	05:48
	→ Dirak joined	05:54
	← throstur_ left	05:56
	← pikapika left	05:58
	→ pikapika joined	06:00
	← dtux left	06:01
	← howdoi left	06:02
	← prepend left	06:08
	→ fragamus joined	06:15
	→ nickodd joined	06:15
	← monk12 left	06:20
	← Hello71 left	06:28
	← justanotheruser left	06:29
	← jadax left	06:30
	→ Hello71 joined	06:34
	→ mbalmer joined	06:35
	→ Beam_Inn joined	06:39
Beam_Inn	anyone chillin'? :D	06:39
	I'm trying to upload my local repo for the first time to my remote github location	06:39
	i learned how to bring a remote repo to my pc, but i didn't learn the command to send mine as master to a remote location	06:39
	← mbalmer left	06:40
	← statusf90 left	06:42
	← CryptoDavid left	06:42
	← orbyt_ left	06:45
Beam_Inn	oh i found it	06:45
	→ justanotheruser joined	06:52
	→ nika joined	07:01
	← Celelibi left	07:01
	→ thebope joined	07:02
	← fattredd left	07:03
	→ fattredd joined	07:04
	← crose left	07:08
	→ Mattiaslndstrm joined	07:13
	→ sidetrack joined	07:15
	← g00s left	07:16
	← sidetrack left	07:20
	→ Celelibi joined	07:20
	← badLuckJoe left	07:28
	← thebope left	07:29
	→ no_gravity joined	07:30
no_gravity	Is there a way to do "git add ." but exclude untracked files?	07:31
	← jetchisel left	07:31
_ikke_	git add -u	07:31
no_gravity	_ikke_: Great, thanks!	07:32
	→ rustyshackleford joined	07:32
	→ mbalmer joined	07:33
	→ ferdna joined	07:33
	← mbalmer left	07:37
	→ thebope joined	07:39
	→ sidetrack joined	07:44
	← thebope left	07:44
	← Khisanth left	07:46
	← andreas303 left	07:47
Beam_Inn	hint: Updates were rejected because the tip of your current branch is behind	07:49
	← sidetrack left	07:49
_ikke_	It means either someone else pushed before you, are you have rewritten history	07:50
Beam_Inn	the only thing i've done is create the empty repo on github	07:51
	→ andreas303 joined	07:51
_ikke_	did you enabled something like "add readme"?	07:52
Beam_Inn	no.	07:53
	https://github.com/Fohsap/yidenGit	07:53
	license	07:53
_ikke_	right	07:53
	So if you already have a repo locally, you would need to overwrite this	07:53
	You could download that license file and commit that locally first	07:54
	← no_gravity left	07:54
Beam_Inn	i did git pull and	07:55
	i mean that didn't work	07:55
_ikke_	no, that's most likely not what you want anyway	07:55
Beam_Inn	fatal: refusing to merge unrelated histories	07:56
	merge: https://github.com/Fohsap/yidenGit.git - not something we can merge	07:56
	← ferdna left	07:56
_ikke_	Beam_Inn: I recommend just download that license file, commit it, and then git push -f -u origin master	07:56
	(assuming your remote is called origin)	07:56
	← McSmelly left	07:57
Beam_Inn	i can't do that via gitbash?	07:57
_ikke_	you can	07:57
Beam_Inn	i understand what you're saying not trying to be obnoxious	07:58
_ikke_	well	07:58
	not the download part	07:58
	what you can do	07:58
	git fetch origin	07:58
Beam_Inn	i'm just wondering what's the proper gittierre way to do it	07:58
_ikke_	git checkout origin/master LICENSE	07:58
	→ Khisanth joined	07:58
Beam_Inn	updated	07:58
_ikke_	Then you should have that license file locally	07:59
	and can commit it	07:59
Beam_Inn	wow gitbash froze	08:00
_ikke_	did you accidentally pressed ctr+s?	08:00
	try ctrl+q	08:00
Beam_Inn	! [rejected] master -> master (non-fast-forward)	08:01
_ikke_	you need to force push	08:01
	git push --force --set-upstream origin master	08:01
	← thiago left	08:01
Beam_Inn	that sounds pretty aggressive, man	08:01
	but if i need to, I guess I will	08:01
_ikke_	don't try to antropomorphise it :)	08:02
	you basically have 2 separate repositories nwo	08:03
	now	08:03
	and without explicitly telling it to, git won't merge those together	08:03
	and if you do, it would look messy anyway	08:03
	so better to just ignore what was on github already and overwrite it with what's in your local repo	08:03
Beam_Inn	this is crazy	08:04
_ikke_	It's just because you selected to add the license file	08:04
	then github already starts the repo with commits which are unrelated to what you have locally	08:04
Beam_Inn	some day gitbash is going to allow shift-home and shift-a and stuff	08:04
_ikke_	nice feature, but confusing if you don't know what's the consequence	08:05
	← P1RATEZ left	08:06
Beam_Inn	after adding a remote location, is it a branch?	08:06
	like git checkout myremote	08:06
_ikke_	no, it's a remote, not a branch	08:07
	a remote is more like a shortcut	08:07
	though git has some logic that when you checkout from a remote, it will use the 'default' branch for that remote	08:07
rustyshackleford	what is a branch exactly?	08:08
	its more like a tag	08:08
	i got an argument with someone about renaming a branch. "We already deployed. We don't want to create a new commit"	08:09
_ikke_	rustyshackleford: a branch in git is basically 2 things	08:09
	renaming a branch is more like renaming a file in git	08:09
rustyshackleford	so I was trying to explain that a branch simply points to a commit	08:09
_ikke_	correct	08:09
	You don't create a commit by renaming or creating branches	08:09
rustyshackleford	anyway, might give a talk on git. What's the proper terms for the relationship between a branch and a commit? what is a branch?	08:10
	it would be nice if there was someone's power point I could rip off	08:10
_ikke_	rustyshackleford: in the most crude sense: echo {hash} >.git/refs/heads/{branchname}	08:10
Beam_Inn	rustyshackleford you want to deeply understand content that you'll be using in industry, eventually.	08:11
_ikke_	!video	08:11
gitinfo	[!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jessica Kerr: Git basics, descriptional)	08:11
_ikke_	Beam_Inn: the one from Jessica Kerr is probably good in that context	08:12
	Beam_Inn: start at minute 18	08:12
Beam_Inn	can i ask you a question?	08:12
rustyshackleford	you already did	08:12
_ikke_	!just_ask :-)	08:12
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	08:12
Beam_Inn	so, i want to find a total synonym set for rust terms. :D	08:13
rustyshackleford	some people are good at presentations	08:13
	git happens	08:13
	already off to a good start lol	08:13
	← pandakekok9 left	08:14
Beam_Inn	git happens, 163 megabytes	08:15
	← Trieste left	08:15
	← Mattiaslndstrm left	08:15
	→ mbalmer joined	08:15
	→ Mattiaslndstrm joined	08:16
	→ thebope joined	08:16
	→ Trieste joined	08:18
	← Mattiaslndstrm left	08:19
	← pabs3 left	08:25
	← thebope left	08:30
	← igemnace left	08:38
	← truthseeker_ left	08:39
	← jwynn6 left	08:39
	← jimender2 left	08:40
	→ Mattiaslndstrm joined	08:42
	→ jwynn6 joined	08:44
	← Trieste left	08:46
	→ Trieste joined	08:48
	→ Newami joined	08:48
	← Cabanossi left	08:48
	← Newami left	08:49
	→ Ploppz joined	08:51
	← Ploppz left	08:51
	→ Ploppz joined	08:52
	← _salt left	08:53
	→ _salt joined	08:53
	→ TheWild joined	08:54
	← mat001 left	08:55
	→ barteks2x joined	08:55
	→ Cabanossi joined	08:56
	→ alfredb joined	08:57
	→ Gurkenglas joined	09:01
	← Mattiaslndstrm left	09:02
	→ Mattiaslndstrm joined	09:07
	← Mattiaslndstrm left	09:09
	← Gurkenglas left	09:11
Ploppz	how can I understand better what happens when I try to rebase a path that has merges? What I mean is for example if HEAD = commit A, and I call `git rebase -i <commit B>`, and there have been some merges in-between.. and then in I choose to squat all but one commit. I get conflicts, even if there is one path from commit B to commit A (I mean, when	09:12
	thinking back, I started at commit B, made some commits and a couple merges, before getting commit A)	09:12
	← mbalmer left	09:12
	→ mbalmer joined	09:13
Ploppz	I just want to take the current state (state = sum of all files), and apply the difference on top of commit B in a new commit	09:13
	→ Gurkenglas joined	09:14
Beam_Inn	what should i take away from this, _ikke_?	09:18
_ikke_	Beam_Inn: a good visual way to explain branches and commits in git?	09:19
Beam_Inn	yeah it's nice but maybe too easy for me	09:19
	my questions are mostly about when things happen. maybe they call them lifetimes?	09:19
	and i just need to apply a lot of commands. I went through an advanced git course and did well, but I never applied any of it and lapsed it all	09:20
Ploppz	I found a solution: generate diff, checkout <commit B>, and apply patch	09:20
Beam_Inn	and also i hope i can eventually learn hos the git sourcecode works	09:21
	← Goplat left	09:23
	→ tonythomas joined	09:24
	← Gurkenglas left	09:32
	← Dirak left	09:33
	→ nowhere_man joined	09:33
	← alfredb left	09:34
	→ Fernando-Basso joined	09:38
	← Belliash left	09:42
Beam_Inn	if anyone wants to tell me the most important chapters/sections, i would love that. :D	09:45
	lol	09:45
	if i want to be a pretty advanced user	09:46
	← nika left	09:46
	→ nika joined	09:47
	← fphilipe left	09:48
	→ Dirak joined	09:49
	← Dirak left	09:55
	← locrian9 left	09:58
	→ jetchisel joined	10:00
	← akemhp left	10:04
	→ akemhp joined	10:05
	→ akemhp_ joined	10:05
	← akemhp_ left	10:06
	← dedowsdi left	10:21
	→ dedowsdi joined	10:23
	→ Belliash joined	10:25
	→ H2Q joined	10:30
	→ gxt joined	10:30
	→ fphilipe joined	10:34
	← leeN left	10:46
	→ sidetrack joined	10:48
	→ truthseeker_ joined	10:48
	← sidetrack left	10:53
	→ theoceaniscool joined	10:54
	← nika left	10:56
	→ nika joined	10:56
	→ Dirak joined	11:02
	→ feriman joined	11:05
	← dedowsdi left	11:05
	→ dedowsdi joined	11:06
	← Dirak left	11:07
	→ royal_screwup21 joined	11:07
	← bvdw left	11:13
	← milkt left	11:14
	→ bvdw joined	11:14
	← royal_screwup21 left	11:14
	→ CCR5-D32 joined	11:15
	→ royal_screwup21 joined	11:17
	← xcm left	11:20
	← royal_screwup21 left	11:20
	← gxt left	11:20
	← reprazent left	11:20
	→ xcm joined	11:20
	← beastDivision left	11:20
	← mbalmer left	11:22
	→ Dirak joined	11:23
	← Giant81 left	11:23
	← andreas303 left	11:24
	→ mowcat joined	11:26
	→ Lucas_Gray joined	11:28
	← Dirak left	11:28
	→ andreas303 joined	11:30
	→ Exec1N joined	11:30
	← omnireq_ left	11:36
	→ omnireq_ joined	11:39
	← Helenah left	11:43
	→ Atlenohen joined	11:44
	→ Helenah joined	11:45
	← random_yanek left	11:49
	→ Mattiaslndstrm joined	11:49
	→ mbalmer joined	11:50
	← plitter left	11:54
	← mbalmer left	11:56
	→ plitter joined	11:57
	← omnireq_ left	11:58
	→ omnireq_ joined	11:59
	← theorangeone left	12:01
	→ theorangeone joined	12:01
	→ gitter1234 joined	12:03
	→ random_yanek joined	12:06
	→ royal_screwup21 joined	12:06
	← Exec1N left	12:08
	← Lucas_Gray left	12:10
	→ troulouliou_dev joined	12:11
	→ Lucas_Gray joined	12:12
	→ mbalmer joined	12:24
	← Trieste left	12:26
	→ thebope joined	12:27
	→ Trieste joined	12:27
	← shored left	12:28
	← mbalmer left	12:29
	→ shored joined	12:30
	→ Dirak joined	12:31
	← thebope left	12:33
	→ brethil joined	12:33
	← nowhere_man left	12:34
	← Dirak left	12:36
	← freakyy left	12:38
	→ freakyy joined	12:41
	→ greatgatsby joined	12:46
	→ plexigras joined	12:48
	→ Dirak joined	12:52
	→ m0viefreak joined	12:53
	← cdown left	12:54
	→ causasui joined	12:55
	→ locktree joined	12:55
locktree	Morning	12:56
	← Dirak left	12:57
	→ cdown joined	12:58
	→ locktree51 joined	12:58
	← locktree51 left	12:58
	← locktree left	13:02
	→ locktree joined	13:02
locktree	Morning	13:03
	← locktree left	13:05
	← mowcat left	13:08
	→ Gurkenglas joined	13:10
	← causasui left	13:11
	← H2Q left	13:11
	← troulouliou_dev left	13:14
	→ enoq joined	13:14
	→ mescalinum joined	13:15
	→ mArtale joined	13:17
	← mArtale left	13:17
	→ troulouliou_dev joined	13:18
	← Shentino left	13:22
	→ cdown_ joined	13:24
	→ Shentino joined	13:25
	← cdown left	13:27
	cdown_ → cdown	13:27
	← royal_screwup21 left	13:31
	→ albel727 joined	13:36
	→ g4570n joined	13:56
	← Lucas_Gray left	14:06
	← dedowsdi left	14:07
	→ mat001 joined	14:12
	→ wildlander joined	14:14
	← jaziz left	14:26
	→ thebope joined	14:29
	← troulouliou_dev left	14:30
	← thebope left	14:33
	← Eryn_1983_FL left	14:35
	→ Eryn_1983_FL joined	14:35
	→ troulouliou_dev joined	14:37
	→ Dirak joined	14:38
	← localhorse left	14:39
	→ yamppa joined	14:45
	← g4570n left	14:48
	→ g4570n joined	14:50
	← fragamus left	14:56
	← CCR5-D32 left	14:57
	← vicfred left	14:59
	← plexigras left	15:00
	→ lucasb joined	15:01
	← nickodd left	15:07
	→ mbalmer joined	15:07
	→ nickodd joined	15:08
	← Mattiaslndstrm left	15:08
	← mbalmer left	15:12
	← troulouliou_dev left	15:13
	→ Mattiaslndstrm joined	15:15
	→ troulouliou_dev joined	15:18
	→ cd joined	15:27
	→ statusf90 joined	15:28
	→ cdown_ joined	15:28
	→ sidetrack joined	15:30
	← cdown left	15:30
	cdown_ → cdown	15:30
	→ fragamus joined	15:30
	← sidetrack left	15:35
	← _homme__ left	15:38
	← greatgatsby left	15:43
	← cdown left	15:48
	→ FernandoBasso joined	15:48
	→ cdown joined	15:49
	→ sidetrack joined	15:50
	← rustyshackleford left	15:50
	→ TheFuzzball joined	15:51
	← Fernando-Basso left	15:51
	← dgw left	15:51
	→ dartmouthed joined	15:52
	← sidetrack left	15:55
	← TheWild left	15:56
	→ dgw joined	15:56
	← justanotheruser left	15:57
	← Beam_Inn left	16:00
	← nika left	16:01
	→ mbalmer joined	16:01
	← begui left	16:02
	→ gumupho joined	16:03
	← mbalmer left	16:06
	→ TheWild joined	16:09
	→ thiago joined	16:10
	← fragamus left	16:11
	→ minionofgozer joined	16:13
	← nickodd left	16:13
Ploppz	is there any way to do something like `git diff A B > patch ; git checkout A ; git apply patch` without creating a file `patch`, and possibly even without checking out?	16:13
	(and possibly also commit the changes to A)	16:14
	→ nickodd joined	16:14
Ploppz	well maybe I can use /tmp to host the patch file. But would be nice to not have to checkout anything	16:14
	→ sidetrack joined	16:17
	caveman → cavewomanista	16:20
	→ mowcat joined	16:20
	→ greatgatsby joined	16:21
_ikke_	Ploppz: You cannot apply patches without checking out the branch	16:28
	git checkout A; git apply - <(git diff A B)	16:29
	→ justanotheruser joined	16:33
	← TheFuzzball left	16:39
	← mescalinum left	16:42
cbreak	Ploppz: man git-cherry-pick	16:44
gitinfo	Ploppz: the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html	16:44
	→ begui joined	16:44
	← Mattiaslndstrm left	16:45
	← justanotheruser left	16:47
	→ ferdna joined	16:55
	→ mbalmer joined	16:56
	→ Mattiaslndstrm joined	16:58
	→ sgen joined	16:58
	→ crose joined	17:00
	← mbalmer left	17:00
	→ H2Q joined	17:02
	← tonythomas left	17:05
	→ rsrx joined	17:07
	→ TheFuzzball joined	17:09
	← FernandoBasso left	17:10
	← bvdw left	17:13
	→ bvdw joined	17:14
	← sgen left	17:15
	→ sgen joined	17:16
	← Dirak left	17:16
	← sidetrack left	17:16
	← sgen left	17:17
	→ oncall-pokemon joined	17:18
	→ justanotheruser joined	17:28
	→ Dirak joined	17:32
	→ rustyshackleford joined	17:32
	→ lightstalker joined	17:33
	← Dirak left	17:37
	← diogenese left	17:38
	→ kupi joined	17:39
	→ diogenese joined	17:39
	→ rafasc joined	17:47
	→ mbalmer joined	17:50
	← mbalmer left	17:54
	← TheFuzzball left	17:58
	← truthseeker_ left	18:02
	→ CoolerX joined	18:05
CoolerX	hey	18:05
	how do I get this pull request? https://github.com/torch/distro/pull/257	18:05
	can I jump to that pull request?	18:05
	I cloned the original repo https://github.com/torch/distro	18:05
	→ TheFuzzball joined	18:08
rafasc	CoolerX: there are two ways: clone the repo that originated the PR, and checkout the branch.	18:09
	you can see the branch name near the open label.	18:09
CoolerX	rafasc, I think it is this one? https://github.com/Oskop/distro/tree/installdepscleanup	18:10
rafasc	or, clone the repo that is receiving the PR, and run: git fetch <repo> refs/pull/257/head:refs/heads/pr-257	18:10
	when I said clone, you can simply do remote add instead.	18:10
CoolerX	oh no it isn't	18:11
	← TheWild left	18:11
CoolerX	which one is it?	18:11
rafasc	https://github.com/torch/distro/tree/installdepscleanup	18:11
	click on the name.	18:11
CoolerX	https://github.com/torch/distro/pull/257 the guy who made the pull request doesn't have any repos	18:11
	https://github.com/li01bin?tab=repositories	18:11
rafasc	the PR is being made from within the torch/distro repo.	18:12
CoolerX	rafasc, so git checkout installdepscleanup ?	18:12
rafasc	in this case, yeah	18:12
	→ sidetrack joined	18:13
rafasc	what I mentioned is the general case, which will work even if the PR originated from a fork.	18:13
CoolerX	ok	18:14
	← greatgatsby left	18:15
CoolerX	rafasc, seems that branch isn't what I need	18:15
	rafasc, how can I switch to https://github.com/Oskop/distro/tree/patch-1	18:15
	?	18:15
rafasc	git remote add selfcontained https://github.com/Oskop/distro;	18:17
	git fetch selfcontained;	18:17
	git checkout patch-1	18:17
	← sidetrack left	18:18
	→ RatSalad joined	18:20
	← Helenah left	18:23
	← mat001 left	18:23
	← kjartan left	18:24
	→ kjartan joined	18:25
CoolerX	thanks	18:25
	← CoolerX left	18:26
	→ Helenah joined	18:35
	→ CoolerX joined	18:36
CoolerX	rafasc, seems that isn't it either	18:36
	turns out I need this one https://github.com/nagadomi/distro	18:36
	← TheFuzzball left	18:37
	→ Goplat joined	18:38
	→ TheFuzzball joined	18:38
	→ hyperair joined	18:40
rafasc	CoolerX: the steps are the same.	18:41
	add repo as remote, fetch, checkout a branch.	18:41
	← jess left	18:43
rafasc	There's a simplified version: git fetch repourl +branchname:temp; git checkout temp;	18:44
CoolerX	ok thanks	18:45
rafasc	that will overwrite the "temp" branch	18:45
CoolerX	what does --recursive do?	18:45
	→ tonythomas joined	18:45
CoolerX	git clone https://github.com/torch/distro.git ~/torch --recursive	18:45
rafasc	man git clone	18:45
gitinfo	the git-clone manpage is available at https://gitirc.eu/git-clone.html	18:45
rafasc	it also clones submodules recursively	18:45
CoolerX	submodules?	18:46
rafasc	by default, when you clone a repo submodules are not cloned.	18:46
	submodules is the mechanism that allows you to have nested repos in git.	18:46
	https://github.com/torch/distro/blob/master/.gitmodules	18:47
	they have a bunch	18:47
CoolerX	ooh nested repos	18:47
	that's insane	18:47
rafasc	on github, they're rendered as: env @ d28424a	18:48
	means that the env directory is actually a repository checked out at the d28424a.	18:49
	man git submodule; man gitsubmodules	18:49
gitinfo	the git-submodule manpage is available at https://gitirc.eu/git-submodule.html	18:49
	the gitsubmodules manpage is available at https://gitirc.eu/gitsubmodules.html	18:49
CoolerX	what is the use case for submodules?	18:50
rafasc	When you need nested repos.	18:51
	Usually when your project depends on another.	18:51
	Many people try to avoid to deal with this in the git layer and rely on dep managers, pip npm etc	18:52
	But submodules allow you to make sure your commit is used with a specific commit on the dependency.	18:53
	← amcclure left	18:54
CoolerX	rafasc, why is that important?	18:55
	← n000g left	18:55
CoolerX	isn't that why you version	18:55
rafasc	Not necessarily.	18:55
CoolerX	pin which version of the dependency you want	18:55
rafasc	For example, many dependencies manager rely on semantic version.	18:55
	→ amcclure joined	18:55
rafasc	So my commit can run pretty much with any 2.0.x version	18:55
	← TheFuzzball left	18:56
CoolerX	rafasc, you can bump version automatically on commit	18:56
rafasc	2.x.x even.	18:56
	With submodules you're pinning to the specific commit. So your commit includes the dependency at that specific commit.	18:57
	Not one before not one after.	18:57
	→ n000g joined	18:57
rafasc	Sometimes that's unecessary. If your dependency follows semantic versioning, Major.Minor.Patch, only bumps in Major are considered backwards incompatible.	18:59
	← Decobus left	18:59
rafasc	Meaning you can let your dep manager, choose the best version that fits your constraints.	18:59
	→ Decobus joined	18:59
CoolerX	rafasc, sounds horrible, if you are pinning to specific commits then something is wrong with your software architecture	19:00
	fix some APIs and program to those	19:00
rafasc	You can pin it to whatever you want.	19:01
	Usually yes, people will pin it at some released version. But submodules allow to pin to anything.	19:01
	← brettgilio left	19:01
rafasc	Not everyone want's to install a full blown dependency manager to manage a handful of repos.	19:02
	wants*	19:02
	← cbreak left	19:03
	→ cbreak joined	19:04
	→ hseg joined	19:07
	→ cdown_ joined	19:09
CoolerX	rafasc, that's like saying noone wants to install a full blown version manager to just manage a handful of source code files	19:09
	why have git when you could just put files in folders	19:10
	← cdown left	19:11
	cdown_ → cdown	19:11
	← thomasross left	19:11
	→ leeN joined	19:13
bremner	CoolerX: feel free not to use submodules if they are not useful for you	19:14
BtbN	submodules are a good way to end up with ancient dependencies and when someone wants to use you with the latest versions, stuff explodes.	19:15
	→ locktree joined	19:16
	→ thomasross joined	19:16
	← locktree left	19:18
	→ Olipro joined	19:19
	← Mattiaslndstrm left	19:21
	→ Mattiaslndstrm joined	19:22
rafasc	CoolerX: it's different. submodules are a way to manage a dependency. And it does it by making sure the version of the dependencies that were used to make the commit are used in the checkout.	19:22
	If you need something more flexible than that, feel free to use npm, pip, cargo, or whatever is more adequate for your language.	19:23
	← leeN left	19:25
	← diogenese left	19:26
	→ HaMsTeRs joined	19:26
	→ diogenese joined	19:26
CoolerX	rafasc, it's not a very good way to manage dependencies	19:29
rafasc	It's generic.	19:29
	→ localhorse joined	19:29
	← HaMsTeRs left	19:30
	→ HaMsTeRs joined	19:30
	← HaMsTeRs left	19:33
	← gumupho left	19:36
	→ Fernando-Basso joined	19:37
	→ leeN joined	19:38
	→ ttl joined	19:39
	→ milkt joined	19:41
	→ monk12 joined	19:45
	← H2Q left	19:49
	→ alfredb joined	19:54
	→ sidetrack joined	19:57
	← Mattiaslndstrm left	19:57
	← sidetrack left	19:57
	→ Newami joined	20:00
	→ developer24 joined	20:00
	← Newami left	20:01
	← RatSalad left	20:03
	← fattredd left	20:05
	← Human_G33k left	20:05
	→ Human_G33k joined	20:06
	← alfredb left	20:06
	← CoolerX left	20:13
	→ RatSalad joined	20:13
	← RatSalad left	20:14
	_brezanac → brezanac	20:17
b0nn	Have sub modules improved (genuine question, for a while there they had a nasty reputation)	20:26
	← rsrx left	20:27
b0nn	Or had they garnered their reputation for ... interestingness.. because people weren't using them properly?	20:27
BtbN	They're as annoying as ever	20:28
rafasc	both	20:28
b0nn	ok	20:28
	I'm thinking I will wait until they're easier to use properly, I can see their advantages, but i have heard of a lot of problems with them	20:29
rafasc	Its UI was a bit , err, complicated to use. That tarnished its reputation, there are memes online calling it "git sobmodules"	20:29
b0nn	(read: I'll learn how to use them properly when I am forced to by other people's decisions)	20:29
rafasc	It's not perfect now, but it is much better than it once was.	20:29
b0nn	ok	20:30
	That's the nature of development though, things start out 'rough' but that feedback shows people what needs to be done	20:30
rafasc	BtbN: have you heard of https://github.com/apenwarr/git-subtrac yet?	20:30
BtbN	no, looks horrible	20:31
rafasc	it deal with some of the aspects that make submodules hard.	20:31
BtbN	Stuff like npm/cargo/pip/... is pretty much always the saner choice	20:31
rafasc	says no, then says looks horrible.	20:32
b0nn	So, go relies on git heavily for its package mangement	20:32
	rafasc is confused	20:32
BtbN	I looked at it for 10 seconds, saw go build instructions, and closed the page again	20:32
b0nn	Including the current "modules" system	20:32
BtbN	Don't need another layer of compexity on top of the already complex stuff	20:32
b0nn	Exactly, that's why I refuse to use <ALL FOTWARE WRITTEN IN A LANGUAGE I DON'T WRITE IN>	20:33
	SOFTWARE*	20:33
BtbN	Well, with that logic you cannot use git in most cases	20:33
	or... your OS	20:33
rafasc	That's from one of the git devs. Having people look at this stuff is important for improvements to submodules.	20:34
	← magic_ninja left	20:34
rafasc	It's the same person that wrote git subtree, that got eventually into the git repo.	20:34
monk12	Hey all, was reading some git tutorials to understand more deeply whats going on under the hood... When you do a 'git pull', everyone says that basically does a 'git fetch' followed by a 'git merge'. So if there are 3 branches (branch1, branch2, and branch3), and 2 of them were updated in the remote repo by another user (branch2 and branch3, NOT the one Im currently working on in my working dir which is branch1 pretend). Then the	20:34
	'git pull' will update the /refs/remotes/myRemote/branch2 and branch3 with the latest commits with the fetch portion. But wasnt sure about the merge portion... will it try to merge the changes into /refs/heads/branch2 and branch3? or will a merge ONLY happen if I also had one of those branches checked out in my working dir?	20:34
b0nn	BtbN: huh, that's exactly what you're saying about it being written in Go	20:34
BtbN	I don't care what language it is in	20:34
	→ Lucas_Gray joined	20:34
BtbN	if it's more complex than a simple shell script, it's too much complexity.	20:35
b0nn	07:32 < BtbN> I looked at it for 10 seconds, saw go build instructions, and closed the page again; 07:32 < BtbN> Don't need another layer of compexity on top of the already complex stuff	20:35
BtbN	Yes?	20:35
b0nn	Ok, I mean, it's up to you, I have no argument with someone that thinks that way	20:35
	I'll just judge you quietly instead	20:36
BtbN	I would need to install several gigabytes of additional dependencies to even use that.	20:36
	And would impose the same on users of my repo.	20:36
rafasc	If only you read the page.	20:36
BtbN	That just cannot be the answer to submodules being annoying	20:36
rafasc	Just like git subtree, this doesn't force itself on users. That's the point.	20:37
	But 10s isn't enough to understand that.	20:37
	anyways..	20:37
BtbN	If I use it for my repo, surely anyone using my repo will also have to deal with it.	20:37
rafasc	Go inform yourself, then we can discuss.	20:38
BtbN	yeah whatever	20:38
b0nn	It seems to be more of a UI than a "This arranges your code"	20:38
	→ magic_ninja joined	20:38
Hello71	"End users downloading your project don't need to have git-subtrac installed"	20:39
	→ CCR5-D32 joined	20:39
Hello71	according to my clock, you've been complaining about this for more than 7 minutes. according to wc, there are 324 words before that line. if you read at least 1 word per second, you would have read that sentence more than 2 minutes ago	20:40
	and one word per second is really fucking slow	20:40
rafasc	Do you know what we can do instead of continuing this? Help monk12 .	20:40
b0nn	oh, I was going to point him at gitscm, but thought that might be a bit "RTFM"	20:41
Hello71	well I just got here. I was getting to that.	20:41
	man git-pull	20:41
gitinfo	the git-pull manpage is available at https://gitirc.eu/git-pull.html	20:41
Hello71	"Incorporates changes from a remote repository into the current branch. In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD."	20:41
	"More precisely, git pull runs git fetch with the given parameters and calls git merge to merge the retrieved branch heads into the current branch."	20:41
	so yes, that is another reason why git pull is confusing	20:42
	→ thebope joined	20:45
rafasc	monk12: basically the fetch will grab all branches, but the merge will only affect your checked out branch.	20:47
monk12	Hello71/rafasc I think I gotcha. so if the pulled changes were not affecting my checked out branch (branch1), nothing will happen in that portion.	20:50
Hello71	sort of	20:50
	→ nkz joined	20:50
Hello71	... more or less	20:50
rafasc	monk12: not sure if I understand what you mean.	20:51
nkz	hey, beginner here. I have two branches, dev and master. On dev I write my code and I use master just for deploying to heroku. How should I name commits I put in master branch? Like I deploy it after I fix many things in dev branch and I don't care for source code inside master.	20:52
	they are very different, dev is two folders, front-end and back-end. Master is just back-end folder with front-end built and placed inside of it.	20:54
rafasc	monk12: just to makes things clear, the fetch part will update your remote tracking branches. The read-only branches that live inside refs/remotes/<remotename>/ . Never ever conflicts in this part, because they're a mirror. It just replicates whatever is on the remote.	20:54
monk12	rafasc, so branch2 and branch3 were modified by somene else (they didnt touch branch1). I am working on branch1 though (its currently checked out on my computer). so the fetch updates the /refs/remotes/origin/branch1 and /refs/remotes/origin/branch2 ... There was nothing to merge on the merge part, right?	20:54
rafasc	monk12: the merge part only affects the branch you are at. (the local refs/heads/<name>)	20:54
	→ Dirak joined	20:54
	→ H2Q joined	20:55
	← enoq left	20:57
rafasc	monk12: branch2 and branch3 would never be merged when using just git pull while you have branch1 checked out.	20:57
	even if you have a copy of that branch checked out locally. Merge only operates on the current branch.	20:58
	even if you have a copy of that branch locally. (not checked out)	20:59
monk12	okay excellent, thanks for clearing that up rafasc.	21:00
	→ teratorn joined	21:01
rafasc	you would need to: git checkout branch2; git pull; (or just git merge because you already did one fetch with the previous pull)	21:01
monk12	gotcha, i was just about to ask how i would update branch2/3 after the pull :).	21:02
	← zebrag left	21:02
rafasc	common segway :)	21:02
teratorn	i've run `git fetch`. how can I see a log of the commits that were fetched? i.e. the commits that are ahead of the current branch?	21:03
rafasc	teratorn: git log ..@{u}	21:04
	← BonusPlay left	21:04
	→ BonusPlay joined	21:04
rafasc	or git log HEAD..HEAD@{upstream}	21:04
	← BonusPlay left	21:04
	→ zebrag joined	21:04
	→ BonusPlay joined	21:04
teratorn	rafasc: thanks!	21:05
rafasc	If you have the output of git fetch, it prints sha..sha for each fetch, you can use that.	21:06
	because the command I have you compares with your local branch, not the last fetch	21:06
	← delli3 left	21:07
rafasc	that would be something like: git log origin/master@{1}..origin/master;	21:07
	but usually you're interested in comparing with the current branch.	21:08
	→ Es0teric joined	21:11
Es0teric	hi -- i have a quick question... I am using git for windows and when i try to do `git add .` it hangs after awhile and i get the message 'Warning LF will be replaced by CRLF in <directory>. The file will have its original line endings in your working directory.	21:12
	for a lot of the files its trying to do git add to	21:12
	how do i stop it from hanging?	21:12
teratorn	rafasc: so once I'm satisfied with the log, how would I apply the commits that were fetched without reaching back out to the remote and potentially pulling new commits that I haven't reviewed yet?	21:13
rafasc	teratorn: you do: git merge	21:13
teratorn	rafasc: cool	21:14
rafasc	teratorn: note that merges are completely local until you push it back. So you can still use git pull, inspect the result and undo it if there's something you do not like.	21:17
	Both are valid. I personally tend to fetch and merge separately, but it's not a huge difference.	21:18
	← ttl left	21:23
	→ mbalmer joined	21:29
	← jim left	21:32
	→ jim joined	21:33
	ChanServ set mode: +o	21:34
	← mbalmer left	21:34
	Eugene changed the topic to: Welcome to #git \| First visit? https://gitirc.eu \| Current stable version: 2.25.0 \| Getting "cannot send to channel"? /msg gitinfo .voice \| This channel is logged: https://gitirc.eu/log \| all your rebase are belong to us	21:34
	Eugene kicked Eugene (de-op)	21:34
	→ Eugene joined	21:35
	← hqdruxn08_ left	21:35
	← magic_ninja left	21:40
	→ orbyt_ joined	21:40
	← thebope left	21:42
	→ hqdruxn08 joined	21:42
	→ jess joined	21:43
	→ CryptoDavid joined	21:44
	← kupi left	21:47
	← minionofgozer left	21:50
	→ g00s joined	21:50
Es0teric	can anyone help me with my question?	21:51
	← leeN left	21:53
	→ sidetrack joined	21:59
	→ leeN joined	22:01
rafasc	Es0teric: it's a warning related to windows end-of-line normalization.	22:01
	I am not very experienced with git for windows.	22:02
	does your repo have a .gitatrributes? Namely something like '* text=auto'	22:03
	← Helenah left	22:03
	← jim left	22:03
	← sidetrack left	22:03
rafasc	core.autocrlf also controls the behaviour, I believe gfw asks you what you want to do with end-of-lines when you install.	22:04
	→ jim joined	22:06
	→ lankanmon joined	22:06
Es0teric	rafasc nope	22:12
	i do not have .gitattributes	22:13
	← leeN left	22:14
rafasc	what about: core.autocrlf ?	22:15
	→ HumanGeek joined	22:15
rafasc	git config core.autocrlf	22:15
	(probably true)	22:15
	← Human_G33k left	22:18
	→ beastDivision joined	22:19
	→ f8e3 joined	22:20
f8e3	how do you strucutre your dirs when working with multple workspaces repos etc? dont know how to name them, get confused with grouping by language / theme / ... ?	22:20
	→ unlimiter joined	22:23
rafasc	I have them all in /home/rafasc/git/	22:23
	← Lucas_Gray left	22:24
rafasc	no grouping. Considering changing the name from git to projects/ because I also have a couple of svn and mercurial ones in there.	22:24
	→ mbalmer joined	22:24
	← caskd left	22:26
	→ Helenah joined	22:26
	← crem left	22:27
	← nkz left	22:27
	← feriman left	22:27
	← qpdb left	22:28
	← mbalmer left	22:29
	← beastDivision left	22:29
	→ beastDivision joined	22:30
	← beastDivision left	22:30
	→ qpdb joined	22:31
	← nickodd left	22:32
	← H2Q left	22:34
	← mowcat left	22:35
	→ caskd joined	22:35
	← caskd left	22:35
	→ caskd joined	22:36
	→ jaziz joined	22:38
	← darkstardevx left	22:42
	→ darkstardevx joined	22:43
	→ thebope joined	22:46
	← unlimiter left	22:53
	← g00s left	22:58
f8e3	what if: part of cloned is part of your repo?	22:59
	← justanotheruser left	23:04
	→ ttl joined	23:05
	← caskd left	23:07
	→ caskd joined	23:08
Es0teric	rafasc yes its ture	23:15
rafasc	The files in your workdir probably have LF endings.	23:16
	git is telling you that it will convert it to CRLF in the future, due to your crlf-settings.	23:18
	← statusf90 left	23:18
	→ mbalmer joined	23:18
rafasc	Es0teric: git ls-files --eol; what does it say for one of the mentioned files?	23:19
	← zebrag left	23:19
	→ zebrag joined	23:19
	→ g00s joined	23:20
	← d1b left	23:20
	→ d1b joined	23:21
	→ fragamus joined	23:21
	← shabius_ left	23:22
Es0teric	i/lf w/lf attr/	23:23
	rafasc	23:23
	← mbalmer left	23:23
rafasc	i is the index/repo, w is the worktree.	23:23
	→ statusf90 joined	23:24
	← Ploppz left	23:24
rafasc	why are your files with lf-endings in windows?	23:24
	git prefers lf, so if you have configured your editor to use LF, you may want to disable the autocrlf	23:25
	→ hqdruxn08_ joined	23:26
	← Shentino left	23:29
Es0teric	how do i disable that?	23:29
	rafasc	23:29
	← hqdruxn08 left	23:29
	← Fernando-Basso left	23:29
	← duderonomy left	23:31
	→ Shentino joined	23:32
	→ delli3 joined	23:37
	→ fstd_ joined	23:37
	← thebope left	23:38
	← ttl left	23:38
	← fstd left	23:42
	fstd_ → fstd	23:42
	→ shabius joined	23:43
	→ plexigras joined	23:47
	← captain42 left	23:47
	→ dedowsdi joined	23:47
	→ captain42 joined	23:51
	→ akemhp_ joined	23:54
	← akemhp left	23:56
	→ thebope joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation