Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-11

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

All times shown according to UTC.

Time Nick Message
00:06 Doginal joined #git
00:06 DolpheenDream joined #git
00:10 DolpheenDream joined #git
00:13 atomi joined #git
00:13 green_ bremner: I don't actually know how to clone. If I wanted to clone regdd from that link, what would I do? would I download from one of the links under 'clone'
00:14 rewt git clone <url>
00:15 anuxivm joined #git
00:20 theoceaniscool joined #git
00:20 BSaboia joined #git
00:21 diogenese joined #git
00:21 duderono_ joined #git
00:26 e01 joined #git
00:27 matoro joined #git
00:31 watabou joined #git
00:33 cdg_ joined #git
00:34 atomi joined #git
00:34 LiftLeft joined #git
00:35 YuGiOhJCJ joined #git
00:37 Tobbi joined #git
00:38 jimklo_ joined #git
00:40 elsevero joined #git
00:42 green_ ok thanks
00:43 sunri5e joined #git
00:44 fyr_ joined #git
00:45 jimi_ joined #git
00:50 gitinfo 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" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
00:51 madewokherd joined #git
00:52 nettoweb joined #git
00:54 zoph .topkarma
00:54 gitinfo top karmic beings of past 30 days ('all' arg to see totals): o‍sse: 5,  _‍ikke_: 4,  j‍ast: 2,  t‍obiasvl: 1,  v‍ampire0: 1
00:54 pur3eval joined #git
00:57 jccn joined #git
00:58 Vampire0 Oh, cool, I'm in the topkarma
01:02 arescorpio joined #git
01:03 Noldorin joined #git
01:06 jameser joined #git
01:06 variable joined #git
01:08 DolpheenDream joined #git
01:09 netj joined #git
01:13 Electrometro joined #git
01:13 Rodya_ joined #git
01:14 dimi1947 joined #git
01:16 green__ joined #git
01:19 pks joined #git
01:21 cyphase joined #git
01:21 geoid_ joined #git
01:25 hexagoxel joined #git
01:27 e01 joined #git
01:27 e01 joined #git
01:29 mischat joined #git
01:32 nettoweb joined #git
01:33 watabou joined #git
01:34 d1z joined #git
01:35 endiruna joined #git
01:38 cust joined #git
01:41 Ranhir joined #git
01:43 jameser joined #git
01:43 IntruderSRB joined #git
01:47 anuxivm left #git
01:49 Glowball joined #git
01:51 Hink joined #git
01:53 Vampire0 joined #git
01:54 pietv joined #git
01:54 pfloyd _ikke_: decided to create a new branch back at the point where they wanted to work, copy files into that branch and work on that and just orphan that branch and not merge it back to A or B.  just easier than rebasing and dealing with the fallout of all their clones everywhere heh
01:54 jameser joined #git
01:55 pur3eval joined #git
01:59 mda1_ joined #git
02:06 urda joined #git
02:07 FiveBroDeepBook joined #git
02:11 FiveBroDeepBook joined #git
02:13 finalbeta joined #git
02:14 kadoban ... wtf did github do to their site. That looks terrible.
02:14 DavetheBarbarian agreed
02:20 FiveBroDeepBook joined #git
02:21 Darren_ joined #git
02:22 scoobertron joined #git
02:26 durham_ joined #git
02:28 e01 joined #git
02:28 brent__ joined #git
02:28 Zarthus kadoban, inb4 twitter gets a black navbar
02:28 Zarthus and facebook
02:38 menip joined #git
02:41 Serus joined #git
02:41 dsantiago joined #git
02:41 Vampire0 joined #git
02:46 Dougie187 left #git
02:47 mar77i_ joined #git
02:48 aidalgol joined #git
02:48 rafalcpp_ joined #git
02:49 frobnic joined #git
02:49 eizua joined #git
02:50 llamapixel Over ride the CSS ;)
02:51 kadoban I think someone alread rode over it. It looks like what happens when I mess around with themes in my OS and some programs don't honor them correctly, so parts just have random-ass other colorschemes.
02:51 llamapixel Is there a blog comment about the change?
02:52 kadoban I took a quick peek but I don't see one :-/
02:52 pks joined #git
02:53 feodaron joined #git
02:54 fstd_ joined #git
02:54 Wulf4 joined #git
02:55 pietv joined #git
02:56 pur3eval joined #git
02:57 d^sh joined #git
02:57 steve joined #git
03:01 FiveBroDeepBook joined #git
03:02 ojdo joined #git
03:04 Derperperd joined #git
03:06 sbulage joined #git
03:07 thierryp joined #git
03:14 jeffspeff joined #git
03:16 bezhermoso joined #git
03:17 dsdeiz joined #git
03:17 Vortex34 joined #git
03:19 infernix joined #git
03:19 ozmage joined #git
03:22 Rodya_ joined #git
03:23 FiveBroDeepBook joined #git
03:26 FiveBroDeepBook joined #git
03:26 l4v2 joined #git
03:26 FiveBroDeepBook left #git
03:28 plasticle joined #git
03:29 e01 joined #git
03:29 duderonomy joined #git
03:30 d^sh joined #git
03:30 chachasmooth joined #git
03:30 mischat joined #git
03:31 hexagoxel joined #git
03:32 zacts joined #git
03:34 ThunderChicken joined #git
03:34 ThunderChicken joined #git
03:36 ljc joined #git
03:37 govg joined #git
03:37 mehola joined #git
03:38 FiveBroDeepBook joined #git
03:38 FiveBroDeepBook left #git
03:38 rgrinberg joined #git
03:39 amdi_ joined #git
03:40 reconx86 joined #git
03:42 reconx86 joined #git
03:43 reconx86 left #git
03:44 parallel21 left #git
03:44 reconx86 joined #git
03:44 amdi_ joined #git
03:48 mar77i joined #git
03:49 BackEndCoder joined #git
03:51 utanapischti joined #git
03:53 sunri5e joined #git
03:55 reconx86 joined #git
03:55 feodaron joined #git
03:56 pur3eval joined #git
03:58 Ryanar joined #git
03:59 reconx86_ joined #git
04:00 reconx86 joined #git
04:01 chipotle joined #git
04:04 sargentmki joined #git
04:04 swalladge joined #git
04:04 aw1 joined #git
04:10 reconx86 hello
04:10 gitinfo reconx86: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
04:11 reconx86 I have worked on a master branch quiet a bit and it's getting crowded
04:11 thiago joined #git
04:12 reconx86 How can I erase some commits on this branch
04:12 Hello71 wat
04:13 zezba joined #git
04:13 Hello71 "google returns too many results"
04:14 Nilesh_ joined #git
04:14 reconx86 git rev-list --count master
04:16 amagawdd joined #git
04:16 dreiss joined #git
04:16 reconx86 I have over 65 commits that I want to reduce to 1
04:16 reconx86 or a few
04:17 reconx86 how do I go about this?
04:22 ojacobson_ joined #git
04:27 gfixler joined #git
04:30 e01 joined #git
04:30 e01 joined #git
04:30 ozmage_ joined #git
04:30 Hello71 why
04:30 Hello71 actually, never mind, I give up
04:30 ertes joined #git
04:31 mischat joined #git
04:32 pfloyd left #git
04:33 basiclaser joined #git
04:34 redhedded1 joined #git
04:36 Cabanoss- joined #git
04:36 nd joined #git
04:36 reconx86 joined #git
04:38 reconx86 hello
04:39 reconx86_ joined #git
04:40 hexagoxel joined #git
04:40 reconx86_ test
04:41 jimi_ joined #git
04:45 dsdeiz joined #git
04:45 dsdeiz joined #git
04:45 Goplat joined #git
04:46 kasual joined #git
04:50 elsevero joined #git
04:50 blackwind_123 joined #git
04:50 elsevero joined #git
04:56 Emperor_Earth joined #git
04:57 pur3eval joined #git
04:59 PioneerAxon joined #git
05:02 Ryanar joined #git
05:03 ojacobson_ joined #git
05:03 waveclaw joined #git
05:05 oskarkv joined #git
05:09 yuken joined #git
05:09 yuken Is it possible for Git (specifically, pushing to GitHub) to never forget your credentials?
05:09 yuken So, it would automatically push without having to enter a password.
05:15 madewokherd it's probably easier to use public key auth with github (ssh protocol)
05:15 aidalgol joined #git
05:16 jameser joined #git
05:16 madewokherd that will not need a password if you don't encrypt your key
05:21 yuken madewokherd, i'll look into that, thanks :p.
05:24 PioneerAxon joined #git
05:25 LordRyan joined #git
05:27 Murrito joined #git
05:30 e01 joined #git
05:30 e01 joined #git
05:35 constantx joined #git
05:37 systemovich joined #git
05:39 shinnya joined #git
05:40 rwp yuken, madewokherd, Encrypt your ssh key. But use the ssh-agent key manager and then you will have the security of an encrypted key and the convenience of not needing to enter your passphrase each and every time.
05:51 BSAlb joined #git
05:55 clemf joined #git
05:57 sim590 joined #git
05:57 kaldoran joined #git
06:06 hexagoxel joined #git
06:07 PioneerAxon joined #git
06:11 tmk joined #git
06:13 PioneerAxon joined #git
06:13 pur3eval joined #git
06:16 svm_invictvs joined #git
06:17 Anthaas joined #git
06:21 ac3takwas joined #git
06:28 rivarun joined #git
06:31 e01 joined #git
06:33 Oatmeal joined #git
06:34 systemovich joined #git
06:35 brent__ joined #git
06:40 hexagoxel joined #git
06:40 jimklo joined #git
06:45 jeffreylevesque_ joined #git
06:45 ac3takwas joined #git
06:48 Vampire0 joined #git
06:53 scoobertron joined #git
06:54 nivag joined #git
06:59 safe joined #git
07:06 dreiss joined #git
07:07 zezba left #git
07:20 constantx joined #git
07:22 durham joined #git
07:22 senaps joined #git
07:23 durham joined #git
07:23 mehola joined #git
07:24 MineCoins joined #git
07:31 bocaneri joined #git
07:32 e01 joined #git
07:32 e01 joined #git
07:33 watabou_ joined #git
07:39 watabou joined #git
07:40 hexagoxel joined #git
07:41 Vic-away left #git
07:43 Guest9 joined #git
07:43 tmk joined #git
07:55 vuoto joined #git
08:00 _xor joined #git
08:01 patarr joined #git
08:02 pur3eval joined #git
08:15 wgrant joined #git
08:16 armyriad joined #git
08:18 hexagoxel joined #git
08:19 blackwind_123 joined #git
08:20 Vampire0 joined #git
08:26 sim590 joined #git
08:27 kaldoran joined #git
08:27 ozmage joined #git
08:28 overlord_tm joined #git
08:32 e01 joined #git
08:33 mischat joined #git
08:35 ismithers joined #git
08:40 dreiss joined #git
08:40 nowhereman joined #git
08:41 GodGinrai joined #git
08:43 PioneerAxon joined #git
08:47 hexagoxel joined #git
08:51 brent__ joined #git
08:53 chipotle joined #git
08:57 Macaveli joined #git
08:58 Macaveli joined #git
09:02 Levex joined #git
09:03 anon861 joined #git
09:08 Faceman joined #git
09:08 govg joined #git
09:08 Faceman left #git
09:13 Bombe joined #git
09:14 DaveTaboola joined #git
09:17 BlessJah joined #git
09:20 Levex joined #git
09:21 systemovich joined #git
09:23 Milos_ joined #git
09:25 SteffanW joined #git
09:31 a-l-e joined #git
09:34 mischat joined #git
09:34 reverse_light joined #git
09:36 bernardio joined #git
09:41 Derperperd joined #git
09:42 diogenese joined #git
09:46 irqq joined #git
09:48 afuentes joined #git
09:50 pur3eval joined #git
09:53 Levex joined #git
09:55 senaps joined #git
10:01 patarr joined #git
10:03 DBag joined #git
10:03 Bizkit joined #git
10:09 lmatteis joined #git
10:10 ocbtec joined #git
10:19 t0by joined #git
10:19 t0by joined #git
10:21 hexagoxel joined #git
10:24 Milos joined #git
10:31 johnny56_ joined #git
10:32 plugwash joined #git
10:33 plugwash in gitpython how do I find out if a branch exists?
10:33 JanC joined #git
10:36 King_Hual joined #git
10:36 King_Hual joined #git
10:42 GodGinrai joined #git
10:42 eroux joined #git
10:44 m0viefreak joined #git
10:46 mehola joined #git
10:47 armyriad joined #git
10:48 cbreak git rev-parse? :)
10:50 endiruna joined #git
10:53 TomyLobo joined #git
10:53 YuGiOhJCJ joined #git
10:55 cris_ joined #git
11:00 MonsterKiller joined #git
11:02 jnavila joined #git
11:02 dsdeiz joined #git
11:02 dsdeiz joined #git
11:05 theoceaniscool joined #git
11:06 hexagoxel joined #git
11:07 brent__ joined #git
11:09 Tobbi joined #git
11:09 jameser joined #git
11:14 demize plugwash: Repo.heads lists all branches at least, so might have to filter through that.
11:15 ankit01ojha joined #git
11:15 demize Seems you can index Repo.heads by branch name even.
11:18 SimonPeterGruber joined #git
11:19 Ozymandy joined #git
11:19 miczac joined #git
11:19 nettoweb joined #git
11:21 sea-gull joined #git
11:22 dsdeiz joined #git
11:24 Abhijit joined #git
11:24 Abhijit hi
11:24 Abhijit how can I move the current unpushed commit to master from current branch?
11:26 cbreak Abhijit: merge (if you want history) or cherry-pick if you don't
11:26 _ikke_ cherry-pick the commit on master, and then reset the current branch bac
11:26 _ikke_ back
11:26 cbreak Abhijit: it'll copy, not move though
11:26 Abhijit ok
11:28 Levex joined #git
11:32 cdg joined #git
11:34 jost_ joined #git
11:34 johnny56 joined #git
11:35 mischat joined #git
11:39 pur3eval joined #git
11:41 Derperperd joined #git
11:43 hexagoxel joined #git
11:46 blackwind_123 joined #git
11:51 tvw joined #git
11:53 borkr joined #git
11:55 dersand joined #git
11:58 BSaboia joined #git
11:58 DaveTaboola joined #git
11:59 Macaveli joined #git
12:00 sQVe joined #git
12:01 notebox joined #git
12:01 Macaveli_ joined #git
12:02 spacelord_ joined #git
12:02 patarr joined #git
12:05 Macaveli joined #git
12:06 dil3mm4 joined #git
12:06 aw1 joined #git
12:07 gry joined #git
12:08 gry I did "git remote add bob git@github.com:bob/helloworld.git" and "git pull"
12:09 gry or, rather, "git pull bob"
12:09 gry however, it says me "Permission denied (publickey)."
12:09 gry even though github.com/bob/helloworld is a public repo
12:09 gry what should I or bob do now to make it work?
12:09 _ikke_ gry: ssh requires authentication, regardless whether the public is repo or not
12:10 tobiasvl gry: you can add the https remote
12:10 tobiasvl or fix your ssh key
12:10 joki joined #git
12:10 gry _ikke_: in case I would like to keep using the git@ uri (which is over ssh), who and where needs to put my pubkey for it to start working?
12:10 gry tobiasvl: thanks that sounds a bit easier, trying that now
12:12 _ikke_ gry: in your github user account
12:12 Macaveli joined #git
12:17 patarr joined #git
12:19 cdown joined #git
12:20 mohabaks joined #git
12:20 Macaveli joined #git
12:23 d^sh joined #git
12:24 codemann joined #git
12:24 cris_ joined #git
12:24 cdown joined #git
12:29 Macaveli joined #git
12:35 spacelord joined #git
12:36 DDBag joined #git
12:36 Macaveli joined #git
12:38 DDBag left #git
12:39 DBag joined #git
12:39 cdg joined #git
12:39 DBag so I cloned a repo from github. I made some changes and now I want to make a pull request
12:40 DBag github app doesn't let me do it
12:41 flavius joined #git
12:41 tobiasvl DBag: did you fork it?
12:41 cdg joined #git
12:41 DBag no, I only cloned it. I need to fork it too?
12:42 flavius Hi. Is it possible to get user input dynamically, as a prompt (python's input()), in a post-checkout hook?
12:42 tobiasvl DBag: if you want to make a pull request, yes. a pull request is between a fork and a repo that are both on github, not a local clone and a repo on github
12:42 DBag tobiasvl, thank you!
12:43 GodGinrai joined #git
12:43 _ikke_ You can also make a PR within a repo/project, but you need to have push access
12:43 _ikke_ when you don't have push access, you can fork the project and push to there
12:44 tobiasvl yeah that's true
12:44 thierryp joined #git
12:45 DBag so that is basically a shared repo?
12:46 flavius Or let's broaden my question, is it possible to prompt the user for input in any hook, dynamically? Any git guru around?
12:47 mehola joined #git
12:48 thierryp_ joined #git
12:50 Vinnie_win_p joined #git
12:53 ilyaigpetrov joined #git
12:53 cdown_ joined #git
12:54 _ikke_ flavius: If at all possible, only local hooks
12:54 flavius sure, only local ones. But how?
12:55 canuk joined #git
12:56 _ikke_ flavius: hold onm
12:56 _ikke_ on
12:56 flavius _ikke_: I'll try raw_input(), I guess I have to address the tty directly
12:57 _ikke_ flavius: I tried read with bash, but it continues immediately
12:57 flavius same with python's input(), it reads EOF
12:58 _ikke_ Probably because it's not connected to the tty
13:00 ysh joined #git
13:02 CheckDavid joined #git
13:04 flavius I'll try spawning a new pty
13:05 thierryp joined #git
13:07 Darcidride joined #git
13:08 brent__ joined #git
13:09 miczac joined #git
13:09 tmk joined #git
13:10 cdg_ joined #git
13:12 vktec joined #git
13:12 vktec left #git
13:13 overlord_tm joined #git
13:15 jimi_ joined #git
13:20 reconx86__ joined #git
13:20 ilyaigpetrov left #git
13:21 flavius _ikke_: good news, it works by monkey patching sys.stdin with open('/dev/tty', 'r')
13:23 govg joined #git
13:24 cr34ton joined #git
13:24 reconx86 joined #git
13:25 [ADN] joined #git
13:28 pur3eval joined #git
13:31 spacelord_ joined #git
13:32 Guest85 joined #git
13:32 cagedwisdom joined #git
13:33 reconx86_ joined #git
13:35 brent__ joined #git
13:36 anuxivm joined #git
13:40 Taikibansei joined #git
13:41 Skitzo joined #git
13:41 spacelord_ joined #git
13:42 Derperperd joined #git
13:42 Tobbi joined #git
13:43 MapMan joined #git
13:43 chipotle joined #git
13:44 SimonPeterGruber joined #git
13:45 shinnya joined #git
13:49 gugah joined #git
13:50 Karazhan joined #git
13:51 flavius I have another problem. In the post-checkout hook, the environment variable GIT_DIR is '.git', which is wrong, relative to the PWD. Is it really a bug in git, or is there something I should know? I need to add a setting to .git/config when cloning a repo
14:02 DolpheenDream joined #git
14:05 _ikke_ flavius: that is by design
14:05 _ikke_ unset it or set it to the proper directory if you need it
14:07 flavius _ikke_: I don't know what to set it to, because I don't get from the user the name of the directory he is asking for, and I don't want to interfere too much, I just need access to the .git/config, whereever that may be
14:07 flavius Think about git clone existing_repo new_repo
14:07 flavius I don't have the value, here "new_repo"
14:10 ankit01ojha joined #git
14:10 _ikke_ What hook are you using?
14:11 treia joined #git
14:15 masuberu joined #git
14:19 flavius _ikke_: post-checkout. But nevermind, I've found that the actual cwd of the process (not the environment variable) is the absolute path of new_repo
14:19 Vampire0 joined #git
14:24 mischat joined #git
14:25 leeN joined #git
14:28 ysh joined #git
14:31 gugah joined #git
14:32 ejnahc joined #git
14:36 canuk joined #git
14:43 skitzo_1 joined #git
14:43 GodGinrai joined #git
14:44 wrouesnel1 joined #git
14:48 xanadu_ joined #git
14:49 mehola joined #git
14:52 Jackneill_ joined #git
14:54 ismaris joined #git
14:56 rizonz I will use git to deploy my servers as I did before with svn, now on SVN I did a svn update after the first deploy but what would be best to do on git ?
14:57 e01 joined #git
14:57 e01 joined #git
14:58 Ryanar joined #git
14:59 osse rizonz: !deploy
14:59 gitinfo rizonz: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
15:01 mischat joined #git
15:05 matumbo joined #git
15:07 thierryp joined #git
15:07 miczac joined #git
15:08 m1crohz joined #git
15:12 backnforth joined #git
15:14 backnforth Hi, can someone help me out with my git configs. Currently when I do any Git pushes, my user doesn't get linked and instead I have a username that's doesn't link to my profile. Also, even though I've used "git config" to globally set my username I still get prompted for my username when doing a push.
15:16 _ikke_ backnforth: how did you set your username?
15:17 pur3eval joined #git
15:17 Vampire0_ joined #git
15:18 m1crohz joined #git
15:26 DDBag joined #git
15:27 JamesBaxter joined #git
15:29 backnforth joined #git
15:30 backnforth Sorry about that, but I still have the same question as earlier
15:30 _ikke_ backnforth: how did you set your username?
15:30 backnforth git config --global user.username
15:30 backnforth user.name
15:30 backnforth I mean
15:30 backnforth but even that wasn't being used
15:31 backnforth this is on a fresh git creation as well
15:31 _ikke_ Right
15:31 robattila256 joined #git
15:31 _ikke_ It's not a username
15:31 _ikke_ it's just a name
15:31 _ikke_ Used for recording who created a commit
15:31 backnforth oh?
15:31 _ikke_ Has nothing to do with how you authenticate to github (or any other repository) to push your changes
15:32 backnforth how do I change that?
15:32 _ikke_ what does git remote -v show?
15:33 backnforth origin fetch and push
15:33 backnforth with the same url being used
15:33 m4sk1n joined #git
15:33 backnforth originhttps://github.com/alexcreamer/Bootstrap-Calendar-App (fetch)
15:33 backnforth originhttps://github.com/alexcreamer/Bootstrap-Calendar-App (push)
15:33 _ikke_ Is it an http(s) url?
15:33 _ikke_ Right
15:33 backnforth yes
15:34 _ikke_ So what happens when you push?
15:34 backnforth I need to set the upstream then I get prompted for a username and password
15:34 _ikke_ Right
15:34 Vampire0 joined #git
15:34 dbl4k joined #git
15:35 _ikke_ You can use credential helpers to let git automatically fill in your credentials
15:35 _ikke_ but the ones shipped with git store them in plain-text
15:36 backnforth but then my account doesn't get linked
15:36 backnforth credentials helper could work
15:36 _ikke_ linked?
15:36 _ikke_ You mean on github?
15:36 backnforth Yes, clicking on the committers name does nothing
15:36 backnforth On Github, yes
15:36 _ikke_ Right
15:36 Vampire0 joined #git
15:36 _ikke_ github matches the e-mail address you setup
15:37 _ikke_ Not the name
15:37 _ikke_ (sorry, I misunderstood what you meant)
15:37 _ikke_ git config user.name
15:37 _ikke_ git config user.mail
15:37 backnforth email
15:37 _ikke_ hehe, yeah
15:37 backnforth I've made those
15:38 backnforth and they get ignored
15:38 osse if you change their values then they only have effect on commits you make later
15:38 ephimetheus joined #git
15:38 backnforth I've deleted my repo, I'm on a fresh instance
15:39 _ikke_ You have to attach the e-mail address to your github account
15:39 _ikke_ backnforth: doesn't matter
15:39 backnforth I've recreated it and I've recreated my .git
15:39 backnforth how do I attach?
15:39 _ikke_ backnforth: that information is attached to the commit itself
15:39 _ikke_ backnforth: https://help.github.com/articles/adding-an-email-address-to-your-github-account/
15:39 eroux joined #git
15:40 backnforth I already have an email set
15:40 _ikke_ You have to add the e-mail address you used in the commits
15:40 _ikke_ /add
15:40 mischat_ joined #git
15:40 backnforth It's already added
15:42 _ikke_ the address you used in the commits that already have been pushed?
15:43 IntruderSRB joined #git
15:43 Derperperd joined #git
15:43 backnforth Works
15:43 backnforth Thank you _ikke_
15:44 SimonPeterGruber left #git
15:44 backnforth The correct email wasn't being added to the commit
15:45 _ikke_ :-)
15:45 d1z joined #git
15:48 eroux joined #git
15:50 Wulf joined #git
15:50 anuxivm left #git
15:56 Wulf joined #git
15:57 _noblegas joined #git
15:59 matumbo left #git
16:00 robotroll joined #git
16:01 robotroll joined #git
16:01 Richard_Cavell joined #git
16:03 d1z joined #git
16:07 mda1 joined #git
16:07 mmlb joined #git
16:07 jagob joined #git
16:07 denisMone joined #git
16:07 madewokherd joined #git
16:07 matumbo joined #git
16:08 Richard_Cavell Hello everyone. I have a working directory with several files and directories.  I used git on my working directory to place my project on github.com.  However, I am not familiar with git and so I've been typing git push to commit changes instead of git commit.  I don't think the github version is still in sync with my working directory.  What do I do?
16:09 _ikke_ Richard_Cavell: I'd start with comitting the changes
16:09 shurnormal You can fetch github and inspect changes using `gitk --all`.
16:09 DolpheenDream joined #git
16:11 Richard_Cavell I have typed git commit and it says "no changes added to commit" and the latest changes are not there.
16:11 Richard_Cavell I don't have gitk installed.
16:12 shurnormal If you are in a Debian or Fedora box you can easy and safely get gitk from distro repos.
16:13 _ikke_ Richard_Cavell: You need to stage changes before you can commit them
16:16 miczac_ joined #git
16:17 pur3eval joined #git
16:17 chipotle joined #git
16:20 Wulf joined #git
16:20 rizonz osse: I know but it can deploy perfectly :) it grabs code from my production repo
16:20 aep left #git
16:21 Glooomy joined #git
16:23 miczac joined #git
16:23 gry left #git
16:24 armyriad joined #git
16:26 Murii joined #git
16:26 cris_ joined #git
16:27 jnavila joined #git
16:28 backnforth joined #git
16:29 vuoto joined #git
16:29 iLembus joined #git
16:33 shgysk8zer0_ joined #git
16:40 Richard_Cavell Okay, another thing - I've run git add Objects to add a directory called "Objects" to my versioned files.  But I think it also automatically included everything in that directory.  I don't want them there.
16:41 olbat joined #git
16:42 JamesBaxter joined #git
16:42 denisMone you can use git reset objects
16:42 denisMone to unstage them
16:44 GodGinrai joined #git
16:44 denisMone Richard_Cavell: ^^
16:45 _ikke_ Richard_Cavell: Note that git does not track just directories
16:48 denis_M joined #git
16:48 Richard_Cavell Oh, okay.
16:48 tmk joined #git
16:50 Ranhir joined #git
16:51 mehola joined #git
16:53 YuGiOhJCJ joined #git
16:54 govg joined #git
17:04 disconnect_me left #git
17:05 ismaris joined #git
17:08 vuoto joined #git
17:08 tazle_ joined #git
17:09 menip joined #git
17:09 irqq joined #git
17:12 JamesBaxter joined #git
17:14 Derperperd joined #git
17:15 grayjoc joined #git
17:15 nowhereman joined #git
17:15 pbrewczynski joined #git
17:17 cagmz joined #git
17:18 watabou joined #git
17:22 sarri joined #git
17:22 sarri joined #git
17:23 thiago joined #git
17:25 jason237 joined #git
17:27 jcjordyn120 joined #git
17:28 jcjordyn120 left #git
17:28 dreiss joined #git
17:28 scoobertron joined #git
17:30 osse rizonz: the link will tell you how to do that
17:35 mohabaks joined #git
17:36 eroussel joined #git
17:36 jost__ joined #git
17:42 finalbeta joined #git
17:44 navidr joined #git
17:47 dreiss joined #git
17:47 pks joined #git
17:48 basiclaser joined #git
17:49 Derperperd joined #git
17:50 mischat joined #git
17:59 Goplat joined #git
18:01 bezhermoso joined #git
18:06 cdg joined #git
18:06 pur3eval joined #git
18:10 clemf joined #git
18:10 publio joined #git
18:11 netj joined #git
18:13 redge joined #git
18:14 redge left #git
18:19 pks joined #git
18:19 ash_workz joined #git
18:21 BackEndCoder joined #git
18:22 UserOO7 joined #git
18:24 mehola joined #git
18:32 SCHAAP137 joined #git
18:33 InfoTest joined #git
18:34 notebox joined #git
18:35 miczac joined #git
18:37 jeffspeff joined #git
18:41 zzz joined #git
18:43 forgot_ joined #git
18:44 jnavila joined #git
18:45 GodGinrai joined #git
18:46 durham joined #git
18:50 cdown joined #git
18:51 jstimm joined #git
18:53 krabat joined #git
18:54 jimi_ joined #git
18:55 kasual joined #git
19:03 bezhermoso joined #git
19:03 jnewt joined #git
19:03 tang^ joined #git
19:05 xissburg joined #git
19:05 sunri5e joined #git
19:07 rizonz osse: yeah need to recheck it again, thanks for the link
19:07 pur3eval joined #git
19:13 jstimm joined #git
19:13 WakiMiko joined #git
19:18 miczac joined #git
19:19 zzz joined #git
19:19 UserOO7 joined #git
19:22 xissburg joined #git
19:22 sangy Hello everyone. Does anyone know of any interesting papers/work regarding github (or web-based git hosting services) security?
19:23 xlegoman joined #git
19:23 matoro joined #git
19:24 hugh-adolph joined #git
19:24 netj joined #git
19:24 UserOO7 joined #git
19:25 hugh-adolph left #git
19:26 miczac_ joined #git
19:27 govg joined #git
19:27 Zarthus sangy: GitLab is pretty open about their stuff.
19:28 Zarthus sangy: They recently had an event where someone deleted their entire database and documented a lot of it, if you somehow missed it, it's a fun read if nothing else.
19:28 manuelschneid3r joined #git
19:28 Zarthus not necessarily too git-related, though.
19:28 sangy Zarthus: yup, I'll give it another dive. Thanks for the reminder :)
19:30 Ryanar joined #git
19:31 Bizkit joined #git
19:33 fatalhalt joined #git
19:33 xissburg joined #git
19:34 aw1 joined #git
19:34 miczac joined #git
19:35 Karazhan joined #git
19:37 jnewt joined #git
19:37 UserOO7 joined #git
19:38 _ADN_ joined #git
19:41 buckowski https://brain.ratman.org/munin/rodent.ninja/den.rodent.ninja/index.html#network
19:41 cyphase joined #git
19:42 sunri5e joined #git
19:42 buckowski 460gb downlad
19:42 yqt joined #git
19:43 UserOO7 joined #git
19:46 d1z joined #git
19:46 dcy joined #git
19:47 pietv joined #git
19:48 dil3mm4_ joined #git
19:48 neunon joined #git
19:49 theoceaniscool joined #git
19:49 robotrolll joined #git
19:49 dil3mm4_ left #git
19:50 Dil3mm4 joined #git
19:52 LiftLeft joined #git
19:58 ni291187 joined #git
19:59 Sc0rpius_ left #git
19:59 Sc0rpius joined #git
19:59 watabou joined #git
20:02 YuGiOhJCJ joined #git
20:04 matoro joined #git
20:10 Taikibansei joined #git
20:11 elsevero joined #git
20:11 jascott1 joined #git
20:12 zeroed joined #git
20:15 jimi_ joined #git
20:17 Noldorin joined #git
20:17 cdg joined #git
20:22 texasmynsted joined #git
20:28 LeBlaaanc joined #git
20:30 Starky joined #git
20:31 matoro joined #git
20:31 jstimm joined #git
20:32 BSaboia joined #git
20:32 WakiMiko joined #git
20:43 rogi joined #git
20:44 rogi whats your guys flow for branching off other topic branches?
20:44 Taikibansei joined #git
20:46 GodGinrai joined #git
20:49 jascott1 anyone generous soul around that can help me understand wtf I am doing wrong with my workflow?
20:51 mischat joined #git
20:53 jason237 joined #git
20:56 pur3eval joined #git
20:56 Oatmeal joined #git
20:57 matoro joined #git
21:00 _ikke_ jascott1: !just_ask
21:00 gitinfo jascott1: You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
21:01 l4v2 joined #git
21:02 WakiMiko joined #git
21:03 jascott1 i rebased master on my  feature branch and pushed. now I do more commits on feature and try to push and get rejected saying my tip is behind
21:03 jascott1 http://paste.openstack.org/show/598520/
21:05 WakiMiko joined #git
21:05 jascott1 so I have ALL commits of remote feature (since I just checked out branch) and then have all commits of master rebased into feature. yet it says I am behind remote feature branch
21:07 ocbtec joined #git
21:07 jascott1 this is an open PR so I dont want to force anything unless its the idiomatic thing todo here
21:08 _ikke_ jascott1: did you rebase master on feature, or feature on master?
21:08 chipotle joined #git
21:09 _ikke_ (and force pushing pull-requests is not a bad thing)
21:09 jascott1 on feature i ran 'git rebase origin master'
21:09 jascott1 _ikke_ good to know
21:09 Daviey joined #git
21:10 jascott1 it all worked the first time and I created PR, now its giving me fits trying to update latest from master and push to feature
21:10 _ikke_ Right, this is correct, because you have 'rewritten' history
21:10 _ikke_ Which requires a force push
21:10 jascott1 ok thanks so much, guess im gun shy of the force push
21:10 _ikke_ Note that putting origin in that command does not make much sense
21:10 jascott1 blaster shy ;)
21:11 _ikke_ jascott1: learn to use --force-with-lease
21:11 jascott1 should use local master?
21:11 WakiMiko joined #git
21:11 _ikke_ jascott1: when you specify git rebase master, you rebase the current branch *onto* master
21:11 _ikke_ master itself is left alone
21:12 jascott1 right thats what I want
21:12 LeBlaaanc joined #git
21:12 jascott1 im getting all master and then my diff feature commits ontop but all in feature branch correct?
21:12 _ikke_ correct
21:12 jascott1 ok i am looking into lease
21:13 jascott1 thanks so much _ikke_
21:13 _ikke_ jascott1: it's the same as normal --force, but aborts when the remote has commits you don't have locally
21:14 dermoth_ joined #git
21:14 inflames joined #git
21:14 jascott1 ah sounds perfect
21:19 dreiss joined #git
21:19 iqliw joined #git
21:20 UserOO7 joined #git
21:23 Vampire0_ joined #git
21:29 bulletmark joined #git
21:32 apotry joined #git
21:33 bezhermoso joined #git
21:35 j7k6 joined #git
21:35 xissburg joined #git
21:37 skinkitten joined #git
21:37 skinkitten_ joined #git
21:39 christian_ joined #git
21:43 Phylock joined #git
21:43 menip joined #git
21:44 Vampire0 joined #git
21:45 chipotle joined #git
21:47 raynold joined #git
21:47 wcpan joined #git
21:51 netj joined #git
21:52 cris_ joined #git
21:52 CEnnis91 joined #git
21:53 Tobbi joined #git
21:56 pur3eval joined #git
21:58 brownleavedverti joined #git
22:03 brownleavedverti left #git
22:05 Vampire0_ joined #git
22:08 scoobertron joined #git
22:08 Cerise joined #git
22:08 Cerise joined #git
22:10 cdown joined #git
22:11 pbrewczynski joined #git
22:11 netj joined #git
22:11 tristanp joined #git
22:12 cdown joined #git
22:14 alexandre9099 joined #git
22:15 l4v2 joined #git
22:15 cris_ joined #git
22:16 shgysk8zer0_ joined #git
22:17 LeBlaaanc joined #git
22:17 xissburg joined #git
22:18 Bizkit joined #git
22:21 kaldoran joined #git
22:24 texasmynsted left #git
22:30 j7k6 joined #git
22:30 Goplat joined #git
22:32 roger_raymond joined #git
22:35 sagerdearia joined #git
22:36 notebox joined #git
22:37 Karazhan joined #git
22:40 pandeiro joined #git
22:40 cyphase joined #git
22:41 nowhereman joined #git
22:42 mehola joined #git
22:46 donught joined #git
22:46 donught joined #git
22:47 GodGinrai joined #git
22:48 matsaman joined #git
22:48 tvw joined #git
22:50 endiruna joined #git
22:52 freezer joined #git
22:55 boombatower joined #git
22:55 btree joined #git
22:57 btree left #git
23:01 tristanp joined #git
23:01 fmeerkoetter joined #git
23:02 chipotle joined #git
23:03 Naan joined #git
23:04 jagob joined #git
23:07 efeuska joined #git
23:08 Wulf joined #git
23:08 DDBag left #git
23:10 DBag joined #git
23:12 Ryanar joined #git
23:13 JamEngulfer joined #git
23:15 JamEngulfer I have the most infuriating problem happening. I’ve got user.name and user.email set in my git preferences, I’ve authenticated with GitHub using my username and password, but any commits by Xcode show up on github under an old username I’ve never used on this computer and haven’t signed into in years.
23:16 BackEndCoder joined #git
23:18 JamEngulfer Is there anything I can do to stop this happening and fix the now tainted commits without just nuking the repo and starting over?
23:18 tristanp joined #git
23:20 matsaman JamEngulfer: sounds like xcode has its own separate config
23:20 ljc joined #git
23:20 Karazhan joined #git
23:20 matsaman JamEngulfer: egrep -Hir olduser ~/Library/Preferences/ maybe?
23:20 matsaman dunno where Xcode keeps its prefs
23:20 matsaman ~/Library/Preferences would be the proper place, so they're probably elsewhere =P
23:21 matsaman or it might just be the user you used to install Xcode with (app store user)
23:21 Karazhan joined #git
23:22 JamEngulfer That would be weird, given on github the name links to my old profile
23:22 ToBeCloud joined #git
23:22 JamEngulfer But not out of the realm of possibility, given the problem
23:22 matsaman well according to what you said, either xcode or github is misconfigured
23:22 matsaman so just check those configs
23:23 ThiefMaster also, `git show` one of the commits and look at the author there
23:23 UserOO7 joined #git
23:23 Ryanar joined #git
23:24 troulouliou_dev joined #git
23:24 Karazhan joined #git
23:27 pur3eval joined #git
23:27 kruncher joined #git
23:27 xissburg joined #git
23:27 Karazhan joined #git
23:27 govg joined #git
23:28 kruncher is it invalid to have a git repository with a name like "something--foo" (contains double-hyphen) since on bitbucket the url gets changed to "something-foo"?
23:28 Karazhan joined #git
23:28 Zarthus I was under the impression a repository name could be anything, myself.
23:29 Zarthus a valid folder name on your filesystem, that is
23:29 JamEngulfer Ok, if I want to re-write the last commit I just made (remove the commit and then manually make it again), how would I do that?
23:29 bremner valid for git does not equal valid for J. Random Git Hoster
23:29 kruncher Zarthus, that's what I was thinking
23:33 memfrob joined #git
23:34 d1z joined #git
23:34 eb0t joined #git
23:35 memfrob Hi guys, I'm not sure what's going on here. git.kernel.org is saying that this came first: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/mm/memory.c?id=1745cbc5d0dee0749a6bc0ea8e872c5db0074061
23:35 tristanp joined #git
23:35 memfrob However this patch doesn't apply cleanly without conflicts unless that commit is reverted: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/mm/memory.c?id=01c8f1c44b83a0825b573e7c723b033cece37b86
23:36 memfrob I've checked the dates and everything and can't figure out what's going on.
23:37 eizua joined #git
23:38 memfrob Commit 01c8f1c44b83a0825b573e7c723b033cece37b86 isn't expecting vm_insert_pfn_prot to exist, so there's a conflict. What is going on?
23:38 tristanp joined #git
23:44 memfrob I thought I was going crazy lol
23:45 jimi_ joined #git
23:45 memfrob Does anyone need help?
23:49 gugah joined #git
23:49 gugah joined #git
23:49 ozmage joined #git
23:50 svm_invictvs joined #git
23:51 memfrob So now I need to revert that commit to bring in another, but then I need to revert it again, so it'll be "revert revert" :/
23:53 tristanp joined #git
23:53 govg joined #git
23:53 kadoban joined #git

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