Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-06

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:01 Cabanossi joined #git
00:02 anuxivm joined #git
00:02 royal_screwup21 joined #git
00:02 durham_ joined #git
00:05 brent__ joined #git
00:09 singlerider Rebase all day every day
00:12 brent__ joined #git
00:14 h12o joined #git
00:14 onehrxn joined #git
00:15 brent__ joined #git
00:16 cagomez joined #git
00:17 SCHAPiE joined #git
00:17 MrWoohoo joined #git
00:19 royal_screwup21 joined #git
00:19 roelmonnens joined #git
00:19 bronson joined #git
00:19 tnecniv joined #git
00:24 dsdeiz joined #git
00:24 dsdeiz joined #git
00:25 roar joined #git
00:25 fstd_ joined #git
00:25 PioneerAxon joined #git
00:25 brent__ joined #git
00:26 livingstn joined #git
00:27 gaucheph joined #git
00:28 stoopkid joined #git
00:28 roar joined #git
00:30 roar joined #git
00:31 Cabanossi joined #git
00:32 trashboatjr joined #git
00:32 zzz joined #git
00:34 h12o joined #git
00:34 YuGiOhJCJ joined #git
00:36 roar joined #git
00:37 cagomez joined #git
00:43 livingstn joined #git
00:46 ertes joined #git
00:53 watabou joined #git
00:54 royal_screwup21 joined #git
00:55 h12o joined #git
00:55 cads joined #git
00:56 druonysus joined #git
00:58 duderono_ joined #git
00:59 dsdeiz joined #git
01:00 dirtyroshi joined #git
01:00 NeverDie joined #git
01:04 moei joined #git
01:04 anuxivm left #git
01:06 ToBeCloud joined #git
01:07 HoierM joined #git
01:08 TbobbyZ joined #git
01:09 d^sh joined #git
01:09 quackgyver joined #git
01:14 rnsanchez joined #git
01:15 h12o joined #git
01:17 MattMaker joined #git
01:17 YuGiOhJCJ joined #git
01:19 junw joined #git
01:21 Wulf4 joined #git
01:22 Darren_ joined #git
01:23 StuartMI joined #git
01:23 rv joined #git
01:25 finalbeta joined #git
01:25 h12o joined #git
01:26 Gustavo6046 joined #git
01:31 drizbit joined #git
01:33 TheSimonator joined #git
01:33 dsdeiz joined #git
01:33 dsdeiz joined #git
01:35 brent__ joined #git
01:39 misosoup joined #git
01:40 sunri5e joined #git
01:47 Phanes- joined #git
01:50 ilbot3 joined #git
01:50 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:51 a3Dman joined #git
01:54 Goplat joined #git
02:00 telephone joined #git
02:00 telephone joined #git
02:01 Cabanossi joined #git
02:04 d1b joined #git
02:04 arecaceae joined #git
02:06 h12o joined #git
02:06 Eugene joined #git
02:06 roelmonnens joined #git
02:07 NeverDie joined #git
02:07 chachasmooth joined #git
02:09 onehrxn joined #git
02:10 lagothrix joined #git
02:11 nevodka joined #git
02:14 telephone joined #git
02:14 telephone joined #git
02:15 lagothri1 joined #git
02:16 bdonnahue joined #git
02:17 bdonnahue hey guys... i want py gitignore to ignore __pycache__
02:17 bdonnahue the dir might occur in sub dirs of by project
02:17 bdonnahue or the root dir
02:17 bdonnahue how can i ignore it
02:17 o11c left #git
02:18 xall_ joined #git
02:21 duderonomy joined #git
02:21 rv joined #git
02:21 deltab add  __pycache__  to .gitignore
02:22 bdonnahue hmm i did but it is still showing up. do i need special args to tell it ignore the file in any subdir?
02:22 deltab showing up where?
02:23 deltab if __pycache__ has already been added, it'll stay there
02:23 bdonnahue im using giteye to show list of modified/pending files and the __pycache__ dir is showing up with .pyc files inside. I have added __pycache__ and *.pyc to gitignore
02:23 deltab are they in the index?
02:24 bdonnahue hmm i am not sure how to check that
02:24 deltab giot status
02:24 deltab git status
02:24 bdonnahue yes i see them there
02:25 deltab as files that are untracked?
02:25 bdonnahue maybe i comitted them before i added them to the git ignore? (still new to git so making some nub mistakes)
02:26 TbobbyZ joined #git
02:26 deltab which heading are they under?
02:26 h12o joined #git
02:28 deltab it's likely that they were already added, hence tracked; .gitignore won't affect things already in the repo
02:30 deltab (though iiuc it becomes possible for them to overwrite worktree files without warning)
02:30 dsdeiz_ joined #git
02:32 bronson joined #git
02:34 jon-mac joined #git
02:35 jameser joined #git
02:36 royal_screwup21 joined #git
02:41 govg joined #git
02:41 hexagoxel joined #git
02:46 oaao joined #git
02:47 h12o joined #git
02:51 kexmex joined #git
02:54 wcstok joined #git
02:55 mjk joined #git
02:56 royal_screwup21 joined #git
02:57 Vortex35 joined #git
02:58 c^ joined #git
02:58 NeverDie joined #git
03:02 Cabanossi joined #git
03:04 skarm joined #git
03:06 rv joined #git
03:07 h12o joined #git
03:07 diqidoq_ joined #git
03:09 MistahKurtz joined #git
03:10 rv joined #git
03:11 royal_screwup21 joined #git
03:14 fatalhalt joined #git
03:15 Xenophon1 joined #git
03:17 Cabanossi joined #git
03:21 masuberu joined #git
03:25 a3Dman joined #git
03:26 IRC_NOOB joined #git
03:27 h12o joined #git
03:31 ojdo joined #git
03:33 bronson joined #git
03:40 roar joined #git
03:48 h12o joined #git
04:08 h12o joined #git
04:11 Fairy joined #git
04:13 Fairy is there a good way to checkout files from a different branch that have LONG pathnames, without specifying the full path?
04:17 linuxmodder joined #git
04:18 kadoban Fairy: You know you can specify relative paths as far as git cares, right?
04:19 Fairy kadoban: yeah, I usually can - not when checking out files from different branches eg.: git checkout tesing -- "*testWindowSteer*"
04:20 singlerider make shorter paths :D
04:20 Fairy the uniqueness of filenames isn't a problem - and I really wish I could make shorter paths in this scenario =/
04:21 singlerider I use zsh and it tab completes my branch names
04:22 singlerider It makes my life great
04:22 dsdeiz joined #git
04:22 dsdeiz joined #git
04:22 Fairy tab catches waaay too many possibilities when trying to select the correct file
04:23 singlerider :'(
04:24 Fairy right now I'm forced to cd into the correct folder(s) in order to effectively checkout files from different branches - which is a bit frustrating, given that you can specify multiple files with the command, but it won't patternmatch path for some reason...
04:27 rv joined #git
04:27 thiago what is "it" that won't patternmatch?
04:27 thiago zsh?
04:28 h12o joined #git
04:29 Fairy thiago: git, I assume. I'm not familiar enough with unix to judge it to be any other problem - because patternmatching works just fine in every other scenario
04:29 thiago what exactly did you type that failed to pattern-match?
04:29 Fairy ie. git add "*testFile*" stages every file with "testFile" in its path
04:31 Fairy ie. if there's a file called "testFile.txt" in the test folder, in the testing branch: git checkout testing -- "*testFile.txt"   will fail.  git checkout testing -- "test/testFile.txt" is required (ie full pathname..)
04:33 thiago looks like it doesn't even try
04:35 Fairy yeah. and yet, if I do git add -- "*"  it'll nab pretty much every file
04:37 RandomUser4321 joined #git
04:39 h12o joined #git
04:41 Fairy I should probably ask, does this actually work for anyone else? ie. is my configuration screwed up somehow?
04:52 svm_invictvs joined #git
04:53 dbn[m] joined #git
04:58 nevodka joined #git
04:58 onehrxn joined #git
04:59 h12o joined #git
05:00 cdown joined #git
05:03 g0d355__ joined #git
05:04 dsdeiz joined #git
05:04 dsdeiz joined #git
05:05 LordRyan joined #git
05:09 stan_man_can joined #git
05:09 stan_man_can how do you clone a whole project? like all commits, branches, everything
05:09 stan_man_can I have a project on bitbucket i want to mgirate to github
05:10 h12o joined #git
05:10 schleppel joined #git
05:11 LordRyan i'm pretty sure github has a migration tool builtin
05:12 LordRyan you can use `git pull --all` though
05:12 onehrxn_ joined #git
05:12 singlerider hello LordRyan
05:12 LordRyan hello singlerider
05:12 singlerider Can you fix my issue with tmux?
05:12 singlerider thx
05:12 LordRyan working on it :I
05:14 pks joined #git
05:17 Bock joined #git
05:17 Puffball joined #git
05:21 otiose joined #git
05:22 Motoko joined #git
05:23 texasmynsted left #git
05:24 Emperor_Earth joined #git
05:25 acetakwas joined #git
05:26 jagob joined #git
05:30 h12o joined #git
05:33 stan_man_can left #git
05:34 bronson joined #git
05:47 tarkus joined #git
05:49 h12o joined #git
05:51 cads joined #git
05:53 Aboba joined #git
06:02 tarkus joined #git
06:03 tnecniv joined #git
06:05 netj joined #git
06:07 kexmex joined #git
06:15 prg3 joined #git
06:16 telephone joined #git
06:16 telephone joined #git
06:18 pandeiro joined #git
06:22 navidr joined #git
06:25 dwts joined #git
06:26 cagomez joined #git
06:32 Gloomy joined #git
06:39 jaziz joined #git
06:41 watabou joined #git
06:45 circ-user-zNiD2 joined #git
06:52 mkoskar joined #git
06:55 shubhnik joined #git
07:04 quup joined #git
07:04 quup left #git
07:04 astrofog joined #git
07:04 m4sk1n joined #git
07:05 kexmex joined #git
07:08 King_Hual joined #git
07:11 cads joined #git
07:14 parliament joined #git
07:21 otiose joined #git
07:29 zeroed joined #git
07:32 XenophonF joined #git
07:33 User458764 joined #git
07:33 apotry joined #git
07:34 bronson joined #git
07:42 sbulage joined #git
07:45 jaziz joined #git
07:49 lindenle joined #git
07:51 goTAN joined #git
07:55 royal_screwup21 joined #git
07:57 Snugglebash joined #git
07:58 aidalgol joined #git
07:58 filcab joined #git
07:59 lordjancso joined #git
07:59 duderonomy joined #git
08:00 goTAN joined #git
08:01 Gloomy joined #git
08:06 SlashLife joined #git
08:08 royal_screwup21 joined #git
08:12 tarkus joined #git
08:13 goTAN joined #git
08:14 ok91 joined #git
08:15 vals_ joined #git
08:18 dysfigured how do i get `git push` to push to two remote hosts? i've been editing .git/config manually but that sucks. i can't `git remote add origin xyz` because it complains it already exists, but adding a second url in the config works just fine..
08:18 Cabanossi joined #git
08:19 AndreasLutro dysfigured: I've added an alias: push-all = !git remote | xargs -L1 git push
08:19 dysfigured :\ that also sucks
08:20 AndreasLutro I think it's the best you can do. if your remote has 2 urls what happens if they diverge and you git pull?
08:21 dysfigured it only ever pulls from the first one
08:24 dysfigured in my case, my 'main' is github, but i also want to back things up to gitlab
08:24 ok91 joined #git
08:25 dysfigured there's really little if any chance of them getting out of sync, i control all of tAhem
08:26 Murii joined #git
08:35 User458764 joined #git
08:42 theoceaniscool_ joined #git
08:46 jameser_ joined #git
08:47 sea-gull_ joined #git
08:47 sea-gull joined #git
08:50 roelmonnens joined #git
08:59 karols146 joined #git
09:00 karols146 /o/
09:03 KnightsOfNi joined #git
09:05 pbandark joined #git
09:08 dersand joined #git
09:11 d^sh joined #git
09:17 earnestly joined #git
09:18 roelmonnens joined #git
09:19 frobnic joined #git
09:21 otiose joined #git
09:29 Levex joined #git
09:31 theoceaniscool joined #git
09:31 fstd joined #git
09:32 fstd_ joined #git
09:33 sarri joined #git
09:33 sarri joined #git
09:34 aax joined #git
09:34 knamehost joined #git
09:36 sbasso joined #git
09:36 bronson joined #git
09:40 blackwind_123 joined #git
09:40 ski7777 joined #git
09:41 robotroll joined #git
09:46 Nilesh_ joined #git
09:48 Cabanossi joined #git
09:49 overlord_tm joined #git
09:49 xall_ joined #git
09:50 sz0 joined #git
09:53 leeN joined #git
09:54 bobdobbs joined #git
09:55 karols146 joined #git
09:57 cdown joined #git
09:57 prg3 joined #git
09:57 bobdobbs I've pushed a project to a public repo github. But now I want to leave the github version in it's present state, and push future changesets to a private repo (not on github). How do I tell my project to stop pushing to github?
09:57 misosoup joined #git
09:57 borkr joined #git
10:00 goTAN joined #git
10:00 cdown_ joined #git
10:01 h12o joined #git
10:06 diogenese joined #git
10:10 imack joined #git
10:10 mjk_ joined #git
10:12 zerow joined #git
10:12 finalbeta joined #git
10:15 KnightsOfNi Hi, whenever I try to do git add . --all I'm getting "Unable to create index.lock: file exists"
10:15 KnightsOfNi then I remove the index.lock file and do the add again and it says 'Killed'
10:15 KnightsOfNi and then again, and it shows the first error again... what can I do to fix this?
10:17 shubhnik joined #git
10:18 KnightsOfNi bobdobbs, check your /.git/config file
10:18 KnightsOfNi you can specify your remote setting sthere
10:18 a3Dman joined #git
10:21 h12o joined #git
10:22 Gurkenglas joined #git
10:24 HurricaneHarry joined #git
10:26 bilal joined #git
10:26 bobdobbs KnightsOfNi: thanks
10:27 bremner KnightsOfNi: do you have multiple git processes? maybe some background process or IDE?
10:28 lipsumar joined #git
10:34 finalbeta joined #git
10:37 raatiniemi joined #git
10:38 finalbeta joined #git
10:40 KnightsOfNi I'm not sure bremner
10:40 KnightsOfNi I didn't start one purposefully at least
10:40 KnightsOfNi what process should I be looking for?
10:41 KnightsOfNi i'm in a virtual machine
10:42 h12o joined #git
10:42 bremner ps ax | grep git
10:42 bremner also, do you have some cron job or other automatic commit process?
10:42 KnightsOfNi i see one process
10:42 KnightsOfNi 2332
10:42 KnightsOfNi no cronjob or auto settings
10:44 bremner and is that process the grep you just ran?
10:45 KnightsOfNi yeah lol
10:45 mjk__ joined #git
10:45 KnightsOfNi just realized it
10:47 blackwind_123 joined #git
10:47 lipsumar joined #git
10:47 bremner actually, now that I re-read it sounds like the add is crashing and leaving the lock file. Are you adding some large file on a low memory machine?
10:48 KnightsOfNi maybe an image... have to check
10:48 selckin check 'dmesg'
10:48 mjk_ joined #git
10:52 h12o joined #git
10:53 dwts joined #git
10:53 KnightsOfNi dmesg is pretty long
10:53 KnightsOfNi what am I looking for?
10:54 Virox joined #git
10:54 selckin it saying it killed git
10:54 mjk__ joined #git
10:57 linuxmodder- joined #git
10:57 KnightsOfNi can't see that
10:57 KnightsOfNi maybe reinstall git?
10:58 selckin well gotta find whats killing it
11:01 ayogi joined #git
11:01 chrisM_1 joined #git
11:01 mjk joined #git
11:05 Gurkenglas How do I push my amended commit to github?
11:05 Gurkenglas git push rejects because there's already an unamended commit there.
11:05 lipsumar joined #git
11:05 selckin -f to overwrite it and piss off everyone using your repo
11:06 Sonderblade joined #git
11:06 KnightsOfNi I found the problem bremner, was a large file indeed
11:07 KnightsOfNi 4 GB even
11:07 pavlix joined #git
11:08 irqq joined #git
11:09 pavlix hi
11:09 pavlix is there a way to just push back remote refs?
11:09 pavlix I mean force-push
11:10 pavlix I have just ran git filter-branch and it affected all the refs/remote/origin branches
11:10 pavlix Now I would like to force-push the changes to the server.
11:10 pavlix (i.e. do the reverse of git fetch)
11:11 cads joined #git
11:12 h12o joined #git
11:15 grawity git push --force origin refs/remote/origin/*:refs/heads/*
11:15 grawity i.e. specify the exact opposite refspec of remotes.origin.fetch
11:16 mjk_ joined #git
11:19 Cabanossi joined #git
11:19 kexmex joined #git
11:19 lipsumar joined #git
11:21 otiose joined #git
11:23 Levex joined #git
11:24 pavlix grawity: thanks!
11:25 askb joined #git
11:28 sunri5e joined #git
11:32 zerow joined #git
11:33 zerow joined #git
11:33 h12o joined #git
11:38 mjk__ joined #git
11:41 finalbeta joined #git
11:42 qwertyasdfgh joined #git
11:44 bilal_ joined #git
11:46 zeroed joined #git
11:46 zeroed joined #git
11:47 blackwind_123 joined #git
11:48 Tobbi joined #git
11:48 mjk_ joined #git
11:54 h12o joined #git
11:54 sunri5e joined #git
11:54 shubhnik joined #git
11:56 D630 joined #git
11:58 kyan joined #git
11:58 manuelschneid3r joined #git
11:59 anuxivm joined #git
11:59 mjk__ joined #git
12:00 sunri5e_ joined #git
12:02 karols146 joined #git
12:02 mjk_ joined #git
12:03 user__ joined #git
12:03 Cabanossi joined #git
12:05 satifant joined #git
12:06 Acerific joined #git
12:06 Acerific joined #git
12:08 govg joined #git
12:08 Gloomy joined #git
12:08 _ADN_ joined #git
12:09 user__ joined #git
12:09 _ADN_ joined #git
12:13 Ryanar joined #git
12:14 acetakwas joined #git
12:14 h12o joined #git
12:14 Levex joined #git
12:15 mjk__ joined #git
12:16 Shock_ joined #git
12:18 Muzer joined #git
12:21 mjk_ joined #git
12:23 dave0x6d joined #git
12:25 h12o joined #git
12:25 mjk__ joined #git
12:27 manuelschneid3r joined #git
12:28 cebula joined #git
12:29 Gloomy joined #git
12:29 arecaceae joined #git
12:34 govg joined #git
12:38 Nilesh_ joined #git
12:40 nowhereman joined #git
12:45 h12o joined #git
12:48 Cabanossi joined #git
12:49 cads joined #git
12:53 Levex joined #git
12:57 Shock_ joined #git
13:01 h12o joined #git
13:01 jorj joined #git
13:02 jim hi. I have a dir chord-drill which is this chord practice drill I wrote in python... anyway, it has a module dir called chords that I want to pull out and make it its own repo... how do I go about that?
13:03 s17 work tree
13:04 jim where do I read up on that/
13:04 jim ?
13:04 s17 idk
13:04 s17 I could be wrong
13:04 bobdobbs left #git
13:04 jim ok, good enough
13:04 Vampire0 jim, with or without history?
13:05 jim I'd like the history
13:05 Vampire0 Then use man git filter-branch. iirc its man page also has a concrete example about making one subdir the root of its own repo
13:05 gitinfo the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html
13:06 jim thanks, I'll check that out
13:07 netj joined #git
13:09 User458764 joined #git
13:10 User458764 joined #git
13:12 karols146 joined #git
13:14 circ-user-zNiD2 joined #git
13:15 Vampire0 jim, yw
13:15 gitinfo jim: 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.
13:15 netj joined #git
13:18 Cabanossi joined #git
13:21 jim oh, well, that's the least I can do
13:21 jim so...
13:21 jim Vampire0, thanks
13:21 jim did that work? :)
13:22 h12o joined #git
13:22 s17 .karma Vampire0
13:22 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 35 (4 in past 30 days) (4 given out)
13:22 s17 maybe?
13:22 casey joined #git
13:22 netj joined #git
13:22 s17 .karma s17
13:22 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
13:22 s17 hoho
13:23 jim I smells me some hobbitses!
13:24 jim .karma s17
13:24 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
13:26 canton7 it's 10 thanks per karma, or something weird
13:27 tarkus joined #git
13:31 yqt joined #git
13:32 MistahKurtz joined #git
13:33 levex_ joined #git
13:35 marianina8 joined #git
13:38 bronson joined #git
13:42 Guest19 joined #git
13:44 jameser joined #git
13:46 SystemMainFrame joined #git
13:48 Cabanossi joined #git
13:52 h12o joined #git
13:56 borkr joined #git
14:03 lipsumar joined #git
14:07 roelmonnens joined #git
14:11 Noldorin joined #git
14:13 h12o joined #git
14:14 kiltzman joined #git
14:15 immae joined #git
14:15 SteffanW joined #git
14:21 jameser joined #git
14:22 Tobbi joined #git
14:23 jameser_ joined #git
14:25 yohnnyjoe joined #git
14:25 mohabaks joined #git
14:26 jameser__ joined #git
14:26 NeverDie joined #git
14:34 h12o joined #git
14:38 mjk joined #git
14:38 todd_dsm joined #git
14:39 tango_ joined #git
14:42 karols146 joined #git
14:42 cads joined #git
14:45 caper joined #git
14:48 sweatsuit joined #git
14:48 Cabanossi joined #git
14:49 stoopkid joined #git
14:50 thiago joined #git
14:50 raijin joined #git
14:51 _ADN_ joined #git
14:52 raijin joined #git
14:52 hashpuppy joined #git
14:54 h12o joined #git
14:58 Gurkenglas joined #git
15:00 dreiss joined #git
15:02 Gustavo6046 joined #git
15:06 dave_uy joined #git
15:07 h12o joined #git
15:08 ZexaronS joined #git
15:09 dsdeiz joined #git
15:09 dsdeiz joined #git
15:11 bronson joined #git
15:11 dave_uy joined #git
15:11 Goplat joined #git
15:11 idlemind joined #git
15:12 Introoter joined #git
15:14 the_last_uchiha joined #git
15:15 Gustavo6046 joined #git
15:18 circ-user-zNiD2_ joined #git
15:18 raijin joined #git
15:18 Cabanossi joined #git
15:19 sweatsuit joined #git
15:20 a3Dman joined #git
15:22 misosoup joined #git
15:24 m0viefreak joined #git
15:24 jameser joined #git
15:24 dogmatic69 joined #git
15:25 asdfghzxcvbn joined #git
15:25 ckubrak joined #git
15:25 ahrs joined #git
15:25 zyxep joined #git
15:27 ckubrak Hi guys, I've been using git in my home directory with my dotfiles which I push to a public repo in Github. However, there are a few files in the same directory which I would like to push to another server (a private one). Is that possible? Thanks!
15:28 unreal joined #git
15:28 Soni joined #git
15:30 canton7 making your home directory a git repo isn't such a good idea
15:30 canton7 take a look at !dotfiles
15:30 gitinfo There are various issues associated with keeping dot-files in git (permissions, avoiding having a .git in ~/  or /). One attempt to manage this is http://dotfiles.github.com/ and there is a wiki about it here: http://vcs-home.branchable.com
15:30 thiago not easily, no
15:30 publio joined #git
15:30 canton7 iirc some of the dotfiles tools will let you associate some dotfiles with one repo, and others with another
15:30 todd_dsm joined #git
15:30 Smasher joined #git
15:31 Smasher i have a branch on my remote called patch-1 which is listed as refs/remotes/fork/patch-1  and i have a local branch listed as refs/heads/fork/patch-1
15:32 Smasher i made a commit to the local branch and now i want to push it to the remote "fork"
15:32 TheSimonator joined #git
15:32 Smasher however if i push it it creates a new branch on fork called fork/patch-1 so i get a new ref refs/remotes/fork/fork/patch-1
15:32 dermoth joined #git
15:33 jozwior joined #git
15:33 Smasher how to push my branch correctly?
15:33 ckubrak canton7: Thanks!
15:33 osse Smasher: git push fork fork/patch-1:patch-1
15:33 osse Smasher: add an -u to it to make git remember
15:34 Smasher sheesh, thanks :)
15:36 thiago Smasher: suggestion: change your naming convention
15:36 Smasher yes, i think i was wrong to name the branch fork/patch-1
15:37 fstd joined #git
15:39 schleppel joined #git
15:39 re1 joined #git
15:39 mmlb joined #git
15:39 Smasher fixed it now Branch patch-1 set up to track remote branch patch-1 from fork.
15:40 Smasher and im happy :D
15:41 marianina8 joined #git
15:42 dermoth_ joined #git
15:44 jameser joined #git
15:46 ckubrak I'm about to move all my dotfiles from ~/ to ~/dotfiles/ and symlink them. How can I avoid losing all my previous commits?
15:46 peterbecich joined #git
15:46 imack joined #git
15:47 canton7 move your repo into ~/dotfiles ?
15:47 User458764 joined #git
15:47 vuoto joined #git
15:47 User458764 joined #git
15:48 ckubrak should I just move my .git/?
15:48 Shock_ joined #git
15:48 canton7 sure
15:49 canton7 then in ~/dotfiles, do 'git checkout -- .' to restore all of the files
15:50 thiago note that many applications will not respect symlinks
15:50 jameser joined #git
15:50 ckubrak That's easier than moving the files one by one, thanks
15:55 roelmonnens joined #git
15:55 ckubrak thiago: For example?
15:56 younis joined #git
15:56 thiago I'm just saying that saving files is not usually done by way of opening a file and writing to it
15:57 NeverDie joined #git
15:57 thiago instead, a temporary file is created, then an atomic rename happens
16:00 skirk joined #git
16:02 tnecniv joined #git
16:03 MistahKurtz joined #git
16:03 ckubrak Ok I see, I'll check some other options
16:03 jay-m joined #git
16:05 bronson joined #git
16:05 junw left #git
16:06 Smasher left #git
16:07 Mutter joined #git
16:08 Murii joined #git
16:11 prg3 joined #git
16:13 kyan joined #git
16:14 venmx joined #git
16:14 TbobbyZ joined #git
16:15 anuxivm left #git
16:18 blackwind_123 joined #git
16:18 Cabanossi joined #git
16:19 ayogi joined #git
16:22 ojdo joined #git
16:25 Shock_ joined #git
16:26 raijin joined #git
16:28 zaratustra joined #git
16:31 dirtyroshi joined #git
16:33 nickel_dime_look joined #git
16:34 ckubrak joined #git
16:34 xall_ joined #git
16:40 gugah joined #git
16:41 tymczenko joined #git
16:44 cdown joined #git
16:44 ankit01ojha joined #git
16:48 Gustavo6046 joined #git
16:49 karols146 joined #git
16:49 Husky_Apocalypse joined #git
16:49 bilal joined #git
16:50 prg3 joined #git
16:50 scarabx joined #git
16:50 shgysk8zer0 joined #git
16:51 ajayk joined #git
16:54 bilal joined #git
16:56 dilijev joined #git
16:59 TbobbyZ joined #git
17:00 tarkus joined #git
17:01 cseder joined #git
17:05 vuoto joined #git
17:05 TbobbyZ joined #git
17:07 bdonnahue left #git
17:07 madewokherd joined #git
17:09 m4sk1n joined #git
17:09 netj joined #git
17:10 plos joined #git
17:12 raijin joined #git
17:15 TbobbyZ joined #git
17:17 NeverDie joined #git
17:17 kexmex joined #git
17:20 scarabx left #git
17:22 mda1 joined #git
17:23 kuku joined #git
17:24 kuku left #git
17:24 raijin joined #git
17:25 asdfghzxcvbn joined #git
17:25 asdfghzxcvbn joined #git
17:25 asdfghzxcvbn joined #git
17:26 jay-m joined #git
17:27 ckubrak joined #git
17:27 prg3 joined #git
17:32 User458764 joined #git
17:35 tnecniv joined #git
17:35 tarkus_ joined #git
17:42 JanC_ joined #git
17:43 roelmonnens joined #git
17:44 shubhnik joined #git
17:44 mda1 joined #git
17:48 netj joined #git
17:49 GT4066 joined #git
17:51 bronson joined #git
17:52 watabou joined #git
17:52 jackrandom joined #git
17:52 a_thakur joined #git
17:54 cebula joined #git
18:02 ToBeCloud joined #git
18:09 northfurr joined #git
18:10 Gloomy joined #git
18:12 BSaboia joined #git
18:14 Lyqyd joined #git
18:14 venmx joined #git
18:16 bilal_ joined #git
18:18 mohabaks joined #git
18:19 bilal joined #git
18:20 the_last_uchiha joined #git
18:21 the_last_uchiha does the "staging area" get cleared after the commit ?
18:21 lindenle joined #git
18:22 safe joined #git
18:22 f1nch_ joined #git
18:23 Bombe the_last_uchiha, yes.
18:28 cads joined #git
18:29 kadoban the_last_uchiha: Well, in a sense. It doesn't really actually change, it just starts exactly matching the current commit usually.
18:30 tgummerer yeah the staging area is what's going to be in your next commit once you make it
18:30 tgummerer that's why it will match
18:30 zealsham_ joined #git
18:31 zealsham_ should i use gitolite or github for private hosted git server
18:31 the_last_uchiha Bombe, kadoban : hmm, i was thinking .. maybe the staging area will still keep the things you last staged into it ,..even after committing.., because the git diff command compares the staging area with the working directory right? the command would be useless if the staging area was cleared after every commit.
18:31 zealsham_ gitlab i meant
18:32 the_last_uchiha I still feel I'm missing a vital point :|
18:32 kadoban the_last_uchiha: I don't think you are, sounds like you have the right idea.
18:32 kadoban zealsham_: Those are indeed options. I've used gitolite and am very happy with it. I haven't used gitlab yet.
18:32 mentazoom joined #git
18:33 h12o joined #git
18:34 venmx joined #git
18:34 irqq joined #git
18:35 peepsalot joined #git
18:35 zealsham_ kadoban:  can you help me with setting gitolite up
18:35 bremner zealsham_: gitolite.com has very complete documentation, but you are also welcome to ask questions if you are stuck
18:35 bremner zealsham_: there is also #gitolite if you don't get an answer here.
18:35 kadoban Probably not much, the instructions were pretty good though on the official site though. I doubt I'll be able to add anything, I've done it probably 3 times, none recently.
18:36 zealsham_ bremner:  can i set up gitolite on a ubuntu-server running on vm in windows
18:36 bremner zealsham_: can you ssh to the VM from outside?
18:37 zealsham_ bremner: i think i can set up the ssh
18:37 zealsham_ bremner:  i also want other people to be able to push code to my server
18:38 kadoban Probably
18:41 the_last_uchiha kadoban, Bombe : confirmed it by trial and error. The staging area DOES NOT get cleared after a commit is made, instead the staging area maintains whatever was last staged into it, and this adding process is cumulative. effectively, the staging area just contains nothing but the contents of the last commit ,(just after the commit, before you proceed to stage anything else)...any comments?
18:42 h12o joined #git
18:42 tgummerer the_last_uchiha: yeah I think your conclusion is correct
18:43 tgummerer I guess it depends on the definition of "get cleared" :)
18:43 tgummerer but as I mentioned above, the staging area is exactly what your new commit will be
18:43 tgummerer so it makes sense that after committing it contains nothing other than the contents of the new commit
18:44 btree joined #git
18:44 kadoban I don't know if that always 100% matches reality, but it's pretty close. Things that might mess with expectations: 'git commit -a', 'git commit -p', maybe some kind of pre-commit filter nonsense, etc. But it's like 99.9% correct at least I think.
18:44 the_last_uchiha tgummerer : yeah exactly. I initially thought it'll literally get cleared off, so that youll have an EMPTY bucket sorta thing where youll keep things ready for next commit
18:45 kadoban Yeah, I'm not sure what it would mean for it to be cleared exactly, but yours is definitely the model I use in my mind.
18:45 jackrandom joined #git
18:45 Zombie joined #git
18:45 zealsham_ kadoban: can any one authorized push to my git server using ssh from anywhere on earth?
18:45 Zombie Does anyone know how to download a block of diffs?
18:46 kadoban zealsham_: Anyone authorized, sure.
18:46 Zombie like, I have the release version of something, but there are more patches in the master branch.
18:46 Seveas depends on what you mean with a 'block of diffs'. That's not really a term I ever heard bedore...
18:46 tgummerer kadoban: yeah, with those commands it seems a bit different.  However 'git commit -a' for example you could think of as: first put everything in the staging area, and then commit
18:47 zealsham_ kadoban:  thanks
18:47 chipotle joined #git
18:47 Seveas Zombie: if the relevant repo has a web interface that exposes diffs, such as gitweb, you could do that. But it'll be easier o just clone that repo...
18:48 Zombie its on github, so, yes.
18:49 maroloccio joined #git
18:49 kadoban tgummerer: Probably. I barely use it, so I wasn't clear 100% what it does (especially if you already have staged things)
18:51 tgummerer yeah, I never really use it either.  99% of my commits start out with 'git add -p', so I can review whatever I wrote one more time before I commit :)
18:54 dtrott joined #git
18:56 vuoto joined #git
18:57 f1nch_ joined #git
18:58 tarkus joined #git
19:00 vuoto joined #git
19:00 f1nch_ joined #git
19:01 sea-gull joined #git
19:02 Impaloo joined #git
19:02 peterbecich joined #git
19:03 h12o joined #git
19:04 f1nch_ joined #git
19:04 peterbecich joined #git
19:04 bilal joined #git
19:09 bilal joined #git
19:11 WayToDoor joined #git
19:14 MistahKurtz joined #git
19:23 h12o joined #git
19:26 pbandark joined #git
19:29 robotroll joined #git
19:30 demize joined #git
19:31 WayToDoor joined #git
19:31 roelmonnens joined #git
19:32 Introoter joined #git
19:33 tymczenko joined #git
19:35 Impaloo joined #git
19:37 TomyLobo joined #git
19:42 CEnnis91 joined #git
19:42 boombatower joined #git
19:42 nikivi how can I force push rewrite another repo
19:42 nikivi I have a repository with some code
19:42 nikivi I have a new directory that has new code but it has no git in it
19:42 nikivi I initialise git and want it to become my new 'old' git repo
19:42 nikivi overwriting everything that is there
19:43 nikivi I cant git push -u origin master as it is rejected
19:43 Gloomy joined #git
19:43 thiago you need to use -f to force
19:43 h12o joined #git
19:44 nikivi git push -u -f origin master?
19:44 nikivi or git push -f origin master
19:44 Darren_ joined #git
19:46 misosoup joined #git
19:47 irqq joined #git
19:47 govg joined #git
19:47 nikivi also it says that force git pushing is considered 'harmful'
19:48 oprypin should've been --force-with-lease by default
19:48 ahrs joined #git
19:48 demize joined #git
19:49 oprypin nikivi, you want to overwrite everything which is like the most obvious use case of force
19:49 thiago nikivi: yes, !force is harmful
19:49 gitinfo nikivi: [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push --force-with-lease`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.
19:49 nikivi git push --force origin master?
19:50 nikivi I don't mind overwriting history
19:50 oprypin yes
19:50 nikivi just want to move this folder so that it shows up on the github repo
19:50 Vampire0 joined #git
19:50 nikivi that worked, thank you
19:51 raynold joined #git
19:51 zeroed joined #git
19:54 chrisM_1 joined #git
19:55 mel00010 joined #git
19:56 navidr joined #git
19:59 h12o joined #git
20:11 Acerific joined #git
20:11 Acerific joined #git
20:13 jstein_ joined #git
20:17 SteffanW joined #git
20:17 hhee joined #git
20:18 Cabanossi joined #git
20:20 misosoup joined #git
20:24 cloudbud joined #git
20:24 Starky joined #git
20:24 cloudbud how to delete a directory from locally using git
20:25 cloudbud ##linux
20:25 YuGiOhJCJ joined #git
20:26 WayToDoor joined #git
20:26 livingstn joined #git
20:29 TbobbyZ joined #git
20:30 zeroed joined #git
20:30 thiago cloudbud: git rm -r
20:31 cloudbud not removing thiago
20:31 cloudbud tried several times
20:31 TbobbyZ joined #git
20:31 _rgn left #git
20:31 livingstn joined #git
20:33 blunaxela joined #git
20:34 thiago cloudbud: it does remove here
20:34 thiago cloudbud: you have to tell us what happened
20:36 telephone joined #git
20:36 telephone joined #git
20:38 btree left #git
20:43 cloudbud thiago : I am trying to do git add -A but its still showing the things in red
20:43 canton7 pastebin the output of 'git status'
20:45 cloudbud canton7 :https://pastebin.com/7UKqHRAd
20:45 ericnoan joined #git
20:45 canton7 are you looking at zookeeper?
20:46 Marumarsu joined #git
20:46 jimmyrcom joined #git
20:46 cloudbud modified:   zookeeper (modified content, untracked content)'
20:46 cloudbud ./marketplace-zookeeper.yml     ../staging/group_vars/zookeeper
20:47 cloudbud both these
20:47 canton7 so 'zookeeper' is a submodule. a directory which contains a .git dir, which git treats as a submodule
20:47 cloudbud what about other files
20:48 cloudbud they have not been addeed to staging area
20:48 canton7 if you want to add marketplace-zookeeper.yml, cd up a directory before doing 'git add -A' (or do 'git add -A ../', or 'git add -A :/')
20:48 canton7 or 'git add ../'
20:48 TheSimonator joined #git
20:49 bronson joined #git
20:50 cloudbud the files has been added  but now when i do git status it shows
20:50 cloudbud modified:   roles/zookeeper (modified content, untracked content)
20:50 cloudbud how to add this
20:50 cloudbud this is a directory
20:51 canton7 it's a submodule, like I said. It's a git repository, embedded in another git repository. Is that what you want, or do you just want to add the contents of 'zookeeper' to your repository?
20:51 Atm0spher1c joined #git
20:51 armyriad joined #git
20:51 cloudbud okay
20:52 cloudbud should i delete it
20:52 canton7 wait
20:52 canton7 first, answer my question, please
20:52 cloudbud i cloned zookeeper from other dir
20:52 canton7 It's a git repository, embedded in another git repository. Is that what you want, or do you just want to add the contents of 'zookeeper' to your repository?
20:52 cloudbud git repo
20:53 thiago ok, so if you want things inside zookeeper, cd to zookeeper first
20:54 canton7 do you want 'zookeeper' to be a submodule, which is a git repository embedded in your current repository. Or do you want to add the contents of the zookeeper folder to your current repository?
20:55 canton7 maybe you should read up on submodules: https://git-scm.com/book/en/v2/Git-Tools-Submodules
20:55 canton7 if you don't want it to be a submodule, and instead want to add the contents of the zookeeper folder to your repository, remove 'zookeeper/.git'
20:56 cloudbud using normal rm -rf command ?
20:56 canton7 yes, but only if that's what you want
20:58 bilal joined #git
20:58 leeN joined #git
20:59 hhee joined #git
20:59 ertesx joined #git
21:03 jaziz joined #git
21:06 NeverDie joined #git
21:09 zerow joined #git
21:09 zealsham_ am still stuck on gitolite vs gitlab
21:09 blackwell joined #git
21:09 cloudbud joined #git
21:09 zealsham_ which is easier to set up for private server acessed via ssh
21:09 dave0x6d joined #git
21:10 canton7 do you want a web-based system with PRs, issues, wikis, a CI server, web-based user setup, etc
21:10 canton7 or a simple ssh-based system where you admin users by editing a config file, with no web-based stuff, and a very simple setup
21:10 WayToDoor joined #git
21:11 cloudbud how to push from remote server A to remote branvvch B
21:11 cloudbud local branch A to remote branch B
21:11 zealsham_ i would want a web based ,free tho. dont want gitlab's paid plan
21:11 canton7 zealsham_, oh, do you want to host it yourself, or do you want someone else to host it?
21:12 zealsham_ canton7: i want to host it myself on ubuntu server
21:13 canton7 if you want something web-based, then gitolite isn't going to cut it
21:13 zealsham_ is the gitlab free plan web based
21:14 canton7 pretty sure it is - it's all web based
21:15 thiago cloudbud: to push local branch A to remote R's branch B, write: git push R A:B
21:15 cloudbud what is R here
21:15 thiago cloudbud: the remote's name
21:15 thiago cloudbud: or URL. That works too.
21:15 cloudbud how to check that name
21:15 thiago cloudbud: A can be any local ref, not just local branches
21:16 thiago cloudbud: it's the name you typed when you added the remote. To get a full listing, git remote
21:16 durham joined #git
21:19 roelmonnens joined #git
21:20 tsdev joined #git
21:24 cloudbud is that some access issue
21:24 cloudbud I cannot push to my remote repo
21:27 auv joined #git
21:29 auv joined #git
21:29 thiago cloudbud: check that you've got the correct URL
21:32 bilal joined #git
21:33 math-alpha joined #git
21:33 cloudbud how to create branch on remote git
21:34 bilal joined #git
21:40 jackrandom joined #git
21:43 Uneliasmarsu joined #git
21:44 jackrandom joined #git
21:45 math-alpha left #git
21:47 Wjoie joined #git
21:47 wcpan joined #git
21:49 misosoup joined #git
21:51 Gloomy joined #git
21:51 durham joined #git
21:51 bgamari joined #git
21:52 cloudbud i copied a directory from my desktop to local git repo after that i commited changes now my local git has the files but somehow they were not pushed to remote
21:53 kadoban cloudbud: Well, you didn't mention pushing anywhere, so that sounds expected?
21:53 MrLawrence joined #git
21:53 cloudbud now how to add the subdirectoies as well to staging area
21:53 kadoban Most likely with 'git add', did you do something like that?
21:53 cloudbud no i have pushed the changes to remote
21:53 cloudbud yes i did
21:55 kadoban What does 'git status' say? And you can also check in 'git ls-files' with various options to see what git is tracking or not and other information.
21:55 Zombie left #git
21:55 cloudbud git status says nothing to commit, working directory clean
21:57 thiago git log
21:57 thiago check thaat the commit at the top is the one that the remote has
21:59 cloudbud thiago : it shows my commit but the files inside the direcctories has not been committed
21:59 cloudbud this was a new directory
22:02 thiago ok, so it's the same commit
22:02 thiago go back to your local machine, git add one of the files that did not show up
22:02 thiago what does git add say?
22:03 Cabanossi joined #git
22:04 mostlybadfly joined #git
22:08 ciyeg joined #git
22:16 nivag joined #git
22:21 MistahKurtz joined #git
22:21 Zoxc joined #git
22:22 diogenese joined #git
22:23 boombatower joined #git
22:26 thiago cloudbud: assuming you don't need help anymore
22:29 kruvalig joined #git
22:31 kruvalig on server try to do git push origin master and get message "remote: fatal: early EOF  error: failed to push some refs to 'ssh:/" . How can i solve it"
22:32 thiago kruvalig: type the correct URL
22:32 thiago if you're pushing to a remote name, check that it has the correct URL
22:32 kruvalig url is fine, git pull origin master work
22:32 thiago fetch and push can be different URLs
22:33 thiago check with git remote -v
22:33 kruvalig it's equals
22:33 thiago so when you wrote "ssh:/", that's not what Git told you, exactly?
22:34 kruvalig no
22:34 kruvalig i short the output
22:34 thiago ok, next time, try not to obscure messages because you may be hiding the problem
22:34 thiago your remote rejected the push
22:34 thiago check why in the remote server
22:35 kruvalig there is problem remote:fatal: early EOF error
22:36 thiago yes, your remote closed the connection
22:36 thiago check why your remote did it in the remote
22:36 kruvalig how can i check it&
22:36 thiago ssh into the remote and check the logs
22:36 kruvalig ok i try it
22:37 nowhereman joined #git
22:37 askb joined #git
22:38 aax joined #git
22:38 Yirzf joined #git
22:39 StuartMI joined #git
22:40 kruvalig i use sourceforge
22:40 thiago so sourceforge closed the connection
22:40 thiago if you're sure you're using the correct credentials and URL, then it's a sourceforge problem
22:40 thiago file a support request with them
22:43 cseder joined #git
22:44 kruvalig how can i check the logs git on sourceforge, i see /home/git/p/mycite/code.git
22:45 thiago sorry, not a git question
22:45 thiago please file a support request with sourceforge
22:46 marianina8 joined #git
22:48 kruvalig git says error: pack-objects died of signal 9MiB | 3.34 MiB/s
22:48 kruvalig is it sourceforge proglem?
22:48 thiago yes
22:49 kruvalig ok, thanks
22:49 thiago wait
22:49 thiago I don't see "remote" there
22:49 thiago looks like your local pack-objects was killed.
22:49 thiago check your dmesg. See if the kernel logged the kill.
22:50 kruvalig https://pastebin.com/3BpcWyq8
22:50 thiago looks like a local error
22:50 thiago git pack-objects was killed
22:50 kruvalig [191256.361876] Out of memory in UB 3331: OOM killed process 454 (git) score 0 vm:1440620kB, rss:920756kB, swap:0kB
22:51 thiago there you go
22:52 kruvalig so i need add memory on server?
22:52 thiago yes
22:52 kruvalig ok thanks
23:03 Cabanossi joined #git
23:05 stevenspasbo joined #git
23:07 kruvalig real thanks <thiago> stop mysql and do git push. All fine
23:09 netj joined #git
23:15 njbair joined #git
23:22 dsantiago joined #git
23:26 ExeciN joined #git
23:26 stevenbenner joined #git
23:34 mSSM joined #git
23:37 mSSM I want to rebase a branch foo on master, but foo contains a commit where a file contains exactly the same addes lines except for a few.
23:37 mSSM This seems to cause some problems for rebase.
23:37 kadoban It will probably cause a conflict, but those can be resolved. !eek
23:37 gitinfo [!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
23:37 mSSM Can I rebase the branch on master and expunge that particular commit?
23:38 kadoban You can do 'rebase -i' if you want, that is quite powerful.
23:39 mSSM kadoban: Yes, that helped indeed!
23:40 mSSM Thank you
23:40 mSSM I need to remember that one.
23:40 kadoban Cool, you're welcome.
23:41 YuGiOhJCJ joined #git
23:42 diogenese joined #git
23:46 njbair joined #git
23:52 stepho joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary