IRCloggy #git 2017-03-30

Provider of IRC logs since 2005.

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

	2017-03-30
	morgan_ → Guest18568	00:00
	← Guest18568 left	00:00
	← steeze left	00:00
	← de-facto left	00:01
	→ de-facto joined	00:01
	← dvaske_ left	00:01
	← chipotle left	00:01
	→ dvaske joined	00:02
	← systemovich left	00:02
	← zumba_addict left	00:02
	→ trulycool joined	00:02
	→ systemovich joined	00:02
	→ peterbec` joined	00:03
	→ dsdeiz_ joined	00:04
	← dsdeiz left	00:04
	→ chipotle joined	00:05
	→ s2013 joined	00:06
	→ aw1 joined	00:06
	← Derperperd left	00:07
	← aw1 left	00:07
	→ bdonnahue joined	00:07
	→ aw1 joined	00:07
	→ cam27 joined	00:07
	→ Derperperd joined	00:08
	← aw1 left	00:08
	← chardan left	00:08
	← lavalamp left	00:08
	→ aw1 joined	00:08
	← amdi_ left	00:08
	← aw1 left	00:09
	← Cabanossi left	00:09
	→ aw1 joined	00:09
	← a_thakur left	00:10
	→ Cabanossi joined	00:10
	← aw1 left	00:10
	← drodger left	00:10
	→ a_thakur joined	00:10
	← cyphase left	00:11
	→ Rodya_ joined	00:11
	← ispn left	00:11
	← cyberz left	00:13
	← jtoy left	00:14
	← nd- left	00:14
	→ cyphase joined	00:15
	← Rodya_ left	00:15
	← Lyqyd left	00:16
	→ nd joined	00:16
	→ drodger joined	00:16
	→ cqi joined	00:17
	→ porsche944 joined	00:17
	→ planigan joined	00:17
	← bulletmark left	00:17
	← porsche944 left	00:18
	→ LeBlaaanc joined	00:18
	→ cyberz joined	00:19
	← hashtagstrashtag left	00:19
	→ Rodya_ joined	00:19
	← holodoc left	00:21
	→ holodoc joined	00:22
	← Guest55 left	00:22
	← cyphase left	00:23
	← boombatower left	00:24
	→ mizu_no_oto joined	00:24
	← luke_nukem left	00:25
	← systemovich left	00:25
	→ luke_nukem joined	00:26
	← peterbec` left	00:26
	→ systemovich joined	00:26
	→ cyphase joined	00:28
	→ ronin_work joined	00:29
	← mizu_no_oto left	00:30
	→ wxg joined	00:31
	← Chinggis6 left	00:32
	← dreiss left	00:33
	→ jstimm joined	00:34
	← planigan left	00:35
	→ Chinggis6 joined	00:36
	← luke_nukem left	00:36
	← orbyt_ left	00:37
	→ luke_nukem joined	00:37
	← a_thakur left	00:39
	← cyphase left	00:39
	→ sunrunner20 joined	00:40
	→ Sasazuka_ joined	00:40
	→ a_thakur joined	00:40
	→ planigan joined	00:41
	← Sasazuka left	00:42
	← brent__ left	00:43
	→ cyphase joined	00:44
	← a_thakur left	00:44
	← chitopunk left	00:49
	→ gugah joined	00:50
	← svm_invictvs left	00:51
	← planigan left	00:51
	← cyphase left	00:52
	→ marianina8 joined	00:54
	← wxg left	00:55
	→ steeze joined	00:57
	→ cyphase joined	00:57
	→ planigan joined	00:58
	→ theiostream joined	00:59
	← marianina8 left	00:59
	← ahrs left	01:00
	→ jimklo_ joined	01:00
	→ ahrs joined	01:00
	← planigan left	01:01
	← sunrunner20 left	01:01
	→ orbyt_ joined	01:02
	← ronin_work left	01:03
	← jimklo left	01:03
	→ dsdeiz joined	01:04
	→ zumba_addict joined	01:04
	← jimklo_ left	01:04
	→ svm_invictvs joined	01:04
	→ molgrum joined	01:05
	← molgrum left	01:05
	→ molgrum joined	01:05
	← gopar left	01:05
	← cyphase left	01:05
	← dsdeiz_ left	01:05
	← matoro left	01:07
	← tvw left	01:08
	→ wxg joined	01:09
	← zumba_addict left	01:10
	→ cyphase joined	01:10
	→ jtoy joined	01:12
	→ zumba_addict joined	01:14
	→ lavalamp joined	01:14
zumba_addict	on a shared repo where few devs are working, what will happen if someone pushes a tag that already exist?	01:14
	← Oatmeal left	01:15
kadoban	zumba_addict: Should get rejected, especially if it's different. Not sure if you can -f or not, never tried.	01:15
zumba_addict	thanks	01:16
	→ TbobbyZ joined	01:16
	← cyphase left	01:18
	← afuentes left	01:19
	→ matoro joined	01:19
	← duderono_ left	01:19
	← rnsanchez left	01:20
	→ Kaisyu joined	01:22
	← chipotle left	01:22
	← TbobbyZ left	01:22
	→ peterbec` joined	01:22
	← ThiefMaster left	01:23
	→ cyphase joined	01:23
	← gugah left	01:25
	→ Wulf4 joined	01:26
	← peterbec` left	01:27
	← lmatteis left	01:28
	← Wulf left	01:29
	Wulf4 → Wulf	01:29
	← XenophonF left	01:29
	→ fstd_ joined	01:30
	← trulycool left	01:31
	← fstd left	01:34
	fstd_ → fstd	01:34
	← BenderRodriguez left	01:34
	← s2013 left	01:41
	← sunri5e left	01:42
	→ nevodka joined	01:43
	→ gugah joined	01:43
	→ sunri5e joined	01:44
	← pks left	01:45
	← ilbot3 left	01:45
	← navidr left	01:46
	→ pks joined	01:46
	→ Oatmeal joined	01:46
	← dglambert left	01:47
	→ Guest55 joined	01:47
	→ a_thakur joined	01:48
	→ ilbot3 joined	01:49
	→ XenophonF joined	01:49
	→ dmarr joined	01:50
	← Sasazuka_ left	01:50
	→ Sasazuka joined	01:50
	← cam27 left	01:51
dmarr	I was in a branch and made several changes, then (dumbly) without committing I stashed. I checked out master and pulled, created a new branch and `stash pop`, thinking i would just add a single change i wanted to add to master until going back to my original branch. now my conflicts are in a branch off of master due to the stash pop, and im not sure how to reapply the stash pop to my original branch again	01:51
	→ rchavik joined	01:52
	← a_thakur left	01:53
	← Cabanossi left	01:53
	← AlHafoudh left	01:54
	→ Cabanossi joined	01:55
	← Nothing4You left	01:55
	← jtoy left	01:56
dmarr	if i git stash again, that will try to stash the conflicted changes right?	01:57
	← thebope left	01:57
	→ tmsmith joined	01:58
	← steeze left	01:58
	→ dave0x6d joined	01:58
	← d^sh left	01:58
	← dsdeiz left	01:58
	← Gustavo6046 left	02:00
	→ ronin_work joined	02:00
	→ AlHafoudh joined	02:00
	→ MacGyver joined	02:01
	→ roflin joined	02:01
	→ Nickeeh joined	02:01
	→ s2013 joined	02:01
	→ d^sh joined	02:01
	← Sasazuka left	02:02
	← peacememories left	02:02
	→ kbeflo joined	02:04
dmarr	phew, git is smart enough to know not to drop a stash if it doesn't apply cleanly	02:04
	← cqi left	02:05
	→ tmg joined	02:06
	← mikecmpbll left	02:06
kadoban	dmarr: Yep, thankfully. Glad you figured it out, was just going to suggest that.	02:07
	→ dsdeiz joined	02:07
	← dsdeiz left	02:07
	→ dsdeiz joined	02:07
	→ Nothing4You joined	02:08
	→ Goplat joined	02:08
dmarr	crisis avoided :)	02:09
	i did have to move some files that would have been overwritten, and re-delete some stuff but things worked out	02:10
	← dedondesta left	02:11
	← nevodka left	02:11
	← raspado left	02:15
	← cyberz left	02:17
	→ Nilesh_ joined	02:17
	→ cyberz joined	02:18
	→ trulycool joined	02:18
	← askb left	02:18
	→ roelmonnens joined	02:19
	→ peterbecich joined	02:20
	→ lagothri1 joined	02:20
	← hexagoxel left	02:21
	→ jtoy joined	02:21
	← roelmonnens left	02:23
	← trulycool left	02:23
	← durham left	02:23
	← lagothrix left	02:23
	→ durham joined	02:23
	← durham left	02:24
	→ peterbec` joined	02:24
	→ durham joined	02:24
	← durham left	02:25
	→ hexagoxel joined	02:26
	→ raspado joined	02:26
	← peterbec` left	02:29
	→ steeze joined	02:31
	← SuperLag left	02:32
	← Rodya_ left	02:32
	← cyberz left	02:33
	← sz0 left	02:34
	→ cyberz joined	02:35
	← ronin_work left	02:35
	→ sunrunner20 joined	02:36
	→ a_thakur joined	02:37
	→ boombatower joined	02:38
	← alexandre9099 left	02:38
	← kbeflo left	02:38
	→ alexandre9099 joined	02:39
	← HoierM left	02:40
	→ zerow\|afk joined	02:41
	→ Emperor_Earth joined	02:42
	← LeBlaaanc left	02:43
	← a_thakur left	02:43
	← CheckDavid left	02:44
	← lb1c left	02:44
	← wagle left	02:44
	→ lb1c joined	02:44
	→ wagle joined	02:45
	→ thebope joined	02:45
	← zerow\|afk left	02:46
	→ ljc joined	02:49
	← s2013 left	02:49
	→ mischat joined	02:50
	← thebope left	02:50
	← Gsham left	02:51
	← Cabanossi left	02:53
	← sunrunner20 left	02:54
	→ Vortex35 joined	02:54
	→ Cabanossi joined	02:54
	← mischat left	02:55
	← gugah left	02:56
	→ andrew710 joined	02:57
	→ mazeinmaze joined	02:57
	→ sunrunner20 joined	02:57
	← Vortex34 left	02:58
	← hyperair left	02:58
	← chachasmooth left	02:58
	→ hyperair joined	02:58
	← ojdo left	02:59
	← jstimm left	02:59
	→ chachasmooth joined	03:00
	← ljc left	03:01
	→ Darren_ joined	03:02
	← Anja_ left	03:03
	ShapeShifter499 → ShapeShifter500	03:06
	→ ojdo joined	03:06
	→ jimi_ joined	03:06
	→ aavrug joined	03:06
	← Darren_ left	03:07
	← Cabanossi left	03:07
	← jtoy left	03:07
	→ gugah joined	03:07
	ShapeShifter500 → ShapeShifter499	03:08
	← al-damiri left	03:08
	→ Cabanossi joined	03:08
	→ marianina8 joined	03:10
	→ hhee joined	03:11
	→ inflames joined	03:11
	→ chipotle joined	03:13
	→ snowkidind joined	03:14
	← cyberz left	03:14
	← mazeinmaze left	03:14
	→ mehola joined	03:14
	← marianina8 left	03:14
	← raspado left	03:15
	→ s2013 joined	03:16
	→ raspado joined	03:16
	→ ohcibi joined	03:16
	← raspado left	03:16
	→ raspado joined	03:17
	← hhee left	03:17
	→ LeBlaaanc joined	03:19
	→ cyberz joined	03:20
	← raspado left	03:21
	← cyberz left	03:25
	→ peterbec` joined	03:25
	→ robotroll joined	03:26
	← tyreld left	03:26
	→ TbobbyZ joined	03:26
	→ cqi joined	03:29
	← peterbec` left	03:30
	→ planigan joined	03:31
	→ cyberz joined	03:31
	→ ronin_work joined	03:32
	→ safe joined	03:32
	→ dreiss joined	03:32
	→ Darren_ joined	03:32
	→ Pseudocrat joined	03:34
	← dirtyroshi left	03:35
	← cyberz left	03:35
	→ allen23 joined	03:36
	→ cyberz joined	03:36
	← TbobbyZ left	03:36
	← allen23 left	03:37
	← chipotle left	03:37
	→ thebope joined	03:39
	← cyberz left	03:42
	← Guest55 left	03:43
	→ fakenerd joined	03:43
	← thebope left	03:44
	→ cyberz joined	03:45
	→ xall joined	03:45
	→ trulycool joined	03:46
	→ kusznir joined	03:48
	→ khfeng joined	03:48
	← alexandre9099 left	03:49
kusznir	Hi all: I'm trying to make my first contribution to a project, but it appears to me that somehow git got out of sync and "lost" my contributions...	03:49
	Work flow: some time ago, I cloned the project's repo to my workstaton. Over the past few months, made some changes. Ran git status, and saw the changes I made. Ran git add <files> (as they were new files). Git status showed them in green now.	03:50
	Ran git commit -m "my message". It responded positively.	03:50
	Ran git push, and it failed as it should (I don't have permissions to direclty pus to project repo)	03:51
	→ chipotle joined	03:51
	→ mischat joined	03:51
	← Cabanossi left	03:51
	→ alexandre9099 joined	03:51
kusznir	So I went online to github, forked it, then git add myrepo <url>	03:52
	Git commit myrepo origin/4.2.	03:52
	It reported successful, that it uploaded the files and such.	03:52
kadoban	"git add myrepo <url>" is hopefully missing a word. "git remote add ..." ?	03:52
kusznir	But then I go back to github, under my account/my fork, branch 4.2, and nothing is there, and github says my branch is identical to the upstream project.	03:52
kadoban	"Git commit myrepo origin/4.2" ... what?	03:53
thiago	what do you mean by this: kusznir> Git commit myrepo origin/4.2.	03:53
	that is not a Git command	03:53
kusznir	Sorry, typo. Here's the cut and paste: git push myrepo origin/4.2	03:53
	→ Cabanossi joined	03:54
thiago	so you pushed origin's 4.2 to myrepo	03:54
	but since you said that push to origin failed, that command did not push your commit	03:54
kusznir	https://pastebin.com/YeAqkVuf <- cut and paste from my terminal of the steps taken.	03:55
	← peterbecich left	03:56
thiago	you need to push 4.2, not origin/4.2	03:56
kadoban	Ya, that ^	03:56
kusznir	git status showed origin/4.2, and until I added origin/4.2, I got errors.	03:56
	→ leeN joined	03:56
	← mischat left	03:56
kusznir	thiago: that's what I thought, but when I try, I get this: error: src refspec 4.2 matches more than one.	03:56
	When I specified origin/4.2, then it actually uploaded my files (at least, it reported uploading the same number of files I expected it to)	03:57
kadoban	4.2 is a bit of a weird branch name. You maybe have a tag of that name as well?	03:57
	← Noodlewitt left	03:57
kusznir	No idea...all this started with a clone of fusionpbx branch 4.2	03:57
kadoban	origin/4.2 is the 4.2 branch from origin, it's not the local one you've been doing stuff in.	03:58
kusznir	git status currently shows this: Your branch is ahead of 'origin/4.2' by 1 commit.	03:58
	→ mizu_no_oto joined	03:58
	→ justan0theruser joined	03:58
kadoban	kusznir: Try uhm ... 'git push myrepo refs/heads/4.2:4.2'	03:59
kusznir	git push myrepo refs/heads/4.2:4.2	03:59
	error: dst refspec 4.2 matches more than one.	03:59
	← justanotheruser left	03:59
thiago	refs/heads/4.2 after the colon too	03:59
kadoban	Oh the destination is ambiguous, interesting. Ya that ^	04:00
thiago	you probably do have a tag called "4.2" too	04:00
	← gugah left	04:00
kadoban	4.2 is really just a bad branch name, that's why this is tedious. It's not a great idea to have a branch with the same name as a tag usually. Though ya, it sounds like that wasn't your choice.	04:00
	← prions left	04:00
kusznir	! [rejected] 4.2 -> 4.2 (fetch first) error: failed to push some refs to 'git@github.com:kusznir/fusionpbx.git'	04:00
kadoban	Sounds like you have different history compared to origin/4.2 then	04:01
kusznir	There is no other users pushing to my branch. There are no changes on my branch other than the changes I want to commit/push.	04:01
	My github account says my 4.2 is identical to upstream 4.2 (origin, in this case)	04:01
kadoban	Do you just want to nuke what's already on myrepo's 4.2 branch and make it equal to your current one? That changes published history, but it sounds like you're just setting this thing up, so usually you don't care.	04:02
	→ peeps[lappy] joined	04:02
thiago	4.2 is a good branch name	04:03
	it's a bad tag name, though	04:03
kusznir	Not sure I fully understand...I do NOT want to change the files on my local box (its actually running in production; I was uploading my changes made from my production environment)	04:03
thiago	kusznir: push -f	04:03
kusznir	I don't care about killing any references this has to myrepo, or destroying the fork on github or anything that doesn't change the actual project files on my system's disk.	04:03
	thiago: that appears to have taken (same response I got the first time I was successful); checking online now.	04:04
	Ok, now it is showing online too!	04:04
kadoban	Huzzah	04:05
	← orbyt_ left	04:06
	← ronin_work left	04:06
	← Blkt left	04:07
	→ roelmonnens joined	04:07
	← s2013 left	04:07
	← ryxxed left	04:08
	← safe left	04:08
	→ Blkt joined	04:08
	← alexandre9099 left	04:09
	← de-facto left	04:10
	← GodGinrai left	04:10
	→ BenderRodriguez joined	04:11
	← roelmonnens left	04:11
	→ alexandre9099 joined	04:11
	→ de-facto joined	04:11
	← fakenerd left	04:12
	→ freimatz joined	04:12
	← steeze left	04:13
	→ ryxxed joined	04:14
	→ MutantMahesh joined	04:14
	→ bocaneri joined	04:15
	← bocaneri left	04:15
	→ bocaneri joined	04:18
	→ forrestv joined	04:18
	← maroloccio left	04:18
	→ steeze joined	04:20
	← ShapeShifter499 left	04:20
	← cyphase left	04:20
	← MutantMahesh left	04:21
	→ alexandre9099_ joined	04:22
	← trulycool left	04:22
	← snowkidind left	04:23
	→ safe joined	04:23
	→ peterbec` joined	04:24
	← alexandre9099 left	04:24
	alexandre9099_ → alexandre9099	04:24
	← mizu_no_oto left	04:25
	→ Noodlewitt joined	04:25
	← robotroll left	04:27
	← Chinggis6 left	04:27
	← bocaneri left	04:28
	→ bocaneri joined	04:28
	← bocaneri left	04:28
	→ Chinggis6 joined	04:29
	→ a_thakur joined	04:30
	→ zerow\|afk joined	04:31
	→ jnewt joined	04:32
	→ nevodka joined	04:32
	→ thebope joined	04:33
	← a_thakur left	04:34
	→ a_thakur joined	04:34
	← Chinggis6 left	04:34
	→ kbeflo joined	04:34
	← alexandre9099 left	04:35
	← freimatz left	04:36
	→ alexandre9099 joined	04:37
	→ qmr joined	04:37
	← thebope left	04:38
	← Cabanossi left	04:38
	→ notebox joined	04:38
	→ dustinm joined	04:38
	→ Cabanossi joined	04:38
	← notebox left	04:39
	→ TbobbyZ joined	04:39
	→ Timvde\| joined	04:43
	→ bocaneri joined	04:43
	→ cyphase joined	04:43
	← TbobbyZ left	04:45
	← wxg left	04:45
	← cyberz left	04:46
	→ ayogi joined	04:47
	→ cyberz joined	04:48
	→ trulycool joined	04:49
	← steeze left	04:51
	← jimi_ left	04:52
	← cyphase left	04:52
	→ jimi_ joined	04:52
	→ mischat joined	04:52
	← jimi_ left	04:53
	→ jimi_ joined	04:53
	← jimi_ left	04:53
	→ janat08 joined	04:54
	→ jimi_ joined	04:54
	← jimi_ left	04:54
	→ jimi_ joined	04:55
	→ fakenerd joined	04:55
	← jimi_ left	04:55
	← aidalgol left	04:56
	→ cyphase joined	04:57
	← mischat left	04:57
	← oleo left	05:01
	← trulycool left	05:01
	→ rscata joined	05:01
	→ SteffanW joined	05:02
	→ pwnz0r joined	05:03
	← cyberz left	05:03
	→ cyberz joined	05:03
	→ MutantMahesh joined	05:04
	← safe left	05:04
	→ Endarked joined	05:05
	← SteffanW left	05:07
	← lavalamp left	05:08
	← BlueMatt left	05:08
	← cyberz left	05:09
	← dsdeiz left	05:09
	→ dec0n joined	05:09
	→ BlueMatt joined	05:09
	← cyphase left	05:10
	→ dsdeiz joined	05:10
	→ cyberz joined	05:10
	← dsdeiz left	05:10
	→ dsdeiz joined	05:10
	← GT4066 left	05:12
	→ UTAN_dev_ joined	05:12
	← Darren_ left	05:12
	← salios left	05:12
	← LeBlaaanc left	05:13
	→ sbulage joined	05:13
	← skered left	05:14
	← hfp_work left	05:14
	← hfp left	05:14
	← robnester left	05:14
	← UTAN_dev left	05:15
	→ cyphase joined	05:15
	→ [sarri] joined	05:15
	→ bambams_ joined	05:15
	→ cydrobolt_ joined	05:15
	← sarri left	05:15
	← cydrobolt left	05:15
	← TheOrangeOne left	05:15
	← umbSublime left	05:15
	→ jerrcs joined	05:16
	→ umbSublime joined	05:16
	← umbSublime left	05:16
	→ umbSublime joined	05:16
	→ salios joined	05:16
	→ TheOrangeOne joined	05:16
	→ __builtin joined	05:16
	→ hfp_work joined	05:16
	← zerow\|afk left	05:17
	← cyberz left	05:17
	→ zerow joined	05:17
	← pwnz0r left	05:18
	→ robnester joined	05:20
	← Noodlewitt left	05:20
	→ cyberz joined	05:20
	← bdonnahue left	05:20
	→ hfp joined	05:21
	← g0d355__ left	05:21
	← salios left	05:21
	← darkbit left	05:22
	→ jameser joined	05:23
	← inflames left	05:24
	← XenophonF left	05:24
	→ inflames joined	05:25
	→ marianina8 joined	05:26
	→ XenophonF joined	05:26
	→ thebope joined	05:27
	← kristofferR left	05:28
	← cyphase left	05:29
	← ashnur left	05:29
	← marianina8 left	05:31
	← BlueMatt left	05:33
	← MuffinMedic left	05:33
	→ darkbit joined	05:33
	→ cyphase joined	05:33
	→ ashnur joined	05:33
	← ashnur left	05:33
	→ ashnur joined	05:33
	→ yan joined	05:33
	← thebope left	05:33
	← forgot left	05:33
	→ qt-x joined	05:34
	← inflames left	05:34
	→ inflames joined	05:35
	→ AlgorithmWizard joined	05:35
	→ pelegreno_ joined	05:35
	→ salios joined	05:35
	→ forgot joined	05:35
	← cyphase left	05:36
	→ bodie_ joined	05:36
	→ cyphase joined	05:37
	→ BlueMatt joined	05:37
	→ MuffinMedic joined	05:39
	← cyberz left	05:40
	← jameser left	05:41
	→ regedit joined	05:43
	→ cyberz joined	05:43
	→ brent__ joined	05:44
	→ watom- joined	05:45
	← fakenerd left	05:45
	→ fakenerd joined	05:46
	← TikityTik left	05:46
	→ chardan joined	05:47
	← nckpz left	05:47
	← Aaron1011 left	05:48
	← brent__ left	05:49
	→ Aaron1011 joined	05:49
	← Aaron1011 left	05:49
	→ Aaron1011 joined	05:49
	← cyberz left	05:51
	← Cabanossi left	05:52
	→ cyberz joined	05:53
	→ mischat joined	05:53
	→ Cabanossi joined	05:54
	→ roelmonnens joined	05:55
	→ Andrew_K joined	05:55
	→ ThiefMaster joined	05:56
	← diogenese left	05:56
	← mischat left	05:58
	← cyphase left	05:58
	← cyberz left	05:58
	← qt-x left	05:59
	← roelmonnens left	05:59
	→ cyberz joined	05:59
	→ Raging_Hog joined	05:59
	← peterbec` left	06:00
	→ diogenese joined	06:01
	→ Assault joined	06:02
	→ zefferno joined	06:02
	→ cyphase joined	06:02
	← cyberz left	06:03
	→ ronin_work joined	06:03
	← Shahzad left	06:04
	→ elementalest joined	06:05
	→ cyberz joined	06:06
	← chardan left	06:09
	→ peterbec` joined	06:09
	→ wxg joined	06:10
	← cyphase left	06:10
	← lb1c left	06:13
visual	morning fellas	06:14
	← darkbit left	06:15
	→ cyphase joined	06:15
	→ roelmonnens joined	06:17
	← roelmonnens left	06:18
	→ masuberu joined	06:18
	→ roelmonnens joined	06:18
	← cyphase left	06:20
	→ thebope joined	06:21
	← Sleepy63 left	06:22
	← TomyLobo2 left	06:24
	→ darkbit joined	06:25
	→ cyphase joined	06:25
	→ lb1c joined	06:25
	← thebope left	06:26
	→ pietv joined	06:26
	← dvaske left	06:26
	→ User4587_ joined	06:28
	→ fbwnd joined	06:29
	← drodger left	06:29
	← hagabaka left	06:29
dysfigured	i want to put my weechat config in my dotfiles repo, buut i don't want to track my server listing in vcs.. so i'm wondering, is there a way to make sure i never commit a chunk of a file? or, is there a way i can automate staging up to a certain point in a file? for instance, i could sed '/^\[servers/q' and get the relevant portion i'd want to commit, but idk how to stage a file by stdin like that..	06:29
	← Pseudocrat left	06:29
	→ drodger joined	06:30
	→ trulycool joined	06:30
	← drodger left	06:30
	← User458764 left	06:31
osse	dysfigured: man gitattributes, look at clean and smudge filters	06:31
gitinfo	dysfigured: the gitattributes manpage is available at http://jk.gs/gitattributes.html	06:31
dysfigured	hm cheers	06:31
	→ Silmarilion joined	06:31
	→ hagabaka joined	06:32
	← cyphase left	06:33
	→ t0by joined	06:35
	→ drodger joined	06:36
	← dreiss left	06:36
	← inflames left	06:37
	→ buzzLightBeer joined	06:37
	→ seitensei joined	06:38
	→ cyphase joined	06:38
	← ronin_work left	06:38
	← cyberz left	06:38
	→ cyberz joined	06:41
	→ rokups joined	06:43
	→ nckpz joined	06:43
	← roentgen left	06:44
	bambams_ → bambams	06:44
	→ TbobbyZ joined	06:45
	← luke_nukem left	06:46
	← menip left	06:46
	→ roelmonn_ joined	06:47
dysfigured	so, i woudl add something like irc.conf filter=strip_server to .gitattributes? and then use clean = sed.. but where do i put the [filter..] block? in the .gitattributes file as well?	06:48
	→ luke_nukem joined	06:48
	← thiago left	06:49
	← TbobbyZ left	06:49
	← cyphase left	06:49
	→ wxg4irc joined	06:51
	← roelmonnens left	06:51
	← Cabanossi left	06:51
	→ imack joined	06:53
osse	dysfigured: .git/config	06:53
	← wxg left	06:54
	→ Cabanossi joined	06:54
	→ smiiley joined	06:54
	→ mischat joined	06:54
	→ cyphase joined	06:54
	→ ogny joined	06:55
dysfigured	ahh. hmm but changes to that don't get saved to remote do they? so when i clone i have to re-create the filter?	06:56
osse	yes	06:56
	← fbwnd left	06:56
	→ fbwnd joined	06:56
dysfigured	bummer. oh well, still better than manually reviewing commits to make sure i didn't accidentally add secrets	06:57
	→ Forlorn joined	07:00
	← systemovich left	07:00
	→ dglambert joined	07:01
	← mischat left	07:02
	→ jnavila joined	07:02
	← buzzLightBeer left	07:03
	← Raging_Hog left	07:05
	→ Raging_Hog joined	07:05
	→ Tobbi joined	07:05
	→ JeroenT joined	07:05
	→ borkr joined	07:06
	→ overlord_tm joined	07:07
	← Raging_Hog left	07:07
	→ Raging_Hog joined	07:07
dysfigured	what..the.. so apparently clean = sed 's/^\[servers\]/q' creates invalid syntax in .git/config	07:08
	← cyphase left	07:09
osse	dysfigured: but if the filter was in the repo then nothing would have been achieved	07:10
	← peterbec` left	07:10
	← leeN left	07:11
	← cyberz left	07:12
	→ chardan joined	07:12
	→ catch22 joined	07:13
	← wxg4irc left	07:13
	→ cyberz joined	07:14
	→ fbwnnd joined	07:14
	→ cyphase joined	07:14
	→ thebope joined	07:16
	← trulycool left	07:16
	→ trulycool joined	07:17
	← royiv left	07:17
	→ dersand joined	07:17
	← nowhere_man left	07:17
	→ TomyWork joined	07:17
	← lucasem left	07:17
	→ Guest54 joined	07:18
	→ royiv joined	07:19
	← lb left	07:19
	→ lucasem joined	07:20
	← thebope left	07:20
	→ skered joined	07:21
	← t0by left	07:21
	→ PHPanos joined	07:21
	← oskarkv left	07:22
	→ Silenced joined	07:23
	→ flaviodesousa joined	07:24
	← cyphase left	07:24
	← fbwnnd left	07:24
	→ thomas-oneill joined	07:24
thomas-oneill	hey I got a bunch of unstaged/untracked changes that I want to get rid of, except for one or two files. And for fun, let's say in those one or two files maybe I only want to use some of the changes, so like -p. What's your workflow for this? Vaguely re-call that git-stash might be the thing for this... Will read that man now actually...	07:25
	← Silenced left	07:26
	→ Silenced joined	07:26
	← janat08 left	07:26
	← jn__ left	07:26
	← nckpz left	07:27
osse	thomas-oneill: i would git checkout -p -- partialfiles to get rid of the changes you want. so now you have a couple of files you want to keep whole, and garbage	07:27
	thomas-oneill: then I'd stage those files you want to keep with git add. after that you can do 'git checkout -- .' on the whole lot	07:28
	← Guest54 left	07:28
	← roelmonn_ left	07:29
	→ cyphase joined	07:29
osse	git checkout -p lets you say yes ro no on a file-basis too, so if it's not too much you can use that all the way	07:29
	→ roelmonnens joined	07:29
	→ lb joined	07:29
	→ achadwick joined	07:29
	lb → Guest30225	07:29
	← Goplat left	07:30
thomas-oneill	oh yeah sweet	07:30
	← elementalest left	07:31
	← Endarked left	07:32
	← Silenced left	07:32
	← dsdeiz left	07:33
	→ Silenced joined	07:33
	← Silenced left	07:33
	→ Silenced joined	07:33
	→ ronin_work joined	07:35
	← gtristan left	07:36
	→ sea-gull joined	07:36
	→ memfrob joined	07:37
	← boombatower left	07:37
	→ ertes joined	07:38
	← Cabanossi left	07:38
memfrob	Hey everyone! I just wanted to thank this channel again for helping me out so much, I've been able to backport 125 kernel patches from 4.9 to 4.4 so far and I'm making great progress.	07:38
	I started over again recently as my development plan before was a mess, but after learning about git cherry-pick it's a heck of a lot easier.	07:39
	→ chele joined	07:39
	→ Cabanossi joined	07:39
memfrob	A few members said they were interested in what I was working on, the patch series (incomplete) is hosted here: https://github.com/NTULINUX/kernel-patches/tree/master/security_backports	07:39
	a full kernel repo will be available once it's tested and ensured that's working properly, thank you all again so much!	07:40
	→ Gloomy joined	07:40
memfrob	KASLR, hardened usercopy, tons of kernel hardening techniques developed in kernel 4.9 and 4.10 will be backported to 4.4 and I couldn't have done it without you #git	07:41
	← drodger left	07:41
	← cyberz left	07:41
	→ cyberz joined	07:43
	← cyphase left	07:45
	← Gloomy left	07:45
	← royiv left	07:46
	→ drodger joined	07:46
	← JeroenT left	07:47
	→ schleppel joined	07:47
	→ JeroenT joined	07:47
	→ chigang joined	07:48
	→ royiv joined	07:48
	→ King_Hual joined	07:49
	→ dvaske joined	07:49
	← Silenced left	07:49
	← masuberu left	07:50
	→ Silenced joined	07:50
	← Silenced left	07:50
	→ Silenced joined	07:50
	→ cyphase joined	07:50
	← memfrob left	07:52
	→ masuberu joined	07:52
	← trulycool left	07:53
	→ grayjoc joined	07:53
	→ shinnya joined	07:54
	← regedit left	07:54
	→ mikecmpbll joined	07:56
	→ manuelschneid3r joined	07:57
	→ Murii joined	07:58
	→ marcvangend joined	07:59
	→ kurkale6ka joined	08:00
	→ deanc joined	08:01
	← ronin_work left	08:01
deanc	Hi. I want to interactively view the diffs of individual files that are currently not in staging (haven't been git added)	08:01
	→ ronin_work joined	08:01
deanc	git add -i doesn't seem to do what i would hope. it only allows me to view the diffs from things i have already git added	08:01
	→ zeroed joined	08:02
	← zeroed left	08:02
	→ zeroed joined	08:02
	← cqi left	08:02
marcvangend	Hi, we're getting a segmentation fault on Windows 10 when doing a git status. Where do I start debugging?	08:02
	→ elect_ joined	08:03
	→ jtoy joined	08:04
	→ tvw joined	08:04
	→ gtristan joined	08:05
	← cyphase left	08:06
osse	deanc: i think you're misunderstanding	08:07
	→ peterbec` joined	08:07
	← Silenced left	08:08
deanc	osse: yes i think i misunderstood what git add -i will do also. What workflow could I use to to see a diff on a whole file and either add it or ignore and then interactively move on to the next file?	08:08
	Right now I have to type git diff <path> and then git add <path> and then go back to git status from time to time when my buffer is full etc.	08:08
	→ jim_carry joined	08:08
	← Cabanossi left	08:08
	← jtoy left	08:08
	→ Silenced joined	08:08
jim_carry	Any one use vim-fugitive? What is Gblame? how to use it?	08:09
	→ Cabanossi joined	08:09
	← Silenced left	08:09
osse	deanc: add -i will let you view the diffs of files that are modified. not sure what you mean	08:09
jim_carry	I understand it shows who changes last time line by line	08:09
osse	jim_carry: type :Gblame when editing a file. that's it.	08:09
jim_carry	what is reblame	08:09
	← svm_invictvs left	08:10
osse	reblame = running git blame over again from that point in history	08:10
	→ thebope joined	08:10
	→ cyphase joined	08:10
immae	deanc: try "git add -p" ?	08:10
jim_carry	osse: That means who changes that line before the last user	08:11
deanc	osse: right now in git status i have about 10 files changed. some are staged, some are not. If I type in git add -i and then 6 i would expect it to let me see diffs of files that are not added to staging to decide whether to stage or not. It only shows a list of files that are staged	08:11
	→ octo8_ joined	08:11
	noctux` → noctux	08:11
deanc	immae: git add -p is too granular. i am not interested in breaking down a diff on a file into smaller commits. All i want to do is see a diff on a file and say y/n and move on to the next until complete	08:11
osse	deanc: strange. it shows both here	08:12
	← peterbec` left	08:12
osse	jim_carry: it means run git blame as if that was the newest version of the file	08:12
deanc	osse: on ad different repo where i have not run git add at all on the changed I've made - if i type git add -i and then type 6 to do the diff, there is nothing int he list. it just shows me a list of commands	08:13
osse	deanc: git add -p lets you select "stage this hunk and all later hunks in the file"	08:13
	← zumba_addict left	08:13
deanc	osse: at least when i tried git add -p earlier it would show one hunk at a time so it would not be safe to stage later hunks as they are not on my screen	08:13
osse	deanc: these files you don't see, are they utnracked?	08:14
	← zerow left	08:14
	← thebope left	08:14
	← mikecmpbll left	08:14
	← cyphase left	08:15
deanc	no, they are tracked	08:15
	← mar77i left	08:17
osse	add -i's diff subcommand shows diff between HEAD and index	08:17
	aka. what is set to be committed	08:17
	seems there is no equivalent for working tree and index	08:17
deanc	okay then it doesn't do what i would want	08:18
	i wonder if there is a third-party tool i could run to aid with this workflow	08:18
	i don't like the idea of adding everything and then using git add -i to undo things	08:19
	← jim_carry left	08:19
osse	what is it that you want, exactly?	08:19
	answer yes or no to each file, and if yes the whole file is added?	08:19
	→ clmsy joined	08:20
	← sarbs left	08:21
	→ sarbs joined	08:22
osse	deanc: git diff --name-only \| while read -r file; do git diff -- "$file"; read -p "Add $file ?" </dev/tty; if [[ $REPLY = [Yy]* ]]; then git add "$file"; fi; done	08:23
deanc	what on earth.. :D	08:24
	let's see...	08:24
	very impressive :) mind if i add this to my personal git tips blog post?	08:25
	I mainly use it as a personal reference, nobody goes there	08:25
	← madewokherd left	08:26
	→ kexmex joined	08:26
	→ marcogmonteiro joined	08:26
deanc	In fact, I'm not entirely sure how to make that into an alias	08:27
osse	deanc: please don't. write it to a file named 'git-foo' where foo is what you'd alias it to, and put it in $PATH	08:32
deanc	check	08:32
crater2150	hi, since updating to 2.12 I get perl syntax errors on git add -i: https://paste.pound-python.org/show/EIruOT8FSHCgxHY1efuC/	08:32
	as other users of the same distro (voidlinux) can't reproduce it, could there maybe be some new dependency that I'm missing?	08:33
osse	that said, I think you can do git config alias.foo '!git diff --name-only \| while read -r file; do git diff -- "$file"; read -p "Add $file ?" </dev/tty; if [[ $REPLY = [Yy]* ]]; then git add "$file"; fi; done && :'	08:33
	→ cqi joined	08:33
osse	but at some point you gotta admit that it's not longer an alias, it's a new subcommand	08:33
	→ ispn joined	08:33
	→ eahmedshendy joined	08:33
	→ mikecmpbll joined	08:34
	← sveinse left	08:36
	→ notebox joined	08:37
	→ buzzLightBeer joined	08:37
	Timvde\| → Timvde	08:38
	→ sotoz joined	08:39
	→ netroxen joined	08:41
	← bwn left	08:41
	→ Silenced joined	08:43
	→ sbasso joined	08:46
	← matoro left	08:48
	→ TbobbyZ joined	08:48
	← scoobertron left	08:48
	→ scoobertron joined	08:48
	→ jagob joined	08:48
	← drodger left	08:49
	→ drodger joined	08:51
	← royiv left	08:51
	← molgrum left	08:52
	→ royiv joined	08:52
	← TbobbyZ left	08:52
	← Silenced left	08:53
	→ mischat joined	08:53
	→ molgrum joined	08:53
	← molgrum left	08:53
	→ molgrum joined	08:53
	← King_Hual left	08:55
	← notebox left	08:57
	→ ThomasLocke joined	08:57
	← sbasso left	08:58
	→ sbasso joined	09:00
	← zefferno left	09:00
	→ matoro joined	09:01
	← zeroed left	09:01
	→ dorian_ joined	09:01
	→ bwn joined	09:02
	gitinfo set mode: +v	09:03
	← sbasso left	09:03
deanc	I see you point osse, but as it's git specific it's nice to have as an alias. big thank you :)	09:04
osse	deanc: git-rebase is git specific, and yet it's a script and not an alias :O	09:05
	at a point the aliases become so large and unwieldly that they're a pain to deal with	09:05
	← molgrum left	09:07
	→ peterbec` joined	09:08
	→ exotime joined	09:09
	→ King_Hual joined	09:10
	← King_Hual left	09:10
	→ King_Hual joined	09:10
	→ molgrum joined	09:10
	← molgrum left	09:10
	→ molgrum joined	09:10
	→ zefferno joined	09:13
	← peterbec` left	09:14
	→ fees joined	09:17
	← marcvangend left	09:17
	→ MineCoins joined	09:17
	→ Gloomy joined	09:23
	→ sbasso joined	09:23
	← dyce[m] left	09:24
	← am2on left	09:24
	← Retropikzel[m] left	09:24
	← elwan7[m] left	09:24
	← unclechu left	09:24
	← hiq[m] left	09:24
	← monomon[m] left	09:24
	← keks[m] left	09:24
	← UncleCJ left	09:24
	← dikiaap left	09:24
	← patrickr[m] left	09:24
	← aviraldg left	09:24
	← KevinMGranger left	09:24
	← musicmatze[m] left	09:24
	← M-meznak left	09:24
	← heftig left	09:24
	← SpEcHiDe left	09:24
	← saintaquinas[m] left	09:24
	← Remramm left	09:24
	← flo[m] left	09:24
	← spinningarrow[m] left	09:24
	← jascot[m] left	09:24
	← logos[m] left	09:24
	← Elliott[m]1 left	09:24
	→ Asenar joined	09:25
	← theiostream left	09:26
	← pietv left	09:26
	← zefferno left	09:28
	→ D4R5C0D3 joined	09:29
	→ dsdeiz joined	09:29
	← smiiley left	09:29
	→ aviraldg joined	09:30
	← jagob left	09:31
	→ mischat_ joined	09:32
	→ jagob joined	09:32
	← nevodka left	09:33
	→ ShapeShifter499 joined	09:34
	← raynold left	09:34
	← mischat left	09:35
	← dsdeiz left	09:35
	→ marcvangend joined	09:35
	← MineCoins left	09:35
	← D4R5C0D3 left	09:37
	→ D4R5C0D3 joined	09:39
	→ Ice_Strike joined	09:40
	→ maroloccio joined	09:40
	→ zefferno joined	09:40
	← zefferno left	09:40
	→ zefferno joined	09:40
	→ IRQ` joined	09:43
	← luke_nukem left	09:44
	← dglambert left	09:45
	→ btree joined	09:47
	→ Silenced joined	09:48
	← andrew710 left	09:50
	← sarbs left	09:51
	→ monomon[m] joined	09:51
	→ spinningarrow[m] joined	09:51
	→ flo[m] joined	09:51
	→ saintaquinas[m] joined	09:51
	→ elwan7[m] joined	09:51
	→ heftig joined	09:51
	→ am2on joined	09:51
	→ Elliott[m]1 joined	09:51
	→ dyce[m] joined	09:51
	→ dikiaap joined	09:51
	→ unclechu joined	09:51
	→ jascot[m] joined	09:51
	→ M-meznak joined	09:51
	→ KevinMGranger joined	09:51
	→ musicmatze[m] joined	09:51
	→ keks[m] joined	09:51
	→ logos[m] joined	09:51
	→ Remramm joined	09:51
	→ UncleCJ joined	09:51
	→ SpEcHiDe joined	09:51
	→ patrickr[m] joined	09:51
	→ hiq[m] joined	09:51
	→ Retropikzel[m] joined	09:51
	→ Jaiss joined	09:53
	← th_ left	09:53
	→ sarbs joined	09:55
	← feodaron left	09:56
	→ YuGiOhJCJ joined	09:56
	← TomyWork left	09:56
	← PHPanos left	09:57
	→ thebope joined	09:58
	→ dsdeiz joined	09:59
	→ feodaron joined	09:59
	→ Gotham25 joined	10:00
	← masuberu left	10:01
	← fletom left	10:01
	→ TbobbyZ joined	10:01
	→ brent__ joined	10:01
	← Tobbi left	10:02
	→ b100s joined	10:03
	← thebope left	10:03
	← dsdeiz left	10:03
Gotham25	Hi, I'm using eclipse git plugin. I have cloned a repo from bitbucket account. It was working fine since yesterday. Now there was a change done and committed in one branch yesterday. And today when I used the fetch from upstream option, it fetched the changes done in that branch. But in Git perspective under Remote Branch I'm not able to find it....	10:04
	Can anyone guide me in resolving this issue	10:04
dorian_	Hey, I set "gvimdiff" as my diff tool in git. But git opens an instance of vim instead. And my configuration of vim (not gvim) make it very hard to read the diffs. Can I tell git to use gvim instead of vim ?	10:04
	→ jtoy joined	10:04
Gotham25	The remote branch is still behind 2 commits.....	10:05
	But fet from upstream shows that the remote branch is up to date	10:05
	fetch*	10:05
	← brent__ left	10:05
	← TbobbyZ left	10:06
	← sbasso left	10:08
	← marcvangend left	10:08
	← jtoy left	10:09
	→ marcvangend joined	10:09
	→ peterbec` joined	10:10
	→ sbasso joined	10:10
	← [sarri] left	10:10
	→ zxd joined	10:11
	← Browser left	10:11
	← peeps[lappy] left	10:11
zxd	how to return from detached head back to having HEAD point to a branch	10:11
	← kexmex left	10:11
zxd	ah	10:12
	checkout branch :)	10:12
rokups	there are two projects, Upstream and Fork. Fork was "forked" by copying source code and just making new repository, so they do not share any history. Fork has some stuff removed, some stuff moved, bunch of stuff added. Currently merges are done by comparing relevant folders and moving changes manually. Is there maybe a better way to merge from Upstream using	10:12
	git?	10:12
	→ sarri joined	10:12
	← sarri left	10:12
	→ sarri joined	10:12
osse	dorian_: does git mergetool --tool=gvimdiff work ?	10:13
	→ troulouliou_div2 joined	10:14
	→ theoceaniscool joined	10:14
	→ kexmex joined	10:14
	→ ronskisika joined	10:15
	← peterbec` left	10:15
	← Raging_Hog left	10:15
osse	rokups: fetch the Upstream repo into the Fork repo. Next time you do a manual comparision, commit the result as a merge commit	10:15
	after that you can continue to merge	10:15
rokups	will try, thank you osse	10:16
	→ ferr1 joined	10:18
	← D4R5C0D3 left	10:19
dorian_	osse, I can't launch it because git keeps telling me that no file need merging. I'm not too sure how I can make a need for merge happen.	10:19
	← sotoz left	10:20
osse	dorian_: heh, my bad. I mean git difftool --tool=gvimdiff	10:20
dorian_	osse, Yes it works: git starts gvimdiff as requested.	10:22
	← marcvangend left	10:22
dorian_	I see in my configuration file that there "tool = gvimdiff" under the [diff] section.	10:22
	→ D4R5C0D3 joined	10:22
dorian_	maybe it should be in the difftool section ?	10:23
	Well it did not work :/	10:24
osse	dorian_: git config --show-origin -l \| grep diff.tool	10:24
	→ ToBeCloud joined	10:25
	gitinfo set mode: +v	10:25
dorian_	osse, good thinking! My local git configuration was overriding my global configuration.	10:25
	It works fine now	10:25
	← Silenced left	10:25
	→ peacememories joined	10:25
osse	my thinking is the best	10:26
	→ sotoz joined	10:26
	→ finalbeta joined	10:26
osse	dorian_: btw did that command show both values?	10:26
dorian_	yes	10:27
osse	\o/	10:27
	← peacememories left	10:27
	← catch22 left	10:28
	→ andrew710 joined	10:30
	→ peacememories joined	10:30
	← sbasso left	10:32
	→ Silenced joined	10:32
	→ kbeflo_ joined	10:33
	← kbeflo_ left	10:35
	← Olipro left	10:35
	→ timlyo[m] joined	10:35
	→ sbasso joined	10:35
	← kbeflo left	10:36
	← msonntag left	10:36
	← Cabanossi left	10:36
	→ msonntag joined	10:36
	→ bongjovi joined	10:37
	← Silenced left	10:38
	→ Cabanossi joined	10:39
	← peacememories left	10:41
	→ Olipro joined	10:41
	→ quizzi joined	10:42
	← fakenerd left	10:43
	→ Silenced joined	10:43
	← CussBot left	10:44
	→ CussBot joined	10:45
	← tmsmith left	10:47
	← Gloomy left	10:48
	← xall left	10:50
	→ mar77i joined	10:50
	← pinkkis left	10:50
	→ thebope joined	10:52
	→ _August_ joined	10:53
	→ aw1 joined	10:53
_August_	im trying to merge my branches and the branch I am trying to merge I keep getting an conflict error "Auto-merging javascript/common.js	10:54
	CONFLICT (content): Merge conflict in javascript/common.js	10:54
	Automatic merge failed; fix conflicts and then commit the result.	10:54
	" any suggestions?	10:54
tobiasvl	_August_: !eek	10:54
gitinfo	_August_: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	10:54
	→ zerow joined	10:54
	→ pbrewczynski joined	10:56
	← thebope left	10:57
	→ onehrxn joined	10:57
	← darkbit left	10:58
	← sbasso left	10:58
	→ barduck joined	10:59
	→ Gloomy joined	10:59
	→ tlaxkit joined	10:59
	← chipotle left	11:00
	← _August_ left	11:02
	← deanc left	11:05
	→ darkbit joined	11:05
	← Atm0spher1c left	11:05
	→ sbasso joined	11:07
	→ pinkkis joined	11:07
	→ Tobbi joined	11:08
	← borkr left	11:08
	→ peterbec` joined	11:10
	→ afuentes joined	11:15
	← peterbec` left	11:15
	← chardan left	11:15
	→ lugzer joined	11:16
lugzer	afternoon	11:16
	← onehrxn left	11:17
	→ onehrxn joined	11:18
lugzer	i have a simple question i think - i made changes to source files of a submodule (which is in /node_modules) - and now i want to revert those changes. since /node_modules are ignored, i have to do it some other way.. what's the simplest?	11:18
	← sbasso left	11:18
	→ sbasso joined	11:18
	→ masuberu joined	11:18
	← mischat_ left	11:19
	→ chardan joined	11:19
	→ mischat joined	11:20
	← b100s left	11:21
	→ marcoslater joined	11:21
	→ borkr joined	11:23
	← chachasmooth left	11:28
	→ Tatou joined	11:28
	→ dsdeiz joined	11:28
	← dsdeiz left	11:28
	→ dsdeiz joined	11:28
	← alexandre9099 left	11:29
	← ogny left	11:30
	→ ogny joined	11:30
	→ chachasmooth joined	11:32
	← dsdeiz left	11:32
	← sbasso left	11:37
	→ dtbn joined	11:37
lugzer	ok figured out.. it wasn't a submodule. it was npm package.. so a different channel first of all ;)	11:37
	→ rnsanchez joined	11:38
	→ dsdeiz joined	11:38
	→ nowhere_man joined	11:38
	← flopsec left	11:40
	→ MrMojit0 joined	11:41
	← octo8_ left	11:41
lmat	How do I point a remote branch to a commit?	11:43
	→ fakenerd joined	11:43
lmat	git push origin 6284e8:master; doesn't work	11:43
	or a tag... git push origin tag-name:master; gives odd output: " * [new tag] tag-name -> master" It looks like it created the tag anew on the remote? Not what I'm going for.	11:44
osse	lmat: git push origin 6284e8:master should work just fine. what doesn't work about it?	11:45
Vampire0	lmat, !repro	11:45
gitinfo	lmat: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see	11:45
	→ tymczenko joined	11:45
lmat	osse: hmm, now it says "non-fast forward"...researching	11:46
	osse: You know... I bet the problem was that that commit didn't exist on the server...	11:46
	→ chipotle joined	11:46
lmat	no, that should be okay	11:46
	it just just upload it	11:46
	→ thebope joined	11:46
lmat	it should just upload it	11:46
osse	lmat: if amster didn't already exist then you get an error	11:46
	otherwise it should work	11:46
	→ MutantMa_ joined	11:47
	→ sbasso joined	11:47
lmat	osse: okay, thanks	11:47
	osse: ... but why wouldn't it work if master didn't first exist?	11:47
	← MutantMahesh left	11:47
	→ kristofferR joined	11:47
osse	lmat: because it doesn't know what you want master to be	11:47
	a tag? a branch? something else?	11:48
lmat	osse: dude, you're awesome.	11:48
osse	the solution is to write the full name: git push origin 6284e8:refs/heads/master	11:48
	lmat bows	11:48
	→ ionl joined	11:48
	← ionl left	11:48
lmat	osse: I have asked this question several times and never received a good answer. I will sleep very well tonight	11:48
Vampire0	lmat, and if you push a tagname, it "works" as it assumes that you want to push to a tag if you push a tag	11:48
	lmat, hence you created the tag master when you pushed with tag name	11:49
	lmat, and after that you did get the non-fast-forward warning, as now there is a thing called "master" it is just not a fast-forward	11:49
	lmat, hence the error did change after you pushed the tag to the newly created tag master	11:49
	→ HoierM joined	11:50
lmat	Vampire0: That sounds like great reasoning, but master did exist when I pushed the tag ^_^	11:50
dtbn	Hey boys & girls. Got a question - I have a pull request that require rebasing to master - how to do it in easiest way? `git checkout branch-name`, `git rebase master` and then?	11:51
	← thebope left	11:51
Vampire0	lmat, hm, then it is strange that it created a new tag called master instead of updating the branch. osse, did I remember wrongly?	11:51
	← cqi left	11:51
lmat	Ah, I see thath it created a local "master" tag!	11:51
_ikke_	dtbn: 2. fix possible conflicts. 3. ???, 4. profit	11:51
	← grayjoc left	11:52
osse	Vampire0: afaik it uses the source to see what type the destination is	11:52
dtbn	there is not really a conflict, just rebase to follow master branch	11:52
Vampire0	lmat, I don't think it created a local master tag on push. But if your push created a tag in remote and you then fetch the tags, you get the local one from the remote	11:52
	→ marianina8 joined	11:52
	← marianina8 left	11:52
_ikke_	dtbn: You possible have to force push te rebased branch	11:52
	→ marianina8 joined	11:52
_ikke_	git push --force-with-lease origin branch-name	11:53
lmat	Vampire0: Ah, I should make sure it didn't create a master tag on remote :-o	11:53
Vampire0	osse, even if it exists already? hm, must remembering wrongly then	11:53
osse	Vampire0: if it already exists then I don't think it would	11:53
lmat	dtbn: I don't think you can do non-fast forward pull requests.	11:53
	dtbn: yeah, force push like _ikke_ says.	11:54
	→ zulutango joined	11:54
osse	Vampire0: I don't think that's what happened here either.	11:54
	I think master didn't exist at the time he did tag-name:master	11:54
	→ bariscant joined	11:55
lmat	osse: local or remote?	11:55
Vampire0	osse, lmat, yep, I just tried	11:55
osse	lmat: remote	11:55
Vampire0	osse, lmat, if you push tag-name:master and master branch exists, the master branch is pushed to	11:55
lmat	osse: master existed as a branch for many months now.	11:55
	Vampire0: ... pushed to what?!	11:56
Vampire0	osse, lmat, if you push tag-name:master and master branch does not exists, the master tag is pushed to (created if not exists)	11:56
osse	lmat: then 'git push origin 6284e8:master' would have worked in the first place.	11:56
lmat	osse: Yeah, but i did that tag thing first :-(	11:56
	→ flopsec joined	11:56
	← selckin left	11:57
osse	that too sholud have worked, instead of getting "new tag"	11:57
lmat	okay, time to research: what does git push remote <tag-name>:<existing-remote-branch> do ^_^	11:57
	← lugzer left	11:57
lmat	<tag-name> is an existing tag on remote.	11:57
Vampire0	lmat, you said 6284e8:master did fail, then tag-name:master created a tag called master and then 6284e8:master said it is not a fast-forward	11:57
osse	it makes the remote branch point to the same commit as the local tag does	11:57
Vampire0	lmat, this definitely means that there was no branch called master on the remote	11:57
	→ lugzer joined	11:57
lmat	Vampire0: Sorry, I said "git push origin 6284e8:master; doesn't work" I was working from faulty memory at that point.	11:58
	Vampire0: I hadn't done it :'(	11:58
Vampire0	lmat, whether the tag-name exists on remote is not relevant, it is only relevant whether existing-remote-branch exists	11:58
lmat	Vampire0: makes sense.	11:58
Vampire0	lmat, and if it exists, it gets updated	11:58
	lmat, I just tried it here to make sure not saying non-sense	11:58
	→ synthroid joined	11:59
Vampire0	lmat, even if you didn't do 6284e8:master first, as tag-name:master created a tag called master, this is proof enough already that there is no remote branch called master	11:59
	→ WizJin joined	12:00
lmat	hmm	12:00
	← mar77i left	12:00
	→ mar77i joined	12:00
	→ Urbany joined	12:01
	← chardan left	12:02
	→ synthroi_ joined	12:02
	→ scoobert1on joined	12:02
	→ chardan joined	12:03
	← theoceaniscool left	12:03
Vampire0	lmat, and what I also just tried, if there is both a tag called master and a branch called master and you use an explicit refspec like 123abc:master or tag-name:master or even master:master, Git will complain that the dst refspec is ambiguous and will not work unless you explicitly state which of the two you want to update. `git push origin master` though works and updates the master branch	12:04
	→ TbobbyZ joined	12:04
	← zulutango left	12:04
	← synthroid left	12:04
	← scoobertron left	12:06
	← Andrew_K left	12:07
	← Cabanossi left	12:07
	→ jimi_ joined	12:07
dtbn	I think believe it worked, thank you!	12:07
	← ShapeShifter499 left	12:08
	→ Cabanossi joined	12:09
	← TbobbyZ left	12:09
gitinfo	dtbn: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.	12:10
	→ cousteau joined	12:11
	→ peterbec` joined	12:11
cousteau	is `git commit --ammend` equivalent to fixup?	12:11
osse	no	12:11
	→ unreal joined	12:12
	← darkbit left	12:12
Vampire0	osse not?	12:12
cousteau	er, amend	12:13
Vampire0	osse, assuming cousteau meant amending the latest commit vs doing a fixup commit and using rebase to integrate it	12:13
	← drodger left	12:13
osse	--amend modifies the existing commit. --fixup creates a new commit which is intended to be used with git rebase --autosquash	12:13
	ok, then I just interpretend the question to literally	12:14
	*too	12:14
cousteau	osse, sorry, I meant creating a new commit and then doing fixup with rebase	12:14
osse	Yes, they sort of serve the same purpose	12:14
Vampire0	cousteau, then yes, it is the same	12:14
cousteau	I assume the responsibility	12:14
	osse, Vampire0, thanks!	12:14
Vampire0	yw	12:14
osse	as in: --fixup is for when you want to --amend but you can't :p	12:14
cousteau	then I'll stop doing rebases; they're rather inconvenient	12:14
	(compared to --amend)	12:15
Vampire0	cousteau, if it is not the latest commit you want to amend, you need to do it with fixup. If it is the latest, amending is the most convenient way to go, yes	12:15
osse	cousteau: you cannot use --amend to fix any commit except the current one	12:15
	← mehola left	12:15
	← peterbec` left	12:15
cousteau	right	12:16
	← Jaiss left	12:16
cousteau	I mena, that's what I used rebase for	12:16
	*mean	12:16
Vampire0	well, yeah, "current one" hits it better than "latest one"	12:16
	→ mehola joined	12:16
cousteau	another thing, what was the command to tell git to forget staged changes? git reset --soft?	12:16
osse	cousteau: so now you'll stop doing that and isntead get things right the first time? :p	12:16
	just 'git reset'	12:17
Vampire0	cousteau, no, just "git reset"	12:17
cousteau	ah	12:17
	→ brent__ joined	12:17
cousteau	that doesn't touch the files, right?	12:17
Vampire0	cousteau, soft reset will update the branch head, but leave the index and worktree untouched	12:17
	→ marscher joined	12:17
cousteau	ah wait, actually reverting files was checkout, not reset	12:18
Vampire0	cousteau, a mixed reset (the default if not --soft, --hard or --mixed is given explicitly) will reset the index and probably repoint the branch pointer, but will not touch your worktree	12:18
	cousteau, checkout with path and without commit-ish will update your worktree files to match what is in the index	12:19
cousteau	I see, thanks!	12:19
Vampire0	cousteau, a --hard reset will also update your worktree files to the given state	12:19
	← snowalpa_ left	12:19
	← scoobert1on left	12:19
	← chachasmooth left	12:19
	→ drodger joined	12:19
	→ chachasmooth joined	12:20
	← mehola left	12:20
	← Eryn_1983_FL left	12:22
	← brent__ left	12:22
	→ trulycool joined	12:22
cousteau	I see	12:23
	→ gugah joined	12:23
	← marianina8 left	12:24
	→ scoobertron joined	12:25
	→ Cavallari joined	12:25
	→ marianina8 joined	12:25
	← XenophonF left	12:26
cousteau	hm, commit --amend seems to create a fork. Ugly...	12:26
	(guess that's easy to remove though)	12:26
osse	And that, kids, is why you don't push immediately	12:27
	← manuelschneid3r left	12:27
	← lugzer left	12:27
	→ lugzer joined	12:28
	← marianina8 left	12:29
	→ XenophonF joined	12:30
	→ jtoy joined	12:30
	→ itavero joined	12:30
	← a_thakur left	12:31
	← ToBeCloud left	12:31
	← itavero left	12:31
	← GodEater left	12:31
	← aavrug left	12:31
	→ JeroenT_ joined	12:31
cousteau	osse, I'm not pushing anyway; I'm honestly just using git as a log of changes	12:31
	and just in case I want to undo something	12:32
osse	cousteau: then where do you see the fork?	12:32
cousteau	(I also have an external repository as a backup, but last time I pushed was 2 weeks ago)	12:32
	osse, gitk	12:32
osse	cousteau: and what are the tips of the work?	12:32
	fork	12:32
cousteau	the old commit that was amended	12:33
osse	I mean why is it visible in the first place?	12:33
cousteau	it's a one-node ramification	12:33
osse	does it not say "HEAD" or "master" or "feature" or "origin/master" next to it?	12:33
	→ Brski joined	12:34
	← JeroenT left	12:34
cousteau	So I closed gitk and opened it again and the branches disappeared. Duh...	12:35
	osse, so never mind I guess; it was a glitch in the gitk	12:35
	← JeroenT_ left	12:35
	→ Eryn_1983_FL joined	12:35
	→ JeroenT joined	12:36
	← sbasso left	12:36
	cousteau had closed gitk and opened it again with the English locale in order to take a screenshot. One of the cases when trying to diagnose the problem actually fixes it.	12:36
osse	\o/	12:36
	→ grayjoc joined	12:36
	→ Guest54 joined	12:39
	→ sbasso joined	12:40
	→ tmsmith joined	12:40
Vampire0	cousteau, well, it is not so much a glitch. If you press F5, it just updates and adds stuff that was added. But commits that are already shown stay shown even if they are dangling.	12:40
	← AstralStorm left	12:40
	→ AStorm joined	12:40
	→ thebope joined	12:40
cousteau	I see, so that's what Reload does (rather than Refresh)	12:40
	← Guest54 left	12:40
Vampire0	cousteau, if you want to get those away do Shift+F5 and the repo will be reread completely and the graph rebuilt, then the dangling commit also is not shown anymore	12:40
	→ Guest54 joined	12:41
cousteau	Ctrl-F5	12:41
Vampire0	cousteau, unless of course you restart gitk with the SHA of that old commit additionally, then it will again be shown as long as it is still present in the repository	12:41
	→ gibbocool joined	12:41
	← jeffreylevesque left	12:42
Vampire0	cousteau, or Ctrl+F5, I always forget which of the two modifiers it was, I have it in mechanical memory of my hand, was a 50:50 chance to mention the right one. :-D	12:42
	AStorm → AstralStorm	12:42
Vampire0	But yes, that is Reload vs Refrsh	12:42
	cousteau, ah, no, I was right. At least here it is Shift+F5	12:42
	← Guest54 left	12:43
Vampire0	And it is Update vs. Reload here	12:43
osse	TIL	12:43
Vampire0	TIL?	12:43
	← gibbocool left	12:43
tobiasvl	Today I Learned	12:43
	→ paissad_ joined	12:44
Vampire0	ah, ok	12:44
	→ brent__ joined	12:44
canton7	TYL what TIL means ;)	12:45
	← thebope left	12:45
	→ aapaaal joined	12:45
	→ ToBeCloud joined	12:45
osse	MFW	12:45
	gitinfo set mode: +v	12:45
_ikke_	MRW	12:45
	← khfeng left	12:45
	← tymczenko left	12:46
cousteau	Vampire0, yes, here too	12:46
	it is mislabeled on the menu	12:46
	← eahmedshendy left	12:47
	→ kbeflo joined	12:47
cousteau	also, I said "Reload" because I had it in Spanish and just guessed the translation	12:47
	→ khfeng joined	12:47
	→ roelmonn_ joined	12:47
	cousteau wonders how it is possible to mislabel a shortcut in a menu	12:48
	→ ankit01ojha joined	12:48
	← brent__ left	12:49
Vampire0	cousteau, the menu says it is Ctrl+F5 while it is Shift+F5? For me also the menu says Shift+F5. Are you on OS X?	12:49
	← perlpilot left	12:49
cousteau	no, Linux, but probably a super old version of gitk	12:49
	← IRQ` left	12:50
	← tmsmith left	12:50
	← roelmonnens left	12:51
osse	It's not inconceivable that soemthing is lsot in translation when you translate "update" and "reload"	12:51
	→ perlpilot joined	12:51
	→ buffal0 joined	12:52
	→ cbegin joined	12:52
	← SlashLife^m left	12:52
osse	Or someone could submit a patch and hide "El impuesto es el robo" somewhere in a huge translation update	12:52
	← cbegin left	12:53
Vampire0	cousteau, it is the one from 2.9.3.windows.1 here	12:53
	→ tymczenko joined	12:54
	→ webguynow joined	12:54
	→ marianina8 joined	12:55
cousteau	I'm still trying to figure out how to get the version of gitk	12:56
	← Tatou left	12:56
cousteau	1:1.7.9.5-1ubuntu0.3 ...probably old-ish	12:56
	→ basiclaser joined	12:56
cousteau	I think it's like a year old or so	12:56
	← tymczenko left	12:56
	→ tymczenko joined	12:57
	← aw1 left	12:58
	→ jeffreylevesque joined	12:58
osse	♫ ♪ Fiiiiive yeeeaaars ♪	12:58
	and four days	12:59
	← JeroenT left	12:59
	→ JeroenT joined	12:59
osse	RIP David Bowie	12:59
	← marianina8 left	13:00
skalpin	how can I push to a new remote branch and not set the upstream?	13:00
osse	skalpin: leave out the -u	13:00
	→ marianina8 joined	13:01
Vampire0	cousteau, 1.7.9.5 is from march 2012, so not quite a year. :-D	13:01
skalpin	git push origin newbranchname gave me 'error: src refspec newbranchname does not match any.'	13:01
	← pinkkis left	13:01
Vampire0	cousteau, maybe you should update, at least your Git, on a very old Ubuntu I simply compile Git myself and have the latest and greatest, not very problematic	13:01
osse	skalpin: do you have a local branch named newbranchname ?	13:01
skalpin	no	13:02
	← iamthad left	13:02
osse	skalpin: so I guess you want to push the current one =	13:02
	git push origin HEAD:refs/heads/newbranchname	13:02
	← andrew710 left	13:04
Vampire0	cousteau, actually it is the single-liner `make prefix=/usr all doc info && sudo make prefix=/usr install install-doc install-html install-info` to install it to the system locations if the needed tools like dobook2x and so on are installed already	13:04
skalpin	osse: ty that's exactly what I wanted	13:04
cousteau	ok, maybe it was ...ah, that must be the date when I installed it, duh m(	13:04
Vampire0	cousteau, probably	13:05
	→ leeN joined	13:06
	← Cabanossi left	13:07
	→ iamthad joined	13:07
	→ porsche944 joined	13:08
	→ Gsham joined	13:08
	→ Cabanossi joined	13:09
	→ Darcidride joined	13:09
	← bannakaffalatta left	13:11
	→ ExoUNX joined	13:12
	→ peterbec` joined	13:12
	→ buffffal00 joined	13:12
	← buffal0 left	13:14
	→ mehola joined	13:16
	← peterbec` left	13:17
	→ pinkkis joined	13:18
	← buffffal00 left	13:19
	→ theoceaniscool joined	13:19
	→ GT4066 joined	13:20
	→ raspado joined	13:21
	← mehola left	13:21
	→ kbs joined	13:22
	← chachasmooth left	13:23
	← bumpy left	13:24
	→ dglambert joined	13:25
dglambert	yo	13:25
	→ chachasmooth joined	13:25
	← raspado left	13:25
	← tmg left	13:25
	→ karols146 joined	13:26
	← GT4066 left	13:26
	→ snowalpaca joined	13:26
	→ theiostream joined	13:27
	→ buffal0 joined	13:27
	← netj left	13:27
	→ netj joined	13:27
	→ nilg joined	13:28
	→ gtifbv joined	13:29
	← ayogi left	13:29
	← jnavila left	13:30
	→ h12o joined	13:30
	→ DarkPsydeLord joined	13:31
	→ octo8 joined	13:31
	← theiostream left	13:31
	← mda1 left	13:32
	← dsdeiz left	13:32
	→ mda1 joined	13:32
	← chachasmooth left	13:33
	→ dsdeiz joined	13:33
	← dsdeiz left	13:33
	→ dsdeiz joined	13:33
octo8	Hello, what does *~ mean in .gitignore files ?	13:33
osse	octo8: all files that end with a tiled	13:34
	tiled	13:34
	fuck	13:34
	→ chachasmooth joined	13:34
skalpin	lol	13:34
octo8	osse: thanks, got the idea	13:34
	→ thebope joined	13:34
octo8	and this folder1/folder2/* ....	13:35
	it will ignore all the folders in folder2 ? what about the subfolders of folder2 ?	13:35
	i can't see good documentation for .gitignore :(	13:36
	→ smokeysea joined	13:36
	← ronskisika left	13:37
skalpin	https://git-scm.com/docs/gitignore ?	13:37
	→ Elzington joined	13:38
smokeysea	Hello all, I have a mongodb backup based on git; so we do hourly mongodump to files and they are pushed on git. Data is not huge; less than a GB. But .git size has piled up because all the push histroy is maintained; Is there any way to reduce .git size ?	13:38
	← chachasmooth left	13:39
	← thebope left	13:39
	→ mischat_ joined	13:40
	← arooni left	13:40
	→ Dougie187 joined	13:41
	→ GodGinrai joined	13:42
osse	octo8: they are regular patterns like *.txt etc. for the most part. man gitignore	13:42
gitinfo	octo8: the gitignore manpage is available at http://jk.gs/gitignore.html	13:42
	← dsdeiz left	13:42
	← Murii left	13:42
	octo8 is reading	13:42
	→ steeze joined	13:42
	← rchavik left	13:43
	← mischat left	13:43
	→ theiostream joined	13:44
	← steeze left	13:44
kbs	smokeysea: I assume git-gc isn't a panacea for your particular situation :-)?	13:46
	← Ice_Strike left	13:46
	→ Ice_Strike joined	13:48
	← lugzer left	13:48
	→ oleo joined	13:48
	→ lugzer joined	13:49
	→ arooni joined	13:50
	← lugzer left	13:50
	→ plasticle joined	13:50
	← fbwnd left	13:50
	← Cabanossi left	13:51
	← jagob left	13:53
	← aapaaal left	13:53
	→ Cabanossi joined	13:54
octo8	osse: skalpin: i have read both pages, I still want to to know if 'folder1/folder2*' will exclude all files in folder2 and sub folders of folder2, right ?	13:55
	← snowalpaca left	13:55
	← dglambert left	13:57
	← kbeflo left	13:58
	→ kbeflo joined	13:58
	→ Assault_ joined	13:59
	→ crose joined	13:59
	← GodGinrai left	14:00
	→ GodGinrai joined	14:00
	← bocaneri left	14:00
	← rscata left	14:00
	← paissad_ left	14:01
	← Assault left	14:02
	→ hiwk joined	14:02
	← robattila256 left	14:03
demize	smokeysea: Other than removing history, switch to a non-binary backup format that diffs well and git will pack them up rather nicely.	14:03
	→ bannakaf_ joined	14:03
	→ eahmedshendy joined	14:03
	← cousteau left	14:03
hiwk	I have a bunch of tags, and I have a file A with a number of commits. How can I list, per tag, which version of file A is refered to by the tag?	14:04
	→ inflames joined	14:05
	← watom- left	14:05
hiwk	or, alternatively, how can I in the log for file A list which tag checkout would yield which commit of file A?	14:05
	git log --decorate -- A does not help me, because the commits that are listed for file A are not the ones the tags reffer to	14:06
octo8	osse: skalpin: i made an experiment myself, it does exclude sub folders all files...	14:07
	→ menip joined	14:07
	→ TbobbyZ joined	14:08
	→ snowalpaca joined	14:08
	← dec0n left	14:09
	← Brski left	14:10
	← holodoc left	14:11
	← Assault_ left	14:11
	← TbobbyZ left	14:12
	→ LeBlaaanc joined	14:12
	→ peterbec` joined	14:13
	→ publio joined	14:13
	← kbs left	14:13
	← matoro left	14:13
	→ holodoc joined	14:13
	→ lavalamp joined	14:13
	→ chachasmooth joined	14:13
	← dvaske left	14:16
	← inflames left	14:19
	← peterbec` left	14:19
	→ Murii joined	14:20
	← kbeflo left	14:20
	← h12o left	14:20
	→ bitmod joined	14:20
	→ cdg joined	14:20
	→ aw1 joined	14:21
	← GodGinrai left	14:21
	← cdg left	14:24
	→ kbeflo joined	14:24
	← ronin_work left	14:24
	→ cdg joined	14:24
	→ ronin_work joined	14:24
	→ Starky joined	14:25
osse	octo8: Ahh.	14:25
	I like your attitude	14:25
	→ matoro joined	14:26
	→ manuelschneid3r joined	14:26
	→ jagob joined	14:27
	← Starky left	14:27
	→ kbs joined	14:28
	← theoceaniscool left	14:28
	→ Starky joined	14:28
	→ thebope joined	14:28
	← ronin_work left	14:29
	← ferr1 left	14:31
	← mischat_ left	14:31
	→ oskarkv joined	14:31
	→ addf joined	14:32
	← zefferno left	14:32
	← thebope left	14:33
	← Eryn_1983_FL left	14:34
	→ peacememories joined	14:34
	→ h12o joined	14:34
	← gtristan left	14:35
	→ Gianormagantrous joined	14:36
	← Gianormagantrous left	14:36
	→ Gianormagantrous joined	14:36
	→ ash_workz joined	14:37
	← bariscant left	14:37
	← addf left	14:40
	← tymczenko left	14:40
	→ mischat joined	14:41
	→ yehowyada joined	14:42
	→ ferr1 joined	14:42
	← kbs left	14:43
	← theiostream left	14:43
	→ AaronMT joined	14:44
	← Gloomy left	14:45
	← chardan left	14:47
	→ Eryn_1983_FL joined	14:47
	← mischat left	14:49
	→ mischat joined	14:49
	→ dendazen joined	14:51
	← ToBeCloud left	14:51
	← ferr1 left	14:52
CustosLimen	hi	14:53
	I have a bunch of utter nawbs here	14:53
	where is a good course for git ?	14:53
	that is free ?	14:53
	interactive will be awesome	14:54
	→ dglambert joined	14:54
Hedgework	CustosLimen: Depends... newbs to git with experience at other SCMs, newbs to git who prefer very mathy things with graphs of the internals, or newbs to git who think everything sounds terrifying and want to learn by rote?	14:54
CustosLimen	https://try.github.io/	14:55
	that is actually good	14:55
Hedgework	CustosLimen: That's good for the third group mentioned, but it will give them NO idea of what git is doing. It's purely rote learning.	14:55
	→ steeze joined	14:55
	→ Gloomy joined	14:56
	← Silmarilion left	14:57
	← netroxen left	14:57
	← snowalpaca left	14:57
	← chele left	14:59
	← MutantMa_ left	15:00
visual	well have a good day guiz!	15:00
	← Cavallari left	15:00
	← overlord_tm left	15:01
	→ exarch joined	15:01
	← roelmonn_ left	15:01
	← cdg left	15:02
	→ cdg joined	15:03
CustosLimen	Hedgework, rote ?	15:04
	Hedgework, nawbs nawbs like in probbably should not be using a computer	15:04
	← lavalamp left	15:04
	← JeroenT left	15:04
	→ JeroenT joined	15:04
	← ogny left	15:05
	→ mischat_ joined	15:06
Hedgework	CustosLimen: rote means drilling them until they memorize the steps, without caring whether they understand why they are doing it	15:06
	← masuberu left	15:06
CustosLimen	Hedgework, rote is then the best I can hope for I guess	15:07
Hedgework	CustosLimen: in that case...stick with the rote method until they have some clue, but have 1-2 of the smarter ones learn how git actually works so they can unscrew everyone else's merges when they break stuff	15:07
CustosLimen	TIL a new word though ;)	15:07
	← holodoc left	15:07
Hedgework	:D	15:08
CustosLimen	Hedgework, I will just give them a copy pasta to throw away local changes on merge conflicts	15:09
	← mischat left	15:09
	→ s2013 joined	15:10
Hedgework	CustosLimen: Just please tell me you are not a CS prof	15:10
	I have to deal with the people you schmucks give degrees to...	15:11
CustosLimen	Hedgework, no	15:11
	→ holodoc joined	15:11
	→ theiostream joined	15:11
	← menip left	15:11
CustosLimen	Hedgework, I'm just a poor developer working at a dying company :/	15:11
	← JeroenT left	15:12
	← bitmod left	15:12
	→ bitmod_ joined	15:12
Hedgework	awww :(	15:13
	My condolences, then.	15:13
	→ moei joined	15:13
	← moei left	15:13
	→ moei joined	15:14
	← sathed left	15:14
	← _Vi left	15:14
	← troulouliou_div2 left	15:15
	→ mohan_ joined	15:15
	→ peterbec` joined	15:15
	← drodger left	15:15
	← mohan_ left	15:16
	→ TbobbyZ joined	15:17
	→ mehola joined	15:17
	← kbeflo left	15:18
	→ nobitanobi joined	15:18
	→ mohan_ joined	15:18
	← smokeysea left	15:19
	→ Gustavo6046 joined	15:19
	← trulycool left	15:19
	← sbasso left	15:19
	→ trulycool joined	15:19
	← Forlorn left	15:20
	→ kbs joined	15:20
	→ jimklo joined	15:20
	← peterbec` left	15:20
	→ drodger joined	15:21
	← mehola left	15:22
	→ andrew710 joined	15:22
	← sotoz left	15:22
	→ thebope joined	15:22
	← andrew710 left	15:23
nobitanobi	Is there a way to find the logs of a specific method in Ruby? I am trying to use `git log -L` with funcname option, but I am getting a `fatal: -L parameter 'initialize' starting at line 1: no match` . I am in 2.3.8 version and according to https://git-scm.com/docs/git-log/2.3.8 I have that feature	15:23
	I am doing this: `git log -L :initialize:my_filename.rb`	15:23
	I am basically trying to find the logs specific to that `initialize method in that file	15:24
	← mohan_ left	15:24
	← Khisanth left	15:24
	→ mohan_ joined	15:24
	→ selckin joined	15:25
	← synthroi_ left	15:25
	→ ronin_work joined	15:25
	→ troulouliou_div2 joined	15:26
	← kbs left	15:26
	← eahmedshendy left	15:26
	← marianina8 left	15:26
	← schleppel left	15:27
FrozenFire	Is it possible to have a submodule not be cloned by git submodule update in its parent repo?	15:27
	← thebope left	15:27
FrozenFire	That is, require it to be specifically targeted	15:27
	→ marianina8 joined	15:27
Dougie187	FrozenFire: Isn't the the default? I thought you needed to specify `git submodule update --recursive` to get sub-submodules.	15:28
	→ kbeflo joined	15:28
	← kbeflo left	15:28
FrozenFire	Dougie187, I'm asking about a submodule, not recursive	15:29
	→ thiago joined	15:29
FrozenFire	I have a submodule in this repo which is only accessible to specific people	15:29
	→ kbeflo joined	15:29
Dougie187	Oh, sure. `man git submodule`	15:29
gitinfo	the git-submodule manpage is available at http://jk.gs/git-submodule.html	15:29
Dougie187	Look at update.	15:29
	It takes a path.	15:29
	← bongjovi left	15:29
	← elect_ left	15:29
Dougie187	So, you can specify which you want to update, and which you don't want to.	15:29
	I'm also pretty sure that if they don't init the repo, update won't do anything.	15:30
	err, init the submodule.	15:30
	→ sz0 joined	15:30
	← drodger left	15:31
	← nobitanobi left	15:32
	→ drodger joined	15:32
	→ ResidentBiscuit joined	15:32
	→ schleppel joined	15:32
	← Elzington left	15:33
	← mohan_ left	15:33
	→ Droolio joined	15:33
	→ brent__ joined	15:33
	→ mohan_ joined	15:33
	→ shgysk8zer0 joined	15:33
	→ buffffal00 joined	15:34
	← buffal0 left	15:35
FrozenFire	Great. Thank you. :)	15:36
	→ synthroid joined	15:36
	→ Khisanth joined	15:37
	→ synthroi_ joined	15:37
	← grayjoc left	15:37
	→ jagobdue joined	15:37
	← Gsham left	15:38
	→ bouncy joined	15:38
	→ xall joined	15:39
	← brent__ left	15:39
	← synthroid left	15:40
	← nowhere_man left	15:42
	← drodger left	15:43
	→ dreiss joined	15:44
	→ grayjoc joined	15:44
	→ raspado joined	15:45
	← sea-gull left	15:47
	← clmsy left	15:47
	← xanadu_ left	15:47
	→ netroxen joined	15:48
	← hiwk left	15:48
	→ drodger joined	15:49
	→ GT4066 joined	15:50
	← jimi_ left	15:51
	→ theoceaniscool joined	15:51
	→ digidog joined	15:54
	← grayjoc left	15:54
	← sbulage left	15:54
	→ _Vi joined	15:55
	→ xanadu_ joined	15:55
	← xall left	15:55
	→ smokeysea joined	15:55
	→ brent__ joined	15:57
	→ svm_invictvs joined	15:57
	→ Gsham joined	15:58
	← ronin_work left	15:59
	← buzzLightBeer left	16:00
	→ JanC_ joined	16:00
	JanC → Guest23500	16:02
	← Guest23500 left	16:02
	JanC_ → JanC	16:02
	→ Hanumaan joined	16:02
	← mda1 left	16:02
	← bouncy left	16:03
	→ darkmist joined	16:03
Hanumaan	is it good to keep files of sizes above 25 MB in git?	16:03
	← dtbn left	16:03
	→ nowhere_man joined	16:03
	→ mda1 joined	16:03
	← onehrxn left	16:03
FrozenFire	Is it good? No	16:03
	Can you do it? Yeah	16:04
	→ synthroid joined	16:04
	← h12o left	16:04
Hanumaan	FrozenFire, what would be max size you recommend in git?	16:04
FrozenFire	It's more about what the file is	16:04
	Do you need to version that file?	16:04
	Is it a format which can be intelligibly diffed?	16:05
	→ dtbn joined	16:05
Hanumaan	yes it might change in 6 every months and it is not a binary file	16:05
FrozenFire	In that case, sure, put it in git.	16:05
Hanumaan	its a text file	16:05
FrozenFire	But you might want to break that file up into pieces instead	16:05
	← drodger left	16:05
FrozenFire	That is, use include syntax in the relevant language	16:06
	← tlaxkit left	16:06
	→ s1scha joined	16:06
	← synthroi_ left	16:06
Hanumaan	is there any in-built technique that breaks file in git?	16:06
	→ roelmonnens joined	16:07
FrozenFire	Don't think so	16:07
	The purpose of breaking the file up would be to make it easier to manage changes	16:07
	→ henriknj joined	16:08
	← Silenced left	16:09
	← dreiss left	16:10
	← matoro left	16:11
	← roelmonnens left	16:11
	→ drodger joined	16:11
	→ durham joined	16:12
	← gtifbv left	16:12
	← dtbn left	16:14
	→ xall joined	16:15
	→ PaoloP joined	16:15
	→ al-damiri joined	16:15
	← mohan_ left	16:16
	← PaoloP left	16:16
	→ faLUCE joined	16:16
	→ peterbec` joined	16:16
	→ thebope joined	16:17
	→ tang^ joined	16:17
	→ hashtagstrashtag joined	16:17
	→ mehola joined	16:18
	→ dvaske joined	16:18
	← drodger left	16:19
	→ tyreld joined	16:20
	← pks left	16:21
	← peacememories left	16:21
	← thebope left	16:21
	← peterbec` left	16:21
	→ pks joined	16:22
	→ LionsMane joined	16:22
	← mehola left	16:23
	→ vhscrb joined	16:23
	→ madewokherd joined	16:25
	→ drodger joined	16:25
	→ fuzzzerd joined	16:26
	→ iehl joined	16:26
	← imack left	16:26
	← xanadu_ left	16:27
	← mischat_ left	16:27
	→ mischat joined	16:28
	→ jstimm joined	16:28
	← netroxen left	16:29
	→ bkeys joined	16:29
bkeys	How do I fetch a remote branch?	16:29
	Running `git fetch --all' does nothing	16:29
	→ TomyLobo2 joined	16:30
	← tvw left	16:30
	→ ayogi joined	16:30
whitby	"fetch a remote branch"?	16:30
	Do you mean checkout?	16:30
bkeys	I guess?	16:31
	→ orbyt_ joined	16:31
bkeys	I just want to download a remote branch	16:31
	← maroloccio left	16:31
	→ fbwnd joined	16:32
	→ Fallen0223 joined	16:32
	← drodger left	16:32
whitby	Ah, yeah, so it's (kind of) a two step process. `git fetch $remote` will download it. `git checkout $branch` will check it out..	16:32
bkeys	So say my branch is called foo_bar	16:32
	→ a_thakur joined	16:32
bkeys	It would be git fetch origin/foo_bar	16:32
	← mischat left	16:33
whitby	(That might work, I'm not sure off-hand, but) `git fetch origin && git checkout foo_bar` would work.	16:33
	← kexmex left	16:33
	← orbyt_ left	16:33
bkeys	git fetch origin does nothing	16:33
	→ drodger joined	16:33
whitby	It does something :)	16:34
	It might have done it already	16:34
	→ aielima joined	16:34
bkeys	I do git branch -l and it just shows master	16:34
whitby	Yes, you need the 2nd half of the command: `git checkout foo_bar`	16:34
	← drodger left	16:35
bkeys	error: pathspec 'binary_map' did not match any file(s) known to git.	16:35
	← achadwick left	16:35
	→ fxrs joined	16:35
whitby	Is that after trying to checkout?	16:36
bkeys	Yes	16:36
	← smokeysea left	16:36
	→ xanadu_ joined	16:37
	← iehl left	16:37
whitby	Weird, are you sure that you have the correct branch name?	16:37
jab416171	if I add a file on the master branch, make a new branch, delete the file, and then re-add the same file, is git now tracking two version of that file (taking up twice as much space) or is it smart enough to only store one copy?	16:37
bkeys	whitby: I am just on master on a freshly cloned repo	16:37
jab416171	this is a binary file	16:38
	→ orbyt_ joined	16:38
	← a_thakur left	16:38
	← bwn left	16:38
	← Cabanossi left	16:38
	→ matoro joined	16:38
whitby	bkeys: `git branch -vv --all` show the branch in the list (it should show up as `origin/$name`	16:38
	Does*	16:38
	← Hanumaan left	16:39
	→ Cabanossi joined	16:39
bkeys	It shows local master, remotes/origin/master, and remotes/origin/HEAD	16:39
	But not my branch	16:39
	← mikecmpbll left	16:39
whitby	Then the branch doesn't exist. I'm not sure why.	16:40
	Are you sure it's on the remote?	16:40
	→ drodger joined	16:40
bkeys	https://notabug.org/bkeys/DMUX/src/binary_map	16:40
	Given this is the branch I am trying to fetch, yes	16:40
	→ kexmex joined	16:41
	→ freexand joined	16:41
	→ sbasso_ joined	16:41
whitby	Weird, and you said you've run `git fetch origin`?	16:41
bkeys	Yes	16:42
	https://share.riseup.net/#yoZcim1gXcNj464WZLdtVA	16:42
whitby	I've got nothing	16:43
	That's weird	16:43
bkeys	Yeah all stack overflow questions tell me to do basically the same as you did	16:44
whitby	Unless it's a shallow clone?	16:44
bkeys	Yes it is	16:44
	You mean git clone --depth=1	16:44
	?	16:44
whitby	Yeah	16:44
bkeys	Yeah this is a shallow clone	16:44
	← kbeflo left	16:45
whitby	Yeah, that's the problem	16:45
	It's fixable though	16:45
	http://stackoverflow.com/q/23708231/1267663 is what you're talking about	16:46
	→ Cavallari joined	16:47
bkeys	Seems like there are workarounds	16:47
	But not really worth it; I will just reclone with the git history	16:47
	→ bwn joined	16:47
whitby	Yep, I would recommend not using shallow clones (unless you're aware of the trade-offs)	16:48
	← Eryn_1983_FL left	16:49
	← kurkale6ka left	16:50
bkeys	Yep that worked	16:50
	→ raynold joined	16:51
	→ dtbn joined	16:51
whitby	jab416171: maybe, I think so (if the file is exactly the same the blob should have the same hash)	16:52
	Though someone else may be able to confirm	16:52
	→ dviola joined	16:54
	← flaviodesousa left	16:54
	→ rmbeer joined	16:54
rmbeer	hello	16:54
	← bkeys left	16:55
	← marscher left	16:55
rmbeer	what command can show all diff about of a commit? i not found where show from the gitg. (I want view from terminal why gitg is very low)	16:55
	→ ronin_work joined	16:56
	← theoceaniscool left	16:57
dysfigured	rmbeer: git show <commit> perhaps?	16:57
	← Gianormagantrous left	16:57
octo8	a bit urgent question, is this note really series ? https://paste.ofcode.org/3227wYCjiw2sCJNiGEgfRvN	16:59
rmbeer	dysfigured, yes, thank! I was using it in error 'git diff [SHA]'..	16:59
	← LionsMane left	16:59
	→ LionsMane joined	17:00
	→ Eryn_1983_FL joined	17:02
	→ theiostr_ joined	17:02
	→ lavalamp joined	17:02
	← jstimm left	17:02
dysfigured	rmbeer: i use this with fzf.. https://u.teknik.io/uKnGQ.webm	17:03
	→ jstimm joined	17:03
dysfigured	git log --graph --color --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" \| fzf --ansi --preview='git show --color=always "$(grep -m1 -o "[a-f0-9]\{7\}" <<< {})"' --bind='Enter:execute:LESS=-R PAGER=less git show --color=always "$(grep -m1 -o "[a-f0-9]\{7\}" <<< {})"'	17:03
	← sunrunner20 left	17:05
	→ bocaneri joined	17:05
	← [twisti] left	17:05
	← fees left	17:05
rmbeer	dysfigured, nicee. you have a good term. :)	17:06
	→ sequence joined	17:06
	← theiostream left	17:06
	← LionsMane left	17:06
rmbeer	dysfigured, i can view you PS1?	17:07
dysfigured	i use zsh https://github.com/DanielFGray/dotfiles/blob/master/zsh/themes/agnoster.zsh-theme	17:07
	→ myhau joined	17:07
	→ eahmedshendy joined	17:08
rmbeer	i see. Only work for zsh.	17:10
cjohnson	you can usually make something similar happen in bash	17:10
	but really you should just use zsh ;)	17:10
	← jast left	17:10
	← lavalamp left	17:10
	← xall left	17:10
cjohnson	where does fzf come from dysfigured?	17:10
	no package called fzf	17:10
	← aw1 left	17:11
	→ thebope joined	17:11
	→ cagomez joined	17:11
	→ jast joined	17:12
	→ xall joined	17:12
rmbeer	now test zsh	17:12
	← zxd left	17:12
	← troulouliou_div2 left	17:13
octo8	if the current branch is live, and i want to push to live, then the command is 'git push origin live' ?	17:13
	→ cd-rum joined	17:13
j416	octo8: that should work.	17:14
	→ peterbec` joined	17:14
j416	(if your remote is called "origin")	17:14
	← shgysk8zer0 left	17:14
dysfigured	https://github.com/junegunn/fzf	17:15
	← thebope left	17:15
dysfigured	fzf is a lot like dmenu, it takes stdin, lets you interactively pick lines, and then prints the result to stdout. it does have a few more bells and whistles though, like --preview and --bind	17:15
cjohnson	thanks, installing	17:16
	← s1scha left	17:16
	← vhscrb left	17:16
dysfigured	that commit viewer is actually part of a script i'm writing https://github.com/DanielFGray/fzf-scripts/blob/master/fzgit	17:16
	→ dreiss joined	17:16
	→ grayjoc joined	17:17
	→ kbeflo joined	17:17
	← kbeflo left	17:17
	→ kbeflo joined	17:17
faLUCE	hello does myfile pass to stage area when I do git add myfile?	17:18
	→ Gianormagantrous joined	17:18
	← Gianormagantrous left	17:18
	→ Gianormagantrous joined	17:18
	← cyberz left	17:18
faLUCE	sorry for the stupid question. just checked	17:18
cjohnson	yes, that's what add does	17:19
	add it to the staging area	17:19
	then commit takes your staged changes and bundles them as a commit	17:19
rts-sander	I type git rebase -ip HEAD~4, resolve a conflict	17:19
	now a commit is missing	17:19
faLUCE	cjohnson: ok thanks	17:19
	← rmbeer left	17:19
	→ cyberz joined	17:20
	← matoro left	17:20
	← synthroid left	17:21
	← fbwnd left	17:23
	Learath2 → pragma2	17:23
	→ synthroid joined	17:23
	← jrnieder left	17:24
	← eahmedshendy left	17:24
	pragma2 → Learath2	17:25
	← brent__ left	17:25
	→ peacememories joined	17:27
	← bocaneri left	17:28
	→ choki joined	17:28
	← marcogmonteiro left	17:29
	gitinfo set mode: +v	17:29
choki	What is the difference between a bare git repo and git clone --separate-git-dir ?	17:29
jast	the one cloned with --separate-git-dir still contains an index and is marked as a non-bare repo	17:30
	← ronin_work left	17:30
	← Gotham25 left	17:31
choki	hmm i don't understand yet :/	17:31
	→ gopar joined	17:31
qqx	choki: A bare repo doesn't have an associated working tree where the content is readily accessible. Using --separate-git-dir still has one, just has the repo in a different location than usual.	17:31
	→ nixjdm joined	17:31
	← darkmist left	17:32
	← xall left	17:33
	→ a_thakur joined	17:34
choki	i dont know why op is using --bare but in the comments below they recommend --separate-git-dir https://news.ycombinator.com/item?id=11070797	17:34
	→ kpease joined	17:35
	← theiostr_ left	17:36
	→ theiostream joined	17:37
	← shinnya left	17:37
	← kpease left	17:38
	← a_thakur left	17:38
	← gopar left	17:39
	→ dn1987p joined	17:39
	→ bvtton joined	17:39
	→ gopar joined	17:39
	← hahuang65 left	17:41
	← theiostream left	17:41
	→ matoro joined	17:41
	→ hhee joined	17:42
	← drodger left	17:43
	← myhau left	17:44
	→ drodger joined	17:44
cjohnson	so basically it lets you simulataneously do a bare clone and get a detached working copy?	17:45
	would you be able to switch branches on that working copy?	17:46
	or is this just a one-off copy	17:46
	just curious, never heard of this flag	17:46
	← dtbn left	17:47
	← Starky left	17:48
choki	me too, i just wanna improve the way i deal with ma dotfiles :v	17:49
	→ cdleonard joined	17:50
qqx	cjohnson: It is not a bare clone. It's a normal clone, just with a different layout.	17:51
	You can use it as you would any other non-bare repo.	17:51
	← synthroid left	17:53
sequence	I have an interesting problem related to "missing necessary objects" on push: https://pastebin.com/E03yBeUz	17:54
	I'd appreciate any help on this, totally stuck.	17:54
	→ theiostream joined	17:54
	← Kaisyu left	17:54
sequence	`git fsck --full` returns one dangling blob, but is otherwise ok	17:54
	→ mroth_ joined	17:55
	→ Onionnion_ joined	17:55
	→ aleb_ joined	17:55
	→ nitemare joined	17:55
	→ ec_ joined	17:55
	→ Travis-42_ joined	17:56
	→ aendrew_ joined	17:56
	→ reznord_ joined	17:56
	→ martin_g_ joined	17:56
	→ huhlig_ joined	17:56
	→ dddaviddd joined	17:56
	← diogenese left	17:56
	→ theoceaniscool joined	17:56
	→ unixdork joined	17:56
	→ thekingofbandit joined	17:56
	→ mikap joined	17:56
	→ jbondhus joined	17:56
	→ cjohnson_ joined	17:57
	→ d1b_ joined	17:57
	→ grantrul1s joined	17:57
	→ likewhoa- joined	17:57
	→ djh_ joined	17:57
	→ Soliton_ joined	17:58
	← jagobdue left	17:58
	Soliton_ → Soliton	17:58
	→ Ratler_ joined	17:58
	cjohnson_ → cjohnson	17:58
	← LeBlaaanc left	17:58
	← sbasso_ left	17:59
	← Matsv- left	17:59
	← saintaquinas[m] left	17:59
	← monty left	17:59
	← ghormoon left	17:59
	← pepijndevos left	17:59
	← Nevik_ left	17:59
	← EvilJStoker left	17:59
	← marvi left	17:59
	← freekevin left	17:59
	← trobotham left	17:59
	← likewhoa left	17:59
	← d1b left	17:59
	nitemare → trobotham	17:59
	mikap → mika	17:59
	Onionnion_ → Onionnion	17:59
	→ marvi joined	17:59
	← cdleonard left	18:00
	→ Matsv joined	18:00
	aendrew_ → aendrew	18:00
	→ ghormoon joined	18:00
	← ayogi left	18:00
	→ niax joined	18:00
	→ gruetzkopf joined	18:00
	→ EvilJStoker joined	18:00
	← choki left	18:00
	→ Joost joined	18:00
	→ Nevik joined	18:00
	gruetzkopf → Guest85881	18:00
	mroth_ → mroth	18:00
	→ imack joined	18:00
	→ jagobdue joined	18:01
	→ traxo-xx joined	18:01
	→ vrishab joined	18:01
	aleb_ → aleb	18:01
	→ monty joined	18:02
	← reznord_ left	18:02
	huhlig_ → huhlig	18:02
	→ saintaquinas[m] joined	18:02
	→ freekevin joined	18:03
	→ pepijndevos joined	18:03
	← acetakwas left	18:03
	→ Eragon joined	18:03
	→ ac3takwas joined	18:03
	→ Darcidride_ joined	18:03
	→ TbobbyZ_ joined	18:03
	← cdg left	18:03
	← Darcidride left	18:03
	→ choki joined	18:04
	→ Sasazuka joined	18:04
	→ dtbn joined	18:04
	→ s1scha joined	18:04
	ec_ → ec	18:05
	→ thebope joined	18:05
	→ reznord joined	18:05
	← choki left	18:05
	→ Krenair joined	18:05
	← reznord left	18:06
	← TbobbyZ left	18:06
	→ myhau joined	18:08
	← TbobbyZ_ left	18:08
	← Cabanossi left	18:08
	→ Sound joined	18:08
	Sound → Guest72951	18:09
	← chigang left	18:09
	← Guest72951 left	18:09
	← thebope left	18:09
	→ Sound_ joined	18:10
	← dtbn left	18:10
	← Sound_ left	18:10
	← myhau left	18:10
	→ plasticboy joined	18:10
	→ Cabanossi joined	18:12
	→ heinrich5991 joined	18:12
	→ BSaboia joined	18:12
	→ ertesx joined	18:12
	→ LionsMane joined	18:13
	← matoro left	18:13
lmat	In github, how can I tell what the HEAD of the repository there is?	18:13
	→ Discovery joined	18:13
sequence	lmat: use `git ls-remote` with the name of the github remote	18:13
	← afuentes left	18:14
lmat	sequence: excellent. Thank you.	18:14
	← bgerber left	18:14
	← svm_invictvs left	18:15
	← ertes left	18:15
	ertesx → ertes	18:15
lmat	Is it possible for git version 2.11.0 to output the following message: "warning: Remote branch ... not found in upstream origin, using HEAD instead" ?	18:15
	→ hs8136 joined	18:15
lmat	in http://stackoverflow.com/questions/20280726 , this happens when he supplies a "tag" to git clone --branch. But that appears to only be for an old version of git?	18:16
	→ LeBlaaanc joined	18:17
faLUCE	I have someproject cloned into someproject-cloned dir; if I enter into someproject-cloned dir, how can sync it with the modifications done meanwhile with upstream?	18:17
	→ synthroid joined	18:17
	← peacememories left	18:18
	→ matoro joined	18:18
	← hs8136 left	18:18
	→ mehola joined	18:19
	→ dtbn joined	18:20
	→ Rodya_ joined	18:20
	→ joki joined	18:20
faLUCE	(sorry for the previous question, it was not for the channel)	18:20
	→ bgerber joined	18:21
	→ dvaske_ joined	18:22
	→ roelmonnens joined	18:23
	← mehola left	18:24
	← trulycool left	18:24
lmat	faLUCE: git fetch --all...sort of	18:25
	→ lavalamp joined	18:25
lmat	faLUCE: It's a separate repository. If you want it completely synchronized, re-clone using --mirror.	18:25
	faLUCE: If you want the commits from the "upstream" repositories, git fetch --all; should do the trick.	18:25
	← dvaske left	18:25
faLUCE	thnks lmat, I'm reading docs about the difference between pull and fetch	18:26
	← dtbn left	18:27
	← roelmonnens left	18:27
	→ ronin_work joined	18:28
	← Eragon left	18:28
	← ThomasLocke left	18:29
	→ theiostr_ joined	18:30
	← scoobertron left	18:30
	← theiostream left	18:31
	← freexand left	18:33
	→ scoobertron joined	18:35
	→ nitric joined	18:35
	← crose left	18:36
	← drodger left	18:39
	→ drodger joined	18:40
	← saintaquinas[m] left	18:40
	← Sasazuka left	18:40
	← drodger left	18:40
	← chachasmooth left	18:40
	← imack left	18:40
	→ Sleepy63 joined	18:41
	→ Sasazuka joined	18:42
	← theoceaniscool left	18:43
	← matoro left	18:43
	← chipotle left	18:43
	← barduck left	18:43
	→ chachasmooth joined	18:43
	← GT4066 left	18:44
	← bvtton left	18:44
	← hhee left	18:44
	→ hahuang65 joined	18:44
	→ drodger joined	18:45
	← cagomez left	18:45
	→ saintaquinas[m] joined	18:46
	nacho → polyzen	18:49
	→ jimi_ joined	18:49
	→ freexand joined	18:50
	← karols146 left	18:50
	← freexand left	18:50
	← basiclaser left	18:51
	→ freexand joined	18:51
	← freexand left	18:51
	→ xper0 joined	18:51
	← marianina8 left	18:52
	← chachasmooth left	18:53
	→ marianina8 joined	18:53
	← marianina8 left	18:53
	→ freexand joined	18:53
	→ marianina8 joined	18:53
	← freexand left	18:53
	← Cabanossi left	18:54
	← gopar left	18:54
	→ kfoonamalik joined	18:55
	→ gopar joined	18:55
	→ freexand joined	18:55
	← freexand left	18:55
	→ Cabanossi joined	18:56
	→ freexand joined	18:56
	← freexand left	18:56
	← dhollinger left	18:57
	→ freexand joined	18:58
	← freexand left	18:58
	← jimi_ left	18:58
	→ kyan joined	18:58
	← peterbec` left	18:58
	→ thebope joined	18:59
	→ mikecmpbll joined	19:00
	→ freexand joined	19:00
	← freexand left	19:00
	→ freexand joined	19:01
	← freexand left	19:01
	→ freexand joined	19:02
	← freexand left	19:02
	← grayjoc left	19:02
	← BSaboia left	19:02
	← ronin_work left	19:03
	→ freexand joined	19:03
	← freexand left	19:03
	← thebope left	19:04
	→ Emperor_Earth_ joined	19:05
	→ hahuang61 joined	19:06
	→ peterbec` joined	19:06
	→ chachasmooth joined	19:06
	← hahuang65 left	19:07
	← Emperor_Earth left	19:08
	← nilg left	19:09
	→ hahuang65 joined	19:09
	← borkr left	19:10
	→ jimi_ joined	19:11
	← hahuang61 left	19:11
	← chachasmooth left	19:11
	→ robotroll joined	19:12
	← tang^ left	19:12
	→ Brski joined	19:13
	→ Acerific joined	19:13
	→ hahuang61 joined	19:14
	→ dtbn joined	19:14
	→ archaic joined	19:14
	← hahuang65 left	19:15
	→ chachasmooth joined	19:15
	← robotroll left	19:16
	← kyan left	19:17
	← kexmex left	19:18
	→ borkr joined	19:18
	← Cavallari left	19:21
	→ kexmex joined	19:22
	← Ice_Strike left	19:23
	← Brski left	19:24
	← PaulCapestany left	19:24
	← sz0 left	19:24
	← molgrum left	19:24
	→ tvw joined	19:24
	→ Groscheri joined	19:24
	→ pedahzur joined	19:26
	→ dhollinger joined	19:26
	→ TbobbyZ joined	19:26
	→ Eragon joined	19:27
	→ PaulCapestany joined	19:27
pedahzur	I found this e-mail thread from 2009, which describes a feature that would be really handy right now: http://git.661346.n2.nabble.com/PATCH-format-patch-add-prefix-to-prepend-a-prefix-to-output-file-names-td3048920.html It's quite the discussion, but it seems the feature was never actually added. Anyone know what happened to it?	19:27
	← porsche944 left	19:27
	← mkoskar left	19:27
	→ mkoskar joined	19:28
	→ cagomez joined	19:28
	→ damsel joined	19:29
damsel	Hello I was just wondering git reg-list --count origin counts unique commands that are on local but not on remote, EXCLUDING merge-commits(merged on local) how can I count them as well?	19:30
	← bannakaf_ left	19:30
	→ bannakaffalatta joined	19:30
	← ThiefMaster left	19:30
damsel	because git status tells me that my branch is 12 commits ahead while git rev-list --count origin only tells me there are 6 commits	19:31
	→ ThiefMaster joined	19:31
	← Eragon left	19:31
	→ Eragon joined	19:31
	← cagomez left	19:31
	← PaulCapestany left	19:32
	→ MutantMahesh joined	19:33
	← ac3takwas left	19:34
	← Eragon left	19:34
qqx	damsel: `git rev-list --count origin` would tell you how many commits are in "origin", nothing related to your current branch. Try `git rev-list --count origin..`.	19:34
	ugjka → xyk	19:34
	→ Eragon joined	19:34
	xyk → ugjka	19:34
	→ PaulCapestany joined	19:34
damsel	qqx it tells me 59,	19:35
	→ roelmonnens joined	19:35
damsel	btw what is up with the ..suffix?	19:35
	→ cagomez joined	19:35
qqx	damsel: That specifies a range, with nothing after it defaults to using HEAD as the end.	19:35
	It specifies commits in HEAD that aren't also in origin.	19:36
damsel	ths	19:36
qqx	To get even closer to what status would be doing you could use `git rev-list --count @{u}..`.	19:36
	← cagomez left	19:37
qqx	@{u} specifies the upstream branch for your current branch.	19:37
damsel	ok how come I do not see that in the documentation? besides ref@{u}	19:38
	or to formulate it differently how can I know?(for me for future learning	19:39
	@{u}.. did the trick. I count 12.	19:39
	how come --count HEAD is not counting merge-commits?	19:39
	← PaulCapestany left	19:39
qqx	It's listed in man git-rev-parse.	19:39
gitinfo	the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html	19:39
	← roelmonnens left	19:40
damsel	ok I was only looking at rev-list	19:40
	→ alexandre9099 joined	19:41
damsel	thank you very much	19:41
qqx	For me --count includes merges unless I specifically say --no-merges	19:41
	→ chipotle joined	19:41
damsel	ok that is strange ... when I specify --merges nothing changes for me	19:42
	← rokups left	19:42
damsel	where did your changes occure? local or remote?	19:42
	→ askb joined	19:42
	→ regedit joined	19:42
	← skypuke_ left	19:43
damsel	hmm in the manpages it states for rev-list ... omit patch equivalent commits ....	19:43
	→ gtristan joined	19:44
qqx	That's only when used with --cherry-mark.	19:44
	Perhaps try !graph to help figure out what is being included.	19:46
gitinfo	[!lol] A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	19:46
	→ PaulCapestany joined	19:46
	← octo8 left	19:47
damsel	ok.. then I do not know, I can only say how I arrived there, remote branch dev and abc, changes made in dev pushed by me, merged into dev, and then I merged from dev directly into abc locally	19:47
	and only the merge-commits are excluded	19:47
	all dedicated commits are counted	19:47
	← MutantMahesh left	19:48
	→ cagomez joined	19:48
damsel	on the note of git rev-parse, it reads like it contains all the "funky" expressions one would need for some nifty scripts if necessary, and that are understood by most/all git-commands. good to know was always wondering where some find these paramters in the SO-answers	19:49
	→ grayjoc joined	19:49
	→ UrsoBranco joined	19:50
damsel	anyways thanks for all the help qqx :D	19:52
Eugene	It also slices, dices, and collates double-sided printing	19:53
damsel	especially the rev-parse thing	19:53
	→ thebope joined	19:53
	→ satifant joined	19:53
damsel	Eugene, probably but I don't wanna find out quite yet, wouldn't know when I would need to actually call reg-parse anyways	19:54
	gitinfo set mode: +v	19:54
	sorenb_ → soerenb	19:54
damsel	scared to actually kill the companies repo :D	19:54
	← _Vi left	19:54
damsel	as powerfull as git is	19:54
Eugene	rev-parse doesn't modify anything	19:54
damsel	ok I thought your answer was related sry bout that	19:54
	← digidog left	19:55
	← damsel left	19:55
Eugene	Nah, this is just BS funny because its my lunchtime	19:55
	→ tang^ joined	19:55
	→ richardlitt joined	19:55
	← perrier-jouet left	19:55
	→ david-e joined	19:56
qqx	You generally wouldn't call rev-parse directly. It's mainly for use by other scripts.	19:56
	← schleppel left	19:57
	← Rodya_ left	19:57
	← kbeflo left	19:57
	← thebope left	19:57
	→ Rodya_ joined	19:58
	← Rodya_ left	20:00
	← drodger left	20:01
	← s1scha left	20:01
	← madduck left	20:02
	→ miczac joined	20:06
	← HurricaneHarry left	20:06
	gitinfo set mode: +v	20:06
	→ madduck joined	20:06
	→ drodger joined	20:06
	← Murii left	20:08
	→ mischat joined	20:09
	→ HurricaneHarry joined	20:09
	→ chardan joined	20:11
	→ darkmist_ joined	20:12
	→ me__ joined	20:12
	← cydrobolt_ left	20:13
	→ cydrobolt joined	20:13
	← cydrobolt left	20:13
	→ cydrobolt joined	20:13
	← dendazen left	20:14
	→ maroloccio joined	20:14
	← darkmist_ left	20:15
	→ matoro joined	20:15
	← xper0 left	20:15
	→ theoceaniscool joined	20:15
	← Discovery left	20:16
	→ luke_nukem joined	20:17
	→ cdg joined	20:17
	← Eragon left	20:18
	← pks left	20:19
	→ mehola joined	20:20
	← me__ left	20:21
	← cd-rum left	20:23
	← Groscheri left	20:23
	→ cd-rum joined	20:24
	→ me__ joined	20:24
	← mehola left	20:24
	← NeverDie left	20:24
	← Nicmavr left	20:26
	→ NeverDie joined	20:27
	← jstimm left	20:27
	← bejeb left	20:27
	→ shgysk8zer0 joined	20:28
	→ j08nY joined	20:28
faLUCE	I don't understand the meaning of this image: https://git-scm.com/book/en/v2/images/basic-rebase-2.png (from: https://git-scm.com/book/en/v2/Git-Branching-Rebasing) It says that there's a merge between C3 and C4, but the picture still shows C3 and C4 as separated nodes. Why? Should they be grouped into one node called "C3+C4", instead?	20:29
	→ Nicmavr joined	20:29
	→ bejeb joined	20:29
	Nicmavr → Guest80652	20:29
	→ sea-gull joined	20:30
	→ m0viefreak joined	20:30
	→ synthroi_ joined	20:30
kadoban	faLUCE: No, that's not what merge does in git	20:30
	→ aidalgol joined	20:31
	→ g0d355__ joined	20:31
	← g0d355__ left	20:31
kadoban	faLUCE: That would change history, if C3 and C4 didn't exist anymore or something. Instead, a merge commit is created, with the parents of that commit being everything that's being merged into one. C5 is a merge commit that merges C3 and C4	20:31
	→ PaulCape_ joined	20:32
	→ synthro__ joined	20:32
	← orbyt_ left	20:33
	← PaulCapestany left	20:33
	← synthroid left	20:34
faLUCE	kadoban: I see, so the actual merge is C5	20:34
	thanks	20:34
	← dave0x6d left	20:35
	← theoceaniscool left	20:35
	← synthroi_ left	20:35
faLUCE	kadoban: so the idea of the rebase is to group multiple commits into one, instead of merging separate nodes?	20:36
	→ crose joined	20:37
	← j08nY left	20:37
kadoban	That's certainly not how I think about rebase, that doesn't sound correct unless you're talking about some specific usage.	20:37
	← jimi_ left	20:38
kadoban	Rebase usually involves "cutting" a branch out of the existing tree of commits and attaching it somewhere else	20:39
	← peterbec` left	20:39
	← dglambert left	20:39
preaction	squash is grouping multiple commits into one. rebase is rewinding the tape and then replaying it	20:39
kadoban	Where in this case we treat a commit as a set of changes from the parent. So it tries to create a new history that includes all of the same changes that happened in an old history.	20:39
	← hahuang61 left	20:41
faLUCE	kadoban: I have to contribute to a project with a git repo and many developers. hey told me to use rebase when I have to send ONE global modificiation for multiple files with inter-dependencies.	20:41
	← jeffreylevesque left	20:42
	→ svm_invictvs joined	20:42
	→ _Vi joined	20:42
	→ theiostream joined	20:44
	← theiostr_ left	20:44
	← Gsham left	20:46
	← LionsMane left	20:47
	← snits left	20:47
	→ thebope joined	20:47
	← synthro__ left	20:47
	→ orbyt_ joined	20:48
	← TheOrangeOne left	20:51
	← thebope left	20:52
	← ExoUNX left	20:53
	→ snits joined	20:53
	← mmattice left	20:54
	→ bdonnahue joined	20:54
	→ MineCoins joined	20:54
	→ TheOrangeOne joined	20:55
	← dviola left	20:55
	→ jimi_ joined	20:56
	→ mmattice joined	20:58
	→ ronin_work joined	21:01
	→ diogenese joined	21:03
	← gtristan left	21:05
	← aielima left	21:05
	← rnsanchez left	21:06
	← me__ left	21:07
	← grayjoc left	21:08
	→ AnimeLife joined	21:08
AnimeLife	Hi devs, when I send an email to git public inbox [email@hidden.address] from hotmail it is not seen at http://public-inbox.org/git/. Can somebody help?	21:09
	← salamanderrake left	21:09
	← Cabanossi left	21:09
	← mmattice left	21:09
	→ grayjoc joined	21:09
	→ salamanderrake joined	21:10
	→ gunnaro joined	21:10
	→ tymczenko joined	21:11
	→ Cabanossi joined	21:11
	→ mmattice joined	21:11
	→ hahuang61 joined	21:13
	← MineCoins left	21:13
	← jagobdue left	21:14
	← chipotle left	21:15
	→ jost__ joined	21:15
	→ Silenced_v2 joined	21:15
j416	AnimeLife: it'll take a while.	21:16
	← cd-rum left	21:16
AnimeLife	ah, thnx for confirmation	21:17
	→ cd-rum joined	21:17
j416	AnimeLife: what's the subject line?	21:17
	← jost_ left	21:18
	← manuelschneid3r left	21:18
AnimeLife	[RFC/PATCH] Make “git tag --contains <id>” less chatty if <id> is invalid expand.png print.png thread-popout.png You Hi git developers. I am a student interested for Gsoc. With my patch I am able to produce following output. $ git tag --contains qq error: malformed object name qq $ git tag --contains HEAD q Mar 30, 8:26 pm sending-spinner.gif March 30, 2017, 8:54 PM 1 open ic-dropdown-replyall.pngicon-thread-disclosure.png messag	21:18
	Sorry	21:19
	it is [RFC/PATCH] Make “git tag --contains <id>” less chatty if <id> is invalid	21:19
	← buffffal00 left	21:19
AnimeLife	I just heard from other channel that vger automatically drops html messages, is that trye?	21:19
	← ash_workz left	21:20
j416	I can't find your message in my mailbox, at least.	21:21
	→ bariscant joined	21:21
j416	but don't send html messages.	21:21
	I wouldn't be surprised if it dropped those	21:21
	→ Qdo joined	21:21
AnimeLife	Thnx, I am fixing the html problem.	21:22
	→ dsdeiz joined	21:22
	← AaronMT left	21:22
	← moei left	21:23
	← YuGiOhJCJ left	21:23
	→ roelmonnens joined	21:24
	← cd-rum left	21:27
AnimeLife	j416: Can you please check it again, I sent it in plain text this time	21:27
j416	AnimeLife: Varun?	21:27
AnimeLife	Yes	21:28
j416	:)	21:28
AnimeLife	btw, are you a git contributer?	21:28
	→ t0by joined	21:28
	← Silenced_v2 left	21:29
	← bannakaffalatta left	21:29
	← roelmonnens left	21:29
	← keks[m] left	21:30
	→ Silenced_v2 joined	21:31
j416	technically yes, but not really, no.	21:31
	← todd_dsm left	21:31
	← crose left	21:32
j416	I have contributed 1 character to the project.	21:32
	XD	21:32
AnimeLife	haha, but thaanks for helping me ;)	21:32
j416	o/	21:32
	→ bomb-on joined	21:35
	← grayjoc left	21:35
	→ grayjoc joined	21:35
	← ronin_work left	21:36
	← grayjoc left	21:36
	→ juvenal joined	21:36
	← Darcidride_ left	21:37
	← jimi_ left	21:37
	→ davidfetter_ge joined	21:39
davidfetter_ge	hi	21:40
	← jtoy left	21:40
davidfetter_ge	if i move and edit a file in a commit, is there any way to record that it's been "renamed" instead of a delete/create	21:40
Peng	No, but if you adjust the rename detection settings, it'll probably noticde	21:41
davidfetter_ge	how do i do that?	21:41
	→ kbs joined	21:41
	→ thebope joined	21:41
	→ WeiJunLi joined	21:42
	→ TheHelper joined	21:42
WeiJunLi	i have a super slow connections there's any option i can add on git clone cmd to prevent time outs?	21:42
	→ Chinggis6 joined	21:43
jast	davidfetter_ge: some of the operations in which rename detection is relevant let you specify a detection threshold, e.g. git log -M80. however, if you have too many edits in a renamed file you probably won't find a threshold that doesn't also detect renames where there actually weren't any. :)	21:43
	← TheHelper left	21:43
	→ TikityTik joined	21:43
	→ danboid joined	21:43
danboid	How would I go about creating a patch that represents a branch?	21:45
	→ crippleye joined	21:45
	← thebope left	21:46
	→ molgrum joined	21:46
	← molgrum left	21:46
	→ molgrum joined	21:46
	← dtbn left	21:46
danboid	Is my question clear, I wonder?	21:46
	→ kevy0 joined	21:46
	← Es0teric\|Work left	21:46
davidfetter_ge	as in the patch that represent the diff from another branch?	21:47
	← cyberz left	21:47
	→ jtoy joined	21:48
danboid	I have a branch against linux git. I want to create a 'diff' of that branch so that I can create a patch for rc4 that does what the branch does	21:48
	I don't own the branch	21:48
	← cagomez left	21:48
danboid	I have requested the maintainer of that branch do this for me but surprisingly he's not responded :)	21:49
	← btree left	21:49
cjohnson	git diff master...branch	21:49
	should show you changes introduced in branch since the diverging point	21:49
	→ cagomez joined	21:49
	← dersand left	21:50
	→ tanuki joined	21:50
	→ cyberz joined	21:50
danboid	cjohnson, That's part of what I need - thanks	21:50
cjohnson	what is the rest?	21:51
danboid	cjohnson, Is there an easy way to dump that into a regular diff patch file?	21:51
cjohnson	it outputs in patch format	21:51
	just write the output to a file	21:51
danboid	Oh OK :)	21:51
cjohnson	git diff master...branch > my.patch	21:51
	← Cabanossi left	21:54
	← borkr left	21:54
	← Dougie187 left	21:54
	← satifant left	21:55
	← mmattice left	21:55
	← juvenal left	21:55
	← eb0t left	21:56
	→ masuberu joined	21:56
	← jtoy left	21:56
	→ Cabanossi joined	21:56
	← AnimeLife left	21:57
	→ jtoy joined	21:57
	→ juvenal joined	21:59
	→ Atm0spher1c joined	22:00
	← cyberz left	22:00
	← WeiJunLi left	22:00
	Atm0spher1c → Guest63207	22:00
	→ buffal0 joined	22:01
	← de-facto left	22:01
	→ de-facto joined	22:01
	← bomb-on left	22:01
	← jtoy left	22:02
	← Guest63207 left	22:02
	→ cyberz joined	22:02
	← crippleye left	22:03
	→ Atm0sphe1 joined	22:04
	← Atm0sphe1 left	22:05
	← blackwind_123 left	22:05
	→ dave0x6d joined	22:05
	→ Atm0sphe1 joined	22:05
	← bariscant left	22:06
	→ mmattice joined	22:07
	← mar77i left	22:07
	→ blackwind_123 joined	22:07
FrozenFire	Does anyone know of a decent resource on pointing submodules to the tip of a remote branch? I've read http://stackoverflow.com/a/9189815/1069833 and it's more of a how-to than information about the pros/cons and underlying implementation.	22:08
	← tvw left	22:08
	← buffal0 left	22:08
	← t0by left	22:08
FrozenFire	In particular, I have a dependency as a submodule which should preferably always be at a branch's HEAD.	22:08
	→ sim642 joined	22:09
	→ habbasi joined	22:09
	→ myhau joined	22:10
	← tanuki left	22:10
	→ tanuki joined	22:11
	← mda1 left	22:12
	← masuberu left	22:12
	→ mda1 joined	22:13
	← tanuki left	22:13
danboid	cjohnson, Actually, I need to diff against a specific tag in a branch	22:13
	→ manuelschneid3r joined	22:14
	→ tanuki joined	22:14
cjohnson	danboid: that's fine, replace branch with the tag	22:17
	the tag just refers to a specific commit in the branch whcih means it will share the same history up to that point with the branch	22:17
	→ b0nn joined	22:17
cjohnson	and thus, the same common ancestor	22:17
	← kegster left	22:18
b0nn	hi all, I've got a bit of a mess I want to clean up; I am in a branch, and I am getting a message about being ahead of a different branch by n commits. All I want to do is scratch and git clone, without causing any issues for anyone else	22:18
	How do I do that?	22:19
	← gugah left	22:19
cjohnson	to me the easiest way to do that is to just delete the local copy and re-clone	22:19
	but if you have some untracked local files	22:20
b0nn	les, that's what I want to do	22:20
cjohnson	oh then yeah, just do that	22:20
	delete the dir	22:20
danboid	cjohnson, So if this is the branch command `git fetch https://git.pengutronix.de/git/pza/linux.git tags/v4.10-ipu-dp-plane-fix`	22:20
b0nn	Are you saying, just rm -rf the tree?	22:20
cjohnson	git clone	22:20
	yeah that's what I do if I don't have important untracked files/changes	22:20
danboid	cjohnson, How does that translate into a branch/tag	22:20
	← ankit01ojha left	22:20
b0nn	good, I'll give it a go.	22:21
	→ mehola joined	22:21
cjohnson	danboid: well normally if you are specifically wanting to compare with a remote	22:21
	I would set it as an actual remote instead of hard specifying the URL	22:21
	← LeBlaaanc left	22:21
cjohnson	git remote add upstream https://git.pengutronix.de/git/pza/linux.git	22:22
	then you can just use upstream/tags/v4.10-ipu-dp-plane-fix	22:22
	→ bannakaffalatta joined	22:22
cjohnson	to refer to that upstream tag	22:22
danboid	cjohnson, OK - thanks!	22:22
	← juvenal left	22:23
	→ darkmist_ joined	22:23
	← jagob left	22:24
	← myhau left	22:25
	← sea-gull left	22:25
	← mehola left	22:25
danboid	cjohnson, Nah I'm lost :)	22:27
	→ druonysus joined	22:27
danboid	cjohnson, I want to diff https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git aagainst that branch and tag above	22:27
cjohnson	which branch of the linked repo are you diffing against	22:28
	you can't diff a branch against a whole repo	22:28
	→ zerocua joined	22:29
	→ jimi_ joined	22:29
danboid	cjohnson, I want to diff againt Linux 4.11rc4	22:29
cjohnson	that's the name of the branch?	22:29
	or what	22:29
danboid	4.11-rc4	22:29
	Its a test release	22:30
cjohnson	git remote add upstream https://git.pengutronix.de/git/pza/linux.git	22:30
	→ gugah joined	22:30
cjohnson	git diff upstream/tags/4.11-rc4..tags/v4.10-ipu-dp-plane-fix	22:30
	two dots gives you a complete diff	22:30
	three dots will tell you differences from one side only	22:31
danboid	that first command: `fatal: Not a git repository (or any of the parent directories): .git`	22:32
	← cagomez left	22:32
	→ ronin_work joined	22:32
cjohnson	you can't run git commands in a dir that isn't a git repo	22:33
danboid	cjohnson, I need to clone the repo I'm diffing against first do I?	22:33
	← gopar left	22:33
	← Fallen0223 left	22:33
cjohnson	Wait, you just want to diff two branches on the same remote repo?	22:34
	← zerocua left	22:34
cjohnson	I thought you wanted to diff your local changes to the remote	22:34
FrozenFire	If I've used `git submodule update --remote`, how can I reset an affected submodule's superproject commit back to what it was?	22:34
	← gugah left	22:34
	← aidalgol left	22:34
cjohnson	from the super project, you can just git reset HEAD path/to/submodule	22:35
FrozenFire	Thanks	22:35
	→ Fallen0223 joined	22:35
danboid	cjohnson, No. I want to diff a tag on one repo (the latest Linux 4.11 rc4) against a tag in a different repo/tag	22:35
	→ thebope joined	22:35
	← david-e left	22:36
cjohnson	when you say repo, do you mean branch?	22:36
	you can't compare across two repositories	22:36
	unless they are clones of one another of course	22:36
	sorry I see now. You have two remotes, presumably one is a clone of the other	22:36
danboid	cjohnson, Yes, they are all clones of the Linux kernel	22:36
	← shgysk8zer0 left	22:37
cjohnson	I would clone the authoritative master, then add each one as a remote	22:37
	then use the diff command using the remote name in the path for each	22:37
	← manuelschneid3r left	22:37
cjohnson	git remote add official //git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git	22:37
	→ zerocua_ joined	22:37
cjohnson	woops	22:37
	← ResidentBiscuit left	22:38
cjohnson	git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git	22:38
	git remote add pengutronix https://git.pengutronix.de/git/pza/linux.git	22:38
	git diff tags/4.11rc4...pengutronix/tags/v4.10-ipu-dp-plane-fix	22:38
	← darkmist_ left	22:38
cjohnson	something like that	22:38
	← Cabanossi left	22:39
	← Qdo left	22:39
danboid	cjohnson, OK - I should be able to work it out from here :)	22:39
	I've only ever used the most basic features of git	22:39
	← thebope left	22:40
b0nn	hm, so, the clone went well (ish) but I'm missing code locally that exists remotely	22:41
	→ Cabanossi joined	22:41
	→ darkmist_ joined	22:41
	→ chipotle joined	22:42
b0nn	I can see the code remotely ( bitbucket) but it doesn't exist locally	22:43
	ideas	22:43
	?	22:43
cjohnson	different branch?	22:44
	→ anuxivm joined	22:45
	→ Tatou_ joined	22:49
	← Fallen0223 left	22:50
	→ shgysk8zer0 joined	22:50
	← darkmist_ left	22:50
	← Tatou_ left	22:51
	→ Fallen0223 joined	22:51
	→ Tatou joined	22:51
Tatou	test	22:51
	← Acerific left	22:51
	→ gunnaro_ joined	22:53
	← gunnaro left	22:53
	← Guest30225 left	22:55
	← matoro left	22:55
Tatou	I want to mirror all my gitlab repos to local. Is this doable?	22:56
	← publio left	22:56
	→ cagomez joined	22:57
	→ Guest30225 joined	22:57
kbs	dunno much about gitlab, but curious - what does mirror'ing mean in this context (presumably not just cloning all repos :-)	22:57
Tatou	Cloning all repos and keeping htem up to date!	22:57
	← cagomez left	22:57
Tatou	I'm not sure how much I trust gitlab.. They have some sketchy approaches to keeping their service running	22:58
	← Guest30225 left	22:58
	→ Guest30225 joined	22:58
	Guest30225 → lb	22:58
kbs	oh :-) in my naive thinking, I might just have a cron job to periodically run git update, but maybe you're looking for something different...	22:58
lb	Tatou seen gitea already?	22:58
Tatou	gitea?	22:59
lb	Tatou gitlab/github alternative http://gitea.io/	22:59
Tatou	ok cool, so here is what I need: I need private repos for me alone, for code I won't have on any machine potentially..	23:00
	→ getxsick joined	23:00
Tatou	Like I keep puppet manifests on there to setup my machines	23:00
lb	Tatou bitbucket offers free private repos?	23:00
Tatou	bitbucket is altassian?	23:01
	← theiostream left	23:01
lb	yes	23:01
	→ juvenal joined	23:01
Tatou	Ok, that works for me!	23:01
lb	there you go :)	23:01
	→ matoro joined	23:02
Tatou	haha, what.. I have code on there from 2012	23:03
	Why the hell did I use git in 2012..	23:03
	→ Sasazuka_ joined	23:03
	← bdonnahue left	23:04
	← zerocua_ left	23:04
	→ bdonnahue joined	23:04
	← Sasazuka left	23:04
	← miczac left	23:05
	← jimi_ left	23:05
	→ aidalgol joined	23:05
	→ tmg joined	23:06
	→ eb0t joined	23:06
	← Chinggis6 left	23:07
	→ zerocua_ joined	23:07
	← ronin_work left	23:07
	→ freexand joined	23:07
	← freexand left	23:07
	→ safe joined	23:08
	→ freexand joined	23:08
	← freexand left	23:09
	← finalbeta left	23:10
	→ freexand joined	23:11
	← nixjdm left	23:11
	← freexand left	23:11
	→ unbalancedparen joined	23:12
	← unbalancedparen left	23:12
	→ freexand joined	23:13
	→ roelmonnens joined	23:13
	← freexand left	23:13
	← cdg left	23:14
	→ freexand joined	23:15
	← freexand left	23:15
	→ cheesegits joined	23:15
	→ zerocua joined	23:15
	← zerocua_ left	23:17
	→ freexand joined	23:17
	→ gugah joined	23:17
	← freexand left	23:17
	← roelmonnens left	23:17
	← cyberz left	23:18
	← joki left	23:18
	→ todd_dsm joined	23:18
	→ robattila256 joined	23:18
	→ freexand joined	23:19
	← freexand left	23:19
	← Emperor_Earth_ left	23:20
	→ cyberz joined	23:21
	← gugah left	23:26
	← kexmex left	23:26
	← DarkPsydeLord left	23:27
	← maroloccio left	23:28
	← zerocua left	23:28
	← anuxivm left	23:28
	← juvenal left	23:28
	→ scoobert1on joined	23:29
	← mischat left	23:29
	→ thebope joined	23:29
	← cyberz left	23:30
	→ zerocua joined	23:30
	← D4R5C0D3 left	23:32
	→ cyberz joined	23:33
	← scoobertron left	23:34
	← thebope left	23:34
	← danboid left	23:34
	→ danboid joined	23:34
tterrag	so I have a bit of an odd problem to solve. someone has made 2 PRs of about the same content to two different branches. however, I'm trying to keep branch B purely ahead of branch A so I can merge easily.	23:35
	the PR only consists of adding one file. so I essentially just want to diff the file in branch B against the one in branch A and apply it as a change instead of a new file	23:36
	is that doable? or will I have to do it manually	23:36
	← henriknj left	23:36
	→ overlord_tm joined	23:36
	← holodoc left	23:36
	← tang^ left	23:37
	← albel727 left	23:39
	→ crose joined	23:42
	→ curtii joined	23:42
	← cyberz left	23:42
	→ albel727 joined	23:43
	gitinfo set mode: +v	23:46
curtii	Hello everyone! I got something I've been struggling with throughout the day, regarding git permissions	23:46
	→ cyberz joined	23:46
curtii	Wondering if anyone here has advice. I'm setting up an Icinga monitoring server, and a good recommendation I found is to make the root directory for it's configurations a git repository	23:46
	Been working great, doing all the stuff git is supposed to do	23:47
	← crose left	23:47
	← zerocua left	23:47
curtii	The issue I'm running into is I'd like to make backups, by cloning (pushing, really) this repository into a mounted NFS share, and it's been problematic due to permissions	23:47
	→ TbobbyZ_ joined	23:49
curtii	Problem is I can't really monkey with the file permissions in the original location without screwing up the monitoring server, and without changing the permissions, I get denied permission to write to the NFS mounted backup share	23:49
	← Tobbi left	23:49
	→ zerocua joined	23:50
curtii	Files in the original location are owned by root, and due to the way my NFS server is setup, I can't really make the share accessible to root.	23:50
	← sbeller left	23:52
	← TomyLobo2 left	23:52
	← shgysk8zer0 left	23:52
	← TbobbyZ left	23:52
	→ shgysk8zer0 joined	23:52
	← TbobbyZ_ left	23:53
	← hashtagstrashtag left	23:54
	→ darkmist_ joined	23:54
	→ holodoc joined	23:54
curtii	So I'm kind of stuck in one of three scenarios: I'm logged in as root, and can't write to the NFS share - Logged in as normal user, and can't access the git repo - I change the file permissions/owner, and my monitoring configuration is broken	23:54
	→ gunnaro joined	23:55
	→ j08nY joined	23:56
	→ shgysk8zer0_ joined	23:56
	← darkmist_ left	23:56
	← overlord_tm left	23:57
	← danboid left	23:57
	← matoro left	23:57
	→ danboid joined	23:58
	← tymczenko left	23:58
	→ sbeller joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation