Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-04

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

All times shown according to UTC.

Time Nick Message
00:01 HurricaneHarry joined #git
00:01 kbs left #git
00:04 thiago_ joined #git
00:04 eb0t joined #git
00:04 Guma joined #git
00:10 mehola joined #git
00:12 NeXTSUN joined #git
00:13 magruder85 joined #git
00:15 gugah joined #git
00:15 arand__ joined #git
00:15 WizJin joined #git
00:18 j7k6 joined #git
00:21 venmx joined #git
00:21 akkad joined #git
00:25 durham_ joined #git
00:25 cyphase joined #git
00:26 Shatnerz0 joined #git
00:27 courrier joined #git
00:30 nettoweb joined #git
00:34 clemf joined #git
00:34 Dev0n joined #git
00:36 gugah joined #git
00:37 thiago joined #git
00:37 EV3RYDAYPR0GRESS joined #git
00:38 nowhere_man joined #git
00:39 gugah joined #git
00:42 salamanderrake joined #git
00:43 ljc joined #git
00:46 hashpuppy joined #git
00:48 j7k6 joined #git
00:49 j7k6 joined #git
00:53 durham joined #git
00:56 durham joined #git
01:02 DolpheenDream joined #git
01:05 davimore joined #git
01:07 jameser joined #git
01:09 pur3eval joined #git
01:09 kexmex joined #git
01:11 whaley joined #git
01:14 Bizkit joined #git
01:16 hexagoxel joined #git
01:17 shinnya joined #git
01:18 TbobbyZ_ joined #git
01:18 Space-Duck joined #git
01:22 shgysk8zer0_ joined #git
01:22 guest___ joined #git
01:23 BackEndCoder joined #git
01:27 barteks2x joined #git
01:29 Glowball joined #git
01:31 bgerber joined #git
01:31 GodGinrai joined #git
01:32 dviola joined #git
01:32 chipotle joined #git
01:33 Glowball joined #git
01:34 jameser joined #git
01:34 DieguezZ joined #git
01:35 bgerber joined #git
01:35 gopar joined #git
01:35 Sample joined #git
01:36 elsevero joined #git
01:43 Derperperd joined #git
01:44 streetwitch joined #git
01:45 streetwitch How do I stop git?  I'm trying to upload a new repository from my cloud server.  However I screwed up somewhere and when I try to upload it to github now, it includes a bunch of junk I don't need and such
01:45 streetwitch Can anyone help?
01:45 barteks2x joined #git
01:46 GodGinrai joined #git
01:48 Hobbyboy joined #git
01:48 streetwitch Ah, I just remoted the .git directory
01:50 jameser_ joined #git
01:54 bremner !next
01:54 gitinfo Another satisfied customer. NEXT!
01:55 raijin joined #git
01:55 thiago_ joined #git
02:01 ankit01ojha joined #git
02:05 jameser joined #git
02:10 pur3eval joined #git
02:11 mehola joined #git
02:12 kadoban joined #git
02:19 j7k6_ joined #git
02:20 planigan joined #git
02:24 nowhere_man joined #git
02:26 pks joined #git
02:28 kbs joined #git
02:28 darkkal joined #git
02:31 govg joined #git
02:34 rafalcpp_ joined #git
02:35 d^sh joined #git
02:36 finalbeta joined #git
02:36 clemf joined #git
02:37 menip joined #git
02:39 pks joined #git
02:46 ansimation joined #git
02:46 rafalcpp_ joined #git
02:47 anuxivm left #git
02:52 streetwitch joined #git
02:52 streetwitch For some reason one directory in my repository won't upload to github
02:52 streetwitch Any ideas?
02:52 Shatnerz0 joined #git
02:52 raijin joined #git
02:53 streetwitch It actually appears in github, but when I click it nothing happens
02:55 durham joined #git
02:57 done joined #git
02:57 cdg joined #git
02:58 rivarun joined #git
03:00 fstd_ joined #git
03:01 hexagoxel joined #git
03:02 rchavik joined #git
03:04 ojdo joined #git
03:05 gtristan joined #git
03:05 duderonomy joined #git
03:07 fatalhalt joined #git
03:09 ronnik joined #git
03:11 fuccboi joined #git
03:12 fuccboi joined #git
03:12 rchavik_ joined #git
03:13 manlet joined #git
03:14 fish3485 joined #git
03:15 fish3485 left #git
03:15 fish3485 joined #git
03:17 Vortex34 joined #git
03:21 eroux joined #git
03:22 thebope joined #git
03:22 diogenese joined #git
03:24 robattila256 joined #git
03:25 sbulage joined #git
03:25 Emperor_Earth joined #git
03:28 diogenese joined #git
03:29 raijin joined #git
03:29 xall joined #git
03:32 masuberu joined #git
03:33 masuberu joined #git
03:33 netj joined #git
03:43 sunri5e joined #git
03:43 username_ joined #git
03:49 ljc joined #git
03:53 ertes joined #git
03:54 sargentmki joined #git
03:55 pur3eval joined #git
03:56 chachasmooth joined #git
03:56 explody joined #git
03:56 livingstn joined #git
03:57 dreiss joined #git
03:57 Sample joined #git
04:06 hexagoxel joined #git
04:07 Derperperd joined #git
04:16 orbyt_ joined #git
04:17 offtopik left #git
04:19 j7k6_ joined #git
04:20 dsantiago joined #git
04:20 netj joined #git
04:22 clemf joined #git
04:27 Mowgli joined #git
04:28 mehola joined #git
04:28 ahr3n joined #git
04:29 Nugget joined #git
04:30 safe joined #git
04:30 a_thakur joined #git
04:31 xbob joined #git
04:31 d0nn1e joined #git
04:32 robattila256 joined #git
04:33 justanotheruser joined #git
04:34 clemf joined #git
04:45 akkad joined #git
04:48 lucido-cl joined #git
04:49 venmx joined #git
04:50 gelei007 joined #git
04:51 git_learner__ joined #git
04:53 git_learner joined #git
04:57 Cabanoss- joined #git
04:58 pur3eval joined #git
04:59 pur3eval joined #git
04:59 Goplat joined #git
05:01 ayogi joined #git
05:03 nowhere_man joined #git
05:03 prg3 joined #git
05:04 amrits joined #git
05:08 diogenese joined #git
05:11 thebope joined #git
05:11 Nugget joined #git
05:12 _W_ joined #git
05:15 cdg joined #git
05:21 akkad joined #git
05:21 jeffreylevesque joined #git
05:25 rivarun joined #git
05:25 chipotle joined #git
05:28 ahr3n joined #git
05:28 nydel07 joined #git
05:28 pks joined #git
05:28 hexagoxel joined #git
05:31 iasj joined #git
05:32 iasj left #git
05:34 mizu_no_oto joined #git
05:37 MattMaker joined #git
05:43 Derperperd joined #git
05:48 Phylock joined #git
05:49 humboldt joined #git
05:51 pickfire joined #git
05:53 sword joined #git
06:02 hexagoxel joined #git
06:02 t-mart joined #git
06:06 nydel07 joined #git
06:06 matt_m joined #git
06:09 kasual joined #git
06:09 netj joined #git
06:10 akkad joined #git
06:11 Takumo joined #git
06:11 Takumo joined #git
06:12 moei joined #git
06:14 denisMone joined #git
06:20 j7k6_ joined #git
06:23 bocaneri joined #git
06:24 rivarun joined #git
06:24 Silenced joined #git
06:27 robattila256 joined #git
06:30 dsdeiz joined #git
06:30 bocaneri joined #git
06:31 bgerber joined #git
06:36 Murii_ joined #git
06:38 rivarun joined #git
06:41 hexagoxel joined #git
06:42 Derperperd joined #git
06:48 dsdeiz joined #git
06:48 DaYwalKer joined #git
06:49 rivarun joined #git
06:51 cqi joined #git
06:52 DaYwalKer joined #git
06:53 pur3eval joined #git
07:03 pks joined #git
07:07 jas4711 joined #git
07:09 SwiftMatt joined #git
07:10 vuoto joined #git
07:11 Silenced joined #git
07:17 Oatmeal joined #git
07:18 _ikke_ You better contact github for that
07:20 cdown joined #git
07:24 lowercaseman joined #git
07:26 jason237 joined #git
07:27 Silenced joined #git
07:27 a_thakur joined #git
07:30 watabou joined #git
07:30 j7k6_ joined #git
07:31 MattMake_ joined #git
07:31 clickjack joined #git
07:39 kexmex joined #git
07:40 thebird joined #git
07:44 lowercaseman joined #git
07:48 thebird joined #git
07:48 khfeng joined #git
07:49 brent__ joined #git
07:51 sarri joined #git
07:51 sarri joined #git
07:51 Whiskey joined #git
07:53 thebope joined #git
07:53 Learath2 joined #git
07:55 SteffanW joined #git
07:55 cdown joined #git
07:56 nilg joined #git
07:57 jozwior joined #git
07:57 radoslavcap joined #git
07:59 Nilesh_ joined #git
08:06 orbyt_ joined #git
08:09 a_thakur joined #git
08:09 chachasmooth joined #git
08:11 dreiss joined #git
08:13 jozwior joined #git
08:14 gtristan joined #git
08:17 pks joined #git
08:20 Mowgli joined #git
08:20 TomyLobo joined #git
08:22 wrouesnel joined #git
08:24 hexagoxel joined #git
08:28 chachasmooth joined #git
08:29 xall joined #git
08:32 SteffanW joined #git
08:32 radoslavcap joined #git
08:35 robotroll joined #git
08:36 bakibour joined #git
08:36 bakibour left #git
08:36 bourbaki joined #git
08:36 bourbaki Hidiho
08:38 bourbaki I would like to know all branches that a certain file is in on the server.
08:38 bourbaki How would i go about to do that?
08:39 bashcode1 joined #git
08:43 chachasmooth joined #git
08:45 bourbaki Can i list files from remote branches?
08:45 xbob joined #git
08:47 goTAN joined #git
08:47 thebope joined #git
08:47 hexagoxel joined #git
08:53 s1scha joined #git
09:00 Karazhan joined #git
09:03 TbobbyZ joined #git
09:03 TbobbyZ joined #git
09:08 Cymew joined #git
09:09 cyphase joined #git
09:09 theoceaniscool joined #git
09:10 cyphase joined #git
09:12 pks joined #git
09:14 osse bourbaki: use ls-tree
09:15 hexagoxel joined #git
09:17 radoslavcap joined #git
09:23 jozwior_ joined #git
09:29 xall joined #git
09:30 radoslavcap joined #git
09:35 romdum joined #git
09:36 goTAN joined #git
09:38 beastd joined #git
09:39 beastd left #git
09:41 hhee joined #git
09:47 lucido-cl joined #git
09:53 afuentes joined #git
09:54 TbobbyZ joined #git
09:54 [Brain] joined #git
09:56 Cassiopaya joined #git
09:58 cqi joined #git
10:04 hexagoxel joined #git
10:04 rossome joined #git
10:05 brent__ joined #git
10:06 mda1 joined #git
10:07 cdown joined #git
10:11 marenz__ joined #git
10:14 DaYwalKer joined #git
10:15 theoceaniscool joined #git
10:16 alzagros joined #git
10:20 m4sk1n joined #git
10:26 aielima joined #git
10:31 cdown joined #git
10:36 cyphase joined #git
10:44 imack joined #git
10:45 rivarun joined #git
10:45 elsevero joined #git
10:53 courrier joined #git
11:00 Sound joined #git
11:07 dreiss joined #git
11:07 cdown_ joined #git
11:12 gajop joined #git
11:13 sunri5e joined #git
11:13 bruce_lee joined #git
11:13 bruce_lee joined #git
11:15 m0viefreak joined #git
11:19 Jackneill_ joined #git
11:20 raijin joined #git
11:23 raynold joined #git
11:25 sonOfRa joined #git
11:29 thebope joined #git
11:35 dersand joined #git
11:36 eatsfoobars joined #git
11:36 masuberu joined #git
11:36 radoslavcap joined #git
11:38 JanC_ joined #git
11:39 JohnA joined #git
11:39 gajop although it's a #github issue, i figure i should ask here as well; any idea how to ignore certain files when doing pull requests? (http://stackoverflow.com/questions/42593395/github-ignore-downstream-configuration-files-in-pull-requests)
11:41 eatsfoobars joined #git
11:41 leeN joined #git
11:41 whaley joined #git
11:41 venmx joined #git
11:41 nedbat gajop: you might find it easier to move those files out of the repo
11:41 gajop i need them in the repo
11:42 gajop and they should be different
11:42 nedbat gajop: why do they have to be in that repo?
11:43 gajop the repositories are used for packaging and some other reasons
11:45 dhollinger joined #git
11:48 a_thakur joined #git
11:54 Mowgli joined #git
11:56 satifant joined #git
12:01 ankit01ojha joined #git
12:01 ronny hi
12:02 ronny anyone aware of tools that help to sync git worktrees directly between 2 computers whenever possible without encurring ugly history, i work on a laptop and a desktop, and keeping track of syncing is quite a pain
12:06 brent__ joined #git
12:06 bremner I just force push to to a central repo
12:07 bremner I guess there's some potential for footgun, but it's worked so foar.
12:07 misosoup joined #git
12:08 ronny bremner: puch is not the issue i have, sync as i switchb etween the coputers it is, and in particular i want to avoid my own human error (because humans are big on erroring)
12:08 bremner I'm saying I use a central git repo to sync between a laptop and a desktop
12:08 misosoup I want to search a my repo for commits that have affected (add/change/delete) more than a certain number of files. Is there a way to do this?
12:08 bremner that requires keeping things checked in. which is a good idea anyway, IMHO
12:09 ronny bbl, rl call
12:09 Groscheri joined #git
12:16 muhannad joined #git
12:21 manuelschneid3r joined #git
12:22 cdown_ joined #git
12:24 ispn joined #git
12:26 Tobbi joined #git
12:27 amosbird joined #git
12:29 sbasso joined #git
12:32 nettoweb joined #git
12:36 lucido-cl joined #git
12:36 cdg joined #git
12:37 Silenced joined #git
12:39 GT4066 joined #git
12:42 VicMackey joined #git
12:49 DieguezZ joined #git
12:49 Dazzyp joined #git
12:50 brent__ joined #git
12:53 overlord_tm joined #git
12:53 sunri5e joined #git
12:54 VicMackey Hello everybody. I have a question about upstreams and branches. I want to fork a repository I like -a Jekyll theme- and keep receiving updates while I add content to it. How do I achieve this? I thought about creating an empty git repo, moving all the files, adding an upstream and creating a branch for my -personal modifications- while I keep pulling changes in the master branch to keep receiving updates from the theme. Does this make sense?
12:56 ronny re
12:56 nettoweb joined #git
12:56 ronny bremner: yes, i want to keep checked in things in sync
12:56 ronny but i bascially have 2 models - one is backupy/history aware and just needs to ensure very regualr pulls/pushes while disallowing rebase
12:57 ronny the other one is pushing work in progress stuff between the 2 computers i work on without causing a pain
12:57 govg joined #git
12:58 venmx joined #git
12:58 eatsfoobars joined #git
13:06 jimi_ joined #git
13:07 muhannad_______ joined #git
13:07 a_thakur joined #git
13:12 hvxgr joined #git
13:13 Oatmeal joined #git
13:14 killer-bunny joined #git
13:15 paramourne joined #git
13:16 VicMackey Anyone please? :)
13:16 rominronin joined #git
13:17 osse VicMackey: you can pull from the upstream master branch regularly
13:17 osse or rebase your changes on top regularly
13:17 osse creating an "empty" branch doesn't make much sense
13:18 thebope joined #git
13:24 VicMackey Thank you for answering osse. So you mean I could have only a master branch and commit there, and pull regularly?
13:25 VicMackey Wouldn't be better have two branches? Like "jekyll-theme-upstream" and "master", and keep pulling changes in the "j-t-u" branch?
13:25 VicMackey I am fairly new to git, sorry if this questions sound dumb
13:26 VicMackey these*
13:28 gtristan joined #git
13:29 clickjack joined #git
13:32 whaley joined #git
13:34 jfab joined #git
13:35 plos joined #git
13:37 masuberu joined #git
13:37 misosoup This is a genuine question related to a project I am working on. What are the things you hate most about Git or feel need improvement?
13:38 pks joined #git
13:38 bremner I hate that people feel the need to hate a piece of software
13:39 muhannad_______ joined #git
13:42 warthog9 joined #git
13:42 GeorgeJetston joined #git
13:43 matt_m joined #git
13:43 GeorgeJetston Hello for some reason, a `git clone` command works fine on github, but for the same key installed on bitbucket and gitlab, I get an ssh_askpass error -  http://pastebin.com/raw/myUyFi4L
13:44 eroux joined #git
13:47 GeorgeJetston joined #git
13:49 chipotle joined #git
13:50 moritz GeorgeJetston: it seems to be a problem with your ssh installation
13:51 moritz but the fact that it tries to call ssh_askpass likely means the servers didn't accept your ssh key
13:51 Shatnerz0 joined #git
13:51 bremner GeorgeJetston: are you maybe using https:// urls with github?
13:51 moritz (assuming it's in the ssh agent; ssh-agent -l to verify)
13:51 GeorgeJetston bremner: they are ssh URLS - http://metaperl.org/hacking/git-clone-works-on-github-but-not-gitlab-or-bitbucket
13:52 bremner huh. strange.
13:52 GeorgeJetston moritz: I dont know what complete ssh-agent -l command you want me to run
13:52 grawity that is the complete command though
13:52 GeorgeJetston moritz: the key was initially installed on github. I just copies the same .ssh/id_rsa.pub contents to bitbucket and gitlab today
13:53 ianmethyst joined #git
13:53 GeorgeJetston -l is an unknown option on msys2
13:53 grawity what.
13:53 grawity ...oh right
13:53 GeorgeJetston grawity: ssh-agent -l does not work on msys2
13:53 grawity that's supposed to be ssh-add -l, isn't it.
13:54 GeorgeJetston `ssh-add -l` yields """Could not open a connection to your authentication agent."""
13:54 bjarki left #git
13:55 GeorgeJetston ok
13:55 moritz ok, fix your SSH installation
13:55 GeorgeJetston the way to start ssh-agent is:   eval `ssh-agent -s`
13:56 GeorgeJetston then you type ssh-add -l and I get "The agent has no identities"
13:56 himmAllRight joined #git
13:56 moritz at some point, ssh will have to ask you for a password, even if it's the key's password
13:56 moritz the typical next step is 'ssh-add' (without arguments)
13:56 grawity fix? there's nothing to "fix"; SSH installation does not require having an agent...
13:57 moritz grawity: but ssh-askpass not being available is a problem, no?
13:57 moritz http://pastebin.com/raw/myUyFi4L
13:58 grawity on msys specifically? I dunno, maybe things like tortoisegit bring it
13:58 grawity but otherwise it's rare to have ssh-askpass installed
13:58 GeorgeJetston `ssh-add` with no arguments worked fine: """Identity added: /home/supreme/.ssh/id_rsa (/home/supreme/.ssh/id_rsa)"""
13:58 venmx joined #git
13:59 grawity though, I wonder why that `git clone` doesn't just show the prompt on the terminal directly.
13:59 GeorgeJetston the key was made with no passphrase
13:59 clickjack joined #git
13:59 grawity it's got nothing to do with your key, anyway
13:59 grawity that pastebin shows, "Host key verification failed."
13:59 grawity it's trying to ask you to confirm the *server's* key
14:00 grawity can you run `ssh git@gitlab.com` directly?
14:02 nd_ joined #git
14:03 moritz but why would even try to call ssh-askpass if the server's key can't be validated?
14:03 moritz somehow this all looks very fishy to me
14:03 grawity because it's msys and tty emulation is probably broken and it's business as usual
14:04 moritz :(
14:05 grawity so if the git-spawned ssh process can't get at a tty, it runs ssh-askpass
14:05 grawity for both hostkey confirmation and passphrase prompts, yes
14:09 raijin joined #git
14:13 stoopkid joined #git
14:14 cqi joined #git
14:14 eroux joined #git
14:14 osse VicMackey: with master being your own?
14:14 VicMackey Yes
14:15 osse VicMackey: sure, but eventually you want to combine your changes with the upstream changes, right?
14:15 VicMackey osse right
14:15 osse VicMackey: i suggest to do that you merge their branch into yours
14:16 osse what you call them is up to you. to me it makes sense to simply use master and upstream/master
14:16 osse (pull does fetch + merge)
14:16 clickjack joined #git
14:17 explody joined #git
14:19 streetwitch joined #git
14:20 streetwitch Is there a way to upload absolutely everything in a directory to github?  Git keeps skipping some of my directories!
14:20 VicMackey osse I think I understand what you suggest me. So, the idea is to have two branches: master -the one in which we will work- and upstream/master -the one receiving regular pulls-. Then regularly merge the branches so our master branch is up to date with the "original project", so to say.
14:21 VicMackey osse is this what you suggested?
14:21 grawity streetwitch: git doesn't upload files; it uploads commits
14:21 grawity streetwitch: therefore make sure you have actually added/committed those files
14:22 msm joined #git
14:22 Eugene joined #git
14:22 DrForr joined #git
14:22 osse VicMackey: almost. i suggest you add the upstream repo as a remote named 'upstream'. After each fetch (do this as often as you like), upstream/master will be *identical* to the upstream master branch. Then you merge upstream master into master when you're ready to integrate upstream changes into your own (once a week, or once a month or whatever makes sense)
14:23 SegFaultAX joined #git
14:23 atrus joined #git
14:23 streetwitch grawity, I did!
14:23 grawity streetwitch: do they show up in `git ls-tree -r`?
14:23 streetwitch I'll check
14:25 streetwitch git ls-tree -r
14:25 streetwitch ?
14:25 streetwitch It doesn't seem to do anything
14:25 osse git ls-tree -r HEAD
14:25 streetwitch OK
14:25 streetwitch That gave me a bunch of stuff
14:25 streetwitch What am I looking for?
14:25 grawity your missing files, of course
14:26 grawity maybe a commit ID instead of 'HEAD' would be better
14:26 grawity because there are only two options:
14:26 grawity a) you didn't commit those files, or
14:26 grawity b) you're seeing a different commit entirely on Github
14:28 streetwitch Ok I'm going to create a fresh repo
14:28 grawity giving up easily, are you...
14:29 osse a fresh repo definitely doesn't have your files in it :p
14:29 kpease joined #git
14:29 osse methinks your .gitignore ignores more than you want
14:30 streetwitch Ok
14:30 streetwitch How do I check for that?
14:30 clickjack joined #git
14:30 VicMackey osse I read your answer several times, and I think I finally understood it. Thank you very much indeed. I will try it with a private repo in order to see if I got the concepts right. Thank you again for your time and help :)
14:30 osse streetwitch: git check-ignore -v a/file/you/think/should/be/there
14:30 grawity ... so did you check the ls-tree output or not
14:31 grawity do I have to say 'please'
14:31 osse VicMackey: i read my answer too and barely understood it. it gets confusing because do i mean upstream the remote, or upstream as the general concept of something upstream? :P
14:32 streetwitch grawity, I checked it
14:32 vtols joined #git
14:32 streetwitch I'm getting a strange error now, trying to upload to a new repo
14:32 osse VicMackey: but the point is that to combined your and their changes you eventually have to merge one branch into another. you can't just have your branch and their branch and they never interact
14:32 VicMackey osse lol I was checking the git scm docs -branching section- in order to slowly understand yours.
14:33 VicMackey osse Yeah that was the idea: from time to time get their updates and integrate them in my bloggy :)
14:33 streetwitch osse & grawity:  Is there anyway I can wipe out all of the git information in this directory?
14:33 streetwitch so I can start from scratch?
14:33 osse rm -r .git
14:33 VicMackey osse Again, thank you :)
14:33 osse de nada
14:34 VicMackey osse lol are you spanish too?
14:34 osse i need to watch the last season. never did. i think i have to start over since it's been a while
14:34 osse no, i'm not
14:34 VicMackey Oh
14:34 osse sometimes i write de (nada|rien) for teh lulz. i'm not french either :p
14:34 Klumben joined #git
14:34 MindfulMonk joined #git
14:35 VicMackey osse Ooooh right hahahaa
14:35 Noldorin joined #git
14:35 osse and sometimes I write something 18+
14:35 myhau joined #git
14:36 streetwitch YES!
14:36 zivester joined #git
14:36 streetwitch Thanks you osse!!
14:36 VicMackey C'mon, say it osse. Say de rien
14:36 VicMackey I wanna see it
14:36 VicMackey lol
14:36 osse streetwitch: de rien
14:37 vtols Sorry, it seems that I have broken one of the threads in mailing list.What is the correct way to send replies to avoid this? Never used mailing lists before
14:37 a_thakur joined #git
14:37 VicMackey rofl
14:38 osse vtols: you have use the "In-Reply-To:" header
14:40 streetwitch osse:  I'm trying 'rm -r .git' on my root directory, and it seems like it froze.  What should I do?
14:40 DolpheenDream joined #git
14:40 ReptilianBrain joined #git
14:40 osse press ^C immediately. something's wrong
14:40 osse maybe
14:40 osse or it just takes a while because the repo is huge
14:41 streetwitch o it finished:
14:41 streetwitch rm -r .git
14:41 streetwitch rm: cannot remove '.git': No such file or directory
14:41 streetwitch So that seems okay
14:46 hasc joined #git
14:48 nowhere_man joined #git
14:48 ayogi joined #git
14:48 GeorgeJetston moritz and grawity: I figured it out. If I run the `git clone` command from a plain msys2 terminal, it is fine. The problems I was reporting was when running with an Emacs shell. Still odd that bitbucket and gitlab failed within an Emacs shell while github did not.
14:49 grawity it's not odd at all
14:49 CussBot joined #git
14:49 grawity you had gitlab's keys in known_hosts, you didn't have github's keys there
14:50 SuprDewd joined #git
14:51 gugah joined #git
14:54 swords joined #git
14:59 venmx joined #git
15:00 ShapeShifter499 joined #git
15:02 Bigbootyjudy joined #git
15:04 matoro joined #git
15:05 xbob joined #git
15:06 thebope joined #git
15:07 clickjack joined #git
15:07 streetwitch How do I 'git add .' ?
15:07 streetwitch I was trying to include a diriectory and everything inside it
15:08 VicMackey streetwitch 'git add directoryName'
15:08 VicMackey Is that what you are looking for?
15:10 streetwitch I'll try
15:12 DieguezZ joined #git
15:14 NeXTSUN joined #git
15:16 masuberu joined #git
15:17 dsdeiz joined #git
15:17 dsdeiz joined #git
15:22 ahr3n joined #git
15:25 EV3RYDAYPR0GRESS joined #git
15:26 Guma joined #git
15:28 m4sk1n left #git
15:30 streetwitch I have everything installed and running on my cloud server.  I uploaded everything to github.  Then I downloaded everything locally, but it doesn't work
15:31 streetwitch Any ideas what I should check for that I'm doing wrong?
15:32 ToxicFrog "doesn't work" how?
15:32 ToxicFrog Be specific.
15:32 publio joined #git
15:32 watabou joined #git
15:33 streetwitch ok
15:33 streetwitch hold on
15:34 muhannad joined #git
15:34 streetwitch I'm not sure
15:34 streetwitch but the server wont start
15:34 blackwind_123 joined #git
15:35 ToxicFrog Ok, so, things to check:
15:35 ToxicFrog - all dependencies installed?
15:35 Bizkit joined #git
15:35 ToxicFrog - everything you need committed to git on the server where it is working?
15:35 thiago joined #git
15:35 ToxicFrog - checked out the correct commit/branch locally?
15:38 pentoo joined #git
15:40 metalraiden34 joined #git
15:43 venmx joined #git
15:43 Doow joined #git
15:47 VicMackey osse what I didn't realize about, was that if you modify a file and afterwards its updated in the upstream repository, it overwrites your master repo's file.
15:47 osse VicMackey: it doesn't
15:47 osse merge means merge, not overwrite
15:48 VicMackey Right... Maybe I screwed up with my local tests
15:48 VicMackey Maybe no. Surely.
15:48 zeroed joined #git
15:48 zeroed joined #git
15:49 navidr joined #git
15:55 thiago_ joined #git
15:55 thiago_ joined #git
15:57 alip joined #git
15:57 gugah joined #git
15:58 prg3 joined #git
16:00 chandu20 joined #git
16:01 plexigras joined #git
16:02 plexigras i want to bring a branch up to master but ignore a commit i made on master
16:02 grawity ignore as in
16:02 grawity throw it away completely?
16:02 plexigras jup
16:03 grawity then just `git reset --hard` to the branch you want
16:03 plexigras just skip it
16:03 metalraiden34 joined #git
16:03 grawity although, no
16:03 grawity that's not it
16:03 plexigras nah i still want it to be in master
16:03 grawity hrmm, in that case 1) merge master, 2) revert that specific commit in your branch
16:04 plexigras oh o revert is a thing i didnt know about
16:07 YuGiOhJCJ joined #git
16:07 plexigras thanks grawity looks like it worked :D
16:09 metalraiden34 joined #git
16:09 nettoweb joined #git
16:10 mda1 joined #git
16:11 whaley joined #git
16:12 metalraiden34 joined #git
16:13 clickjack joined #git
16:15 goTAN joined #git
16:22 madewokherd joined #git
16:25 kbs joined #git
16:25 dendazen joined #git
16:26 mda1 joined #git
16:29 bgerber joined #git
16:30 rewt plexigras, you'll have to be careful when merging that branch back to master... git will think you want to remove those changes and they'll be gone from master as well at that point
16:30 Pieter joined #git
16:30 Emperor_Earth joined #git
16:30 kasual joined #git
16:31 plexigras rewt, i know and in that case its exactly what i want :)
16:32 beatdown joined #git
16:33 usama_ joined #git
16:33 usama_ left #git
16:33 King_Hual joined #git
16:33 King_Hual joined #git
16:34 whaley joined #git
16:34 Guest86903 left #git
16:35 safe joined #git
16:37 kbs left #git
16:41 clickjack joined #git
16:46 koala_man left #git
16:46 rapidshot64 joined #git
16:48 kexmex joined #git
16:50 kbs_test joined #git
16:52 kbs joined #git
16:53 whaley joined #git
16:54 thebope joined #git
16:54 venmx joined #git
16:55 nettoweb joined #git
16:57 sweatsuit joined #git
16:57 sbasso_ joined #git
17:00 overlord_tm joined #git
17:00 DolpheenDream joined #git
17:01 shgysk8zer0_ joined #git
17:01 davimore joined #git
17:03 nettoweb1 joined #git
17:04 manuelschneid3r joined #git
17:05 dsdeiz joined #git
17:06 oskarkv joined #git
17:08 _Vi joined #git
17:10 clemf joined #git
17:12 clickjack joined #git
17:12 multi_io joined #git
17:13 nyuszika7h joined #git
17:13 tojo joined #git
17:14 Guest24530 joined #git
17:14 nyuszika7h joined #git
17:19 lmatteis joined #git
17:21 metalraiden34 joined #git
17:25 Jellyg00se joined #git
17:27 gugah joined #git
17:27 orbyt_ joined #git
17:28 TbobbyZ joined #git
17:33 zeroed joined #git
17:33 TbobbyZ joined #git
17:36 metalraiden34 joined #git
17:36 TbobbyZ_ joined #git
17:36 nettoweb joined #git
17:42 _Vi joined #git
17:43 andai joined #git
17:45 BlackMaria joined #git
17:46 matoro joined #git
17:48 thebope joined #git
17:53 Emperor_Earth joined #git
17:54 ertesx joined #git
17:56 myhau joined #git
17:57 re1 joined #git
17:57 Gustavo6046 joined #git
17:57 venmx joined #git
17:58 re1 joined #git
17:58 lucido-cl joined #git
17:59 re1 joined #git
18:00 Emperor_Earth joined #git
18:02 TbobbyZ joined #git
18:03 plasticfish joined #git
18:04 TbobbyZ_ joined #git
18:04 diogenese joined #git
18:05 plasticfish hi, I already have a directory with files, and I've done a git init, what commands do I use to push it to github, I didn't create a repository on github
18:05 Emperor_Earth joined #git
18:06 plasticfish Is it possible to create a repository in github on the command line?
18:07 AndChat77184 joined #git
18:07 jason237 joined #git
18:08 sonOfRa https://github.com/github/hub hub might do that. Otherwise, probably no.
18:08 sonOfRa Yep, hub seems to be capable of doing that
18:10 plasticfish I heard something about git remote
18:10 plasticfish but I've never used git remote
18:11 Emperor_Earth_ joined #git
18:11 TbobbyZ joined #git
18:12 davimore joined #git
18:13 nettoweb joined #git
18:14 livingstn joined #git
18:14 venmx joined #git
18:16 TbobbyZ_ joined #git
18:16 Emperor_Earth_ joined #git
18:17 plasticfish anyone?
18:18 AndChat77184 joined #git
18:19 _ikke_ plasticfish: git remote add <name> <url>
18:19 menip joined #git
18:20 AndChat77184 left #git
18:20 noctux joined #git
18:22 d0nn1e joined #git
18:22 TbobbyZ joined #git
18:24 xanadu_ joined #git
18:24 plasticfish I think I've managed to do it by myself, thanks
18:25 btree joined #git
18:25 stfn joined #git
18:25 Emperor_Earth joined #git
18:26 plasticfish _ikke thank you. I just put the url, what does the <name> stands for? my username?
18:27 grawity the remote's name
18:27 grawity and since remotes are essentially bookmarks for those URLs
18:27 grawity you can call it 'github' or 'origin' or 'upstream' or such
18:27 Shatnerz0 joined #git
18:27 jnavila joined #git
18:28 Emperor_Earth__ joined #git
18:29 gtristan joined #git
18:30 luis_ joined #git
18:30 Learath2 joined #git
18:34 Emperor_Earth_ joined #git
18:37 sbasso joined #git
18:42 PioneerAxon joined #git
18:43 Emperor_Earth joined #git
18:43 marc_v92 joined #git
18:45 Emperor_Earth_ joined #git
18:45 PioneerAxon joined #git
18:47 zeroed joined #git
18:47 zeroed joined #git
18:48 radoslavcap joined #git
18:49 TbobbyZ joined #git
18:50 ryxxed joined #git
18:51 explody joined #git
18:55 Emperor_Earth joined #git
18:58 TbobbyZ joined #git
19:00 thiago joined #git
19:00 Gustavo6046 joined #git
19:04 pur3eval joined #git
19:04 nadley joined #git
19:06 sbasso_ joined #git
19:07 jnavila joined #git
19:08 metalraiden34 joined #git
19:09 jasonplows joined #git
19:09 Hobbyboy joined #git
19:10 anuxivm joined #git
19:10 joki joined #git
19:10 barteks2x joined #git
19:11 MrcRjs joined #git
19:17 oleksiyp joined #git
19:17 TbobbyZ joined #git
19:18 _Vi joined #git
19:18 TbobbyZ_ joined #git
19:20 XenophonF joined #git
19:20 TbobbyZ_ joined #git
19:21 dreiss joined #git
19:21 TbobbyZ__ joined #git
19:24 misosoup joined #git
19:25 raynold joined #git
19:25 govg joined #git
19:25 svm_invictvs joined #git
19:26 SwiftMatt joined #git
19:26 Tobbi joined #git
19:32 TbobbyZ joined #git
19:33 TbobbyZ_ joined #git
19:33 finalbeta joined #git
19:34 MattMaker joined #git
19:35 TbobbyZ_ joined #git
19:36 plexigras joined #git
19:36 courrier joined #git
19:36 zeroed joined #git
19:36 aielima joined #git
19:36 thebope joined #git
19:36 shgysk8zer0_ joined #git
19:39 ChadTaljaardt joined #git
19:40 finalbeta joined #git
19:41 eijk joined #git
19:46 Anja joined #git
19:47 magruder85 joined #git
19:48 TbobbyZ joined #git
19:49 TbobbyZ joined #git
19:51 myhau joined #git
19:52 robotroll joined #git
19:56 thebope joined #git
19:57 ahrs joined #git
19:58 Maxdaman1us joined #git
20:00 myhau joined #git
20:01 clemf joined #git
20:05 lyxus joined #git
20:07 sz0 joined #git
20:10 th_ joined #git
20:11 Guma joined #git
20:14 btree left #git
20:16 clemf joined #git
20:18 clemf joined #git
20:20 clemf joined #git
20:22 scoobert1on joined #git
20:24 metalraiden34 joined #git
20:26 clickjack joined #git
20:31 uranellus joined #git
20:31 uranellus joined #git
20:32 clemf joined #git
20:33 clemf joined #git
20:36 clemf joined #git
20:40 apotry joined #git
20:41 whaley joined #git
20:42 joshszep joined #git
20:44 clemf joined #git
20:46 metalraiden34 joined #git
20:48 svm_invictvs joined #git
20:50 MineCoins joined #git
20:53 Sample joined #git
20:57 finalbeta joined #git
20:59 lyxus joined #git
20:59 Tobbi joined #git
21:00 darkkal joined #git
21:03 rivarun joined #git
21:04 MACscr_ joined #git
21:04 staafl_ joined #git
21:04 cdg_ joined #git
21:04 misosoup2 joined #git
21:06 lu_zero_ joined #git
21:06 lu_zero_ joined #git
21:06 Tobbi_ joined #git
21:06 alip_ joined #git
21:07 Jonathel joined #git
21:07 raatiniemi_ joined #git
21:07 Guma_ joined #git
21:07 plasticb1y joined #git
21:07 HurricaneHarry_ joined #git
21:07 sweatsuit_ joined #git
21:08 Kuukunen- joined #git
21:08 PaulePan1er joined #git
21:08 bejeb_ joined #git
21:08 roxlu_ joined #git
21:08 tonyj_ joined #git
21:09 leonarth_ joined #git
21:09 ahrs joined #git
21:09 tvw joined #git
21:09 WebDawg joined #git
21:11 malt3_ joined #git
21:12 cwre_ joined #git
21:12 ryxxed_ joined #git
21:13 cjbrambo joined #git
21:13 tuor__ joined #git
21:13 pdgwien joined #git
21:13 segfaulthunter joined #git
21:13 jackneill__ joined #git
21:14 ngladitz_ joined #git
21:14 quite joined #git
21:14 ToxicFrog joined #git
21:15 TbobbyZ joined #git
21:15 asd5a joined #git
21:15 TbobbyZ joined #git
21:15 metachr0n joined #git
21:15 anonnumberanon joined #git
21:16 justanotheruser joined #git
21:16 johnnyfive joined #git
21:16 fuzzybear3965 joined #git
21:16 cliluw joined #git
21:16 Zeedox joined #git
21:17 cdg joined #git
21:18 y_sekino joined #git
21:18 Ferris____ joined #git
21:18 bluepixel joined #git
21:18 overlord_tm joined #git
21:18 Karazhan joined #git
21:18 nadley joined #git
21:18 7JTAAPRX0 joined #git
21:18 publio joined #git
21:18 ahr3n joined #git
21:18 cyphase joined #git
21:18 khfeng joined #git
21:18 Vortex34 joined #git
21:18 ojdo joined #git
21:18 jstimm joined #git
21:18 nellicus_ joined #git
21:18 andschwa joined #git
21:18 mand0 joined #git
21:18 phy1729 joined #git
21:18 nivag joined #git
21:18 elisa871 joined #git
21:18 MillerBoss joined #git
21:18 chitopunk joined #git
21:18 tinanoo joined #git
21:18 mattcen joined #git
21:18 olbat joined #git
21:18 enkrypt joined #git
21:18 _Patrick_ joined #git
21:18 sbeller joined #git
21:18 glnz joined #git
21:18 strugee joined #git
21:18 Phanes joined #git
21:18 evie_hammond joined #git
21:18 skalpin joined #git
21:18 jorj joined #git
21:18 zeph joined #git
21:18 __main__ joined #git
21:18 hfp joined #git
21:18 Mixologic joined #git
21:19 overlord_tm joined #git
21:19 Dev0n joined #git
21:19 Karazhan joined #git
21:22 nikow joined #git
21:22 SCHAAP137 joined #git
21:23 sbeller joined #git
21:24 nikow joined #git
21:24 michael_mbp joined #git
21:26 Levex joined #git
21:30 rdz joined #git
21:30 ChiLL_SurF joined #git
21:30 durham joined #git
21:31 durham joined #git
21:33 sbasso joined #git
21:35 jesk joined #git
21:36 rdz Hey all. I once started my personal fork of a software that I downloaded as zip (upstream was using svn back then). now the original software is not maintained any more but is made available as git repo (converted from svn). Now that i am the only one interested in maintaining it, i'd like to keep the whole history. i am having troubles though in applying my own history ontop of the original repo
21:37 rdz i did identify the commit where my fork started, though, but was unable to rebase onto that
21:38 Atm0spher1c joined #git
21:39 miczac joined #git
21:39 BlackMaria joined #git
21:41 _ikke_ rdz: man git replace (--graft)
21:41 gitinfo rdz: the git-replace manpage is available at http://jk.gs/git-replace.html
21:41 l4v2 joined #git
21:42 pur3eval joined #git
21:42 rdz _ikke_, thanks, i'll look into it
21:42 PerlJam joined #git
21:43 reborn joined #git
21:45 rdz _ikke_, i have troubles understanding what git replace is about
21:45 rdz why are you suggesting it?
21:46 mehola joined #git
21:46 rdz i thought that would be a job for git rebase
21:47 rdz ah --graft
21:47 dviola joined #git
21:47 wcpan joined #git
21:47 rdz i think i understand... thanks
21:48 manuelschneid3r joined #git
21:49 _ikke_ right
21:49 _ikke_ rebase tries to find a common base, but in your case, there is none
21:49 _ikke_ so there is no 3-way merge possible, so you get lots of conflicts
21:51 rdz so i can pick any commit as parent to my init commit, it seems...
21:52 rdz _ikke_, nice! many thanks
21:52 bluepixel joined #git
21:52 _ikke_ correct
21:52 Goplat joined #git
21:53 _ikke_ rdz: Note that you will have to do a filter-branch over this to make it permanent
21:54 * rdz doesn't know yet what a filter-branch is, but will look it up
21:54 rdz thanks
21:55 sbasso joined #git
21:59 _Vi joined #git
22:01 StuartMI joined #git
22:01 sbasso_ joined #git
22:02 muhannad joined #git
22:02 vdv joined #git
22:02 dwts joined #git
22:02 Pieter joined #git
22:02 Spinkzeit joined #git
22:02 jfr joined #git
22:02 blueyed joined #git
22:02 ertes joined #git
22:02 Grum joined #git
22:02 lesshaste joined #git
22:02 kyan joined #git
22:02 raedah joined #git
22:02 mrkake joined #git
22:02 imMute joined #git
22:02 Error323 joined #git
22:02 Peetz0r joined #git
22:02 dwmw2_gone joined #git
22:02 zyxep joined #git
22:02 Puffball joined #git
22:02 snits` joined #git
22:02 wwalker_ joined #git
22:02 causasui joined #git
22:02 grift joined #git
22:02 nohop joined #git
22:02 nikivi- joined #git
22:02 austin987 joined #git
22:03 sbasso joined #git
22:03 Karazhan joined #git
22:03 tonyj_ joined #git
22:03 Ferris____ joined #git
22:03 sbeller joined #git
22:05 thebope joined #git
22:06 Jackneill joined #git
22:07 SwiftMatt joined #git
22:07 Derperperd joined #git
22:09 blackwind_123 joined #git
22:10 sbasso joined #git
22:10 metalraiden34 joined #git
22:11 TbobbyZ joined #git
22:12 TbobbyZ joined #git
22:13 sbasso_ joined #git
22:13 skirk joined #git
22:13 mash_ joined #git
22:14 dreiss joined #git
22:15 tazle_ joined #git
22:16 sbasso joined #git
22:17 BackEndCoder joined #git
22:19 orbyt_ joined #git
22:19 Error323 joined #git
22:23 StuartMI joined #git
22:27 IndigoTiger joined #git
22:29 sbasso_ joined #git
22:34 jagob joined #git
22:35 clickjack joined #git
22:42 tmsmith joined #git
22:42 Lyqyd joined #git
22:42 pur3eval joined #git
22:42 TbobbyZ joined #git
22:44 brent__ joined #git
22:49 noteness joined #git
22:51 re1 joined #git
22:53 TbobbyZ joined #git
22:56 bgerber joined #git
22:59 Anja joined #git
23:00 Derperperd joined #git
23:00 Derperperd joined #git
23:03 miczac joined #git
23:06 jason237 joined #git
23:10 dsdeiz joined #git
23:10 dsdeiz joined #git
23:11 jstein_ joined #git
23:11 ahr3n joined #git
23:13 eizua joined #git
23:15 CmndrSp0ck joined #git
23:16 Guest70660 joined #git
23:16 VladGh joined #git
23:19 jas4711 joined #git
23:25 mda1 joined #git
23:26 anuxivm left #git
23:29 peeps[lappy] joined #git
23:31 jagob joined #git
23:33 jas4711 joined #git
23:37 kbs joined #git
23:40 alexandre9099_ joined #git
23:40 ryxxed joined #git
23:43 pur3eval joined #git
23:45 Tobbi joined #git
23:47 darkkal joined #git
23:58 metalraiden34 joined #git

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