Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-20

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

All times shown according to UTC.

Time Nick Message
00:07 Spec-Chum joined #git
00:11 acetakwas joined #git
00:14 ljc joined #git
00:16 pwnz0r joined #git
00:18 GavinMagnus joined #git
00:20 dreiss joined #git
00:23 wrouesnel1 joined #git
00:28 totryanother joined #git
00:32 snowman joined #git
00:36 akurniawan joined #git
00:37 boombatower joined #git
00:39 hahuang65 joined #git
00:41 thierryp_ joined #git
00:44 venmx joined #git
00:48 overlord_tm joined #git
00:51 JSharpe joined #git
00:55 davimore_ joined #git
00:57 nonconvergent joined #git
00:57 mehola joined #git
01:02 GavinMagnus left #git
01:07 kyan joined #git
01:09 Milos joined #git
01:12 nonconvergent joined #git
01:14 ljc joined #git
01:15 Guest58 joined #git
01:20 Gsham joined #git
01:30 justan0theruser joined #git
01:34 Siegfried joined #git
01:39 umpc joined #git
01:42 NeverDie joined #git
01:44 HoierM joined #git
01:45 HoierM joined #git
01:45 nonconvergent joined #git
01:52 shmuli joined #git
01:57 anonymuse joined #git
02:01 aidalgol joined #git
02:03 Anja joined #git
02:06 Vampire0_ joined #git
02:06 jaafar joined #git
02:07 papermachine joined #git
02:10 nicksloan joined #git
02:11 d^sh joined #git
02:12 m0viefreak joined #git
02:12 Lyqyd joined #git
02:13 anonymuse joined #git
02:17 venmx joined #git
02:21 raspado joined #git
02:22 byte512 joined #git
02:29 ljc joined #git
02:33 ochorocho__ joined #git
02:34 finalbeta joined #git
02:39 pks joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:52 Siegfried joined #git
03:00 sssilver joined #git
03:09 akurniawan joined #git
03:11 sunri5e joined #git
03:15 sgtbigman joined #git
03:22 hexagoxel joined #git
03:23 linuxmodder joined #git
03:24 spriz joined #git
03:26 chachasmooth joined #git
03:26 raijin joined #git
03:31 cdg joined #git
03:35 raijin joined #git
03:36 sssilver joined #git
03:40 GT4066 joined #git
03:42 hahuang65 joined #git
03:46 Nilesh_ joined #git
03:49 bitri joined #git
03:50 Garen joined #git
03:53 shinnya joined #git
03:56 mrpackethead joined #git
03:58 clemf joined #git
04:00 kermit_ joined #git
04:04 Siegfried joined #git
04:04 russ_za joined #git
04:06 floatingman joined #git
04:09 ayjay_t joined #git
04:09 bitri joined #git
04:11 bitri joined #git
04:11 howdoi joined #git
04:12 Sasazuka joined #git
04:13 romerocesar joined #git
04:15 Vortex34 joined #git
04:16 rideh joined #git
04:28 nonconvergent joined #git
04:29 pks joined #git
04:32 bitri_ joined #git
04:35 e14 joined #git
04:36 snowkidind joined #git
04:36 vuoto joined #git
04:38 qws-user-1228 joined #git
04:42 Zamerick joined #git
04:43 Mixologic joined #git
04:45 bmahe joined #git
04:51 nowhere_man joined #git
04:56 fstd joined #git
04:57 mrpackethead joined #git
04:57 guest3456 joined #git
04:58 guest3456 how come i can't use regex in 'git grep' ?
04:58 guest3456 'git grep Hello W\w+d'
04:59 isysd joined #git
05:00 thiago you can
05:01 Mobutils joined #git
05:01 guest3456 how ?
05:01 thiago git grep <regex-goes-here>
05:01 thiago your command above searches for the regex "Hello" in a file called "Ww+d"
05:03 guest3456 git grep 'Hello W\w+D'
05:03 guest3456 that fails too
05:04 thiago Maybe you don't have the string "Hello W" followed by a word character, followed by "+D"
05:04 thiago note that + is not a special character
05:04 thiago if you meant for it to be, you have to turn extended regexps on
05:05 dreiss joined #git
05:05 qws-user-1228 joined #git
05:05 guest3456 what is extended regexps and how do i know what chars are special ?
05:05 thiago man grep
05:05 thiago there are lots of tutorials on regular expressions, extended regular expressions, and what grep supports
05:06 xall joined #git
05:07 guest3456 https://www.gnu.org/software/grep/manual/grep.html#Basic-vs-Extended
05:07 guest3456 only mentions the { char being different
05:08 guest3456 http://linuxcommand.org/man_pages/grep1.html
05:08 guest3456 "Grep  understands  two different versions of regular expression syntax:        “basic” and “extended.”  In GNU grep, there is no difference in  avail-        able  functionality  using  either  syntax. "
05:08 thiago "In basic regular expressions the meta-characters ‘?’, ‘+’, ‘{’, ‘|’, ‘(’, and ‘)’ lose their special meaning"
05:09 guest3456 ah
05:09 guest3456 so its like in vim
05:09 guest3456 escape both
05:10 thiago or use the -E switch
05:10 guest3456 ahhh
05:10 guest3456 vnice
05:10 guest3456 thx
05:10 pijiu joined #git
05:12 pijiu joined #git
05:15 guest3456 joined #git
05:15 guest3456 joined #git
05:16 gmn8719 joined #git
05:17 raijin joined #git
05:17 Cabanossi joined #git
05:17 urda joined #git
05:20 gmn8719 Trying to clone a GitHub repo via SSH. Keep getting a Permission denied (publickey) error.
05:20 thiago then you don't have permission to clone that repo via SSH using the key you provided
05:21 gmn8719 It's my repo.
05:21 gmn8719 Or, it's a fork I created.
05:21 thiago and yet clearly you don't have access
05:21 thiago either it's the wrong repo or the wrong key, or the wrong transport
05:21 gmn8719 Oh. Well. That solves it.
05:22 BenderRodriguez joined #git
05:24 Aboba joined #git
05:25 gmn8719 Anyone else?
05:27 thiago are you certain nyou're using the right key? Can you clone other repositories of yours on GitHub?
05:28 Siegfried joined #git
05:47 languitar joined #git
05:48 raspado joined #git
05:50 srinivasnayak joined #git
05:52 gmn8719 Got the info from a website. Needed to set up a config file to tell GH the name of the key.
05:56 leeN joined #git
05:57 code2Learn joined #git
05:58 NeverDie joined #git
06:00 kermit_ joined #git
06:07 woodruffw joined #git
06:08 fugi joined #git
06:09 srinivasnayak when gitk --all is little confusing to me, is there a way to see git branches as we see in clearcase version tree ?
06:11 nitesh` joined #git
06:12 MrWoohoo joined #git
06:13 User458764 joined #git
06:15 Mobutils joined #git
06:19 subhojit777 joined #git
06:30 Kuukunen srinivasnayak: "clearcase version tree" something like https://svn.haxx.se/dev/archive-2006-07/att-0171/clearcase_tree.png
06:30 Kuukunen ?
06:31 Kuukunen there's https://github.com/ChristianStroyer/BranchMaster
06:31 Kuukunen haven't tried it tho
06:40 nonconvergent joined #git
06:40 pks joined #git
06:41 shubhnik joined #git
06:41 romerocesar joined #git
06:47 brent__ joined #git
06:47 brent__ so i'm trying to track my dot files using github
06:48 brent__ i made a repo called dotfiles, and am having an issue w/ keeping track of my /oh-my-zsh directory, since it has it's own repo at that directory
06:49 brent__ i tried creating a /dotfiles/.gitignore w/ oh-my-zsh/.git and oh-my-zsh/.gitignore in it, but didn't seem to work
06:50 Anja joined #git
06:51 User458764 joined #git
06:55 milki brent__: !dotfiles can give you some guidelines on managing dotfiles
06:55 gitinfo brent__: 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
06:56 brent__ milki: So i'm made the repo in a seperate director ~/dotfiles and am symlinking the files back to ~/
06:58 subhojit_ joined #git
06:59 mrpackethead joined #git
07:00 vuoto joined #git
07:00 nivag joined #git
07:07 johnny56 joined #git
07:08 rivarun joined #git
07:13 Sonderblade joined #git
07:16 pks joined #git
07:17 subhojit__ joined #git
07:17 Atrumx joined #git
07:23 flossie joined #git
07:25 jack joined #git
07:26 subhojit_ joined #git
07:27 vrlx joined #git
07:30 mycyber joined #git
07:32 jack hi there
07:34 jack left #git
07:38 nikivi joined #git
07:39 meauses joined #git
07:47 davimore__ joined #git
07:49 thebope joined #git
07:50 Anja joined #git
07:51 shubhnik joined #git
07:51 m___ joined #git
07:53 srinivasnayak left #git
07:54 vuoto joined #git
07:55 ljc joined #git
07:56 overlord_tm joined #git
07:57 vuoto joined #git
07:57 vuoto joined #git
07:58 Jameser joined #git
07:58 subhojit__ joined #git
07:58 dreiss joined #git
07:59 vuoto joined #git
08:00 vuoto joined #git
08:00 mrpackethead joined #git
08:01 vuoto joined #git
08:01 leehambley joined #git
08:07 dsdeiz joined #git
08:07 pks joined #git
08:08 finalbeta joined #git
08:15 govg joined #git
08:19 jave joined #git
08:19 ochorocho__ joined #git
08:21 dsantiago joined #git
08:23 lovingrainbow joined #git
08:26 nd_ joined #git
08:30 IIT joined #git
08:31 xtriz nnoremap <space> za ; vnoremap <space> zf; what does this command does ?
08:32 jaafar joined #git
08:33 cosmos_ joined #git
08:38 dikiaap joined #git
08:44 Random832 :help za
08:44 jfr joined #git
08:44 Random832 er this isn't #vim
08:45 Random832 it looks like they are folding related things
08:45 dreiss joined #git
08:48 davimore_ joined #git
08:49 derk0pf joined #git
08:52 ShoaibJahejo joined #git
08:53 jfr joined #git
08:53 xtriz ops sorry
08:54 cyan__ joined #git
08:54 jfr joined #git
08:55 hahuang65 joined #git
08:57 jaafar joined #git
09:01 jfr joined #git
09:03 lordjancso joined #git
09:04 govg joined #git
09:04 Qria joined #git
09:06 subhojit__ joined #git
09:07 rivarun joined #git
09:09 jknetl joined #git
09:10 Siegfried joined #git
09:12 neunon joined #git
09:14 dsdeiz joined #git
09:14 dsdeiz joined #git
09:15 aidalgol joined #git
09:16 flavius joined #git
09:17 Domhack joined #git
09:18 sq-one joined #git
09:22 srkrishna[m] joined #git
09:23 msonntag joined #git
09:32 Jackneill joined #git
09:33 Macaveli joined #git
09:35 bocaneri joined #git
09:36 PCatinean joined #git
09:40 WoodLeg joined #git
09:42 mycyber joined #git
09:50 thebope joined #git
09:50 lindenle joined #git
09:53 Siegfried joined #git
09:55 harrymoreno joined #git
10:01 Siegfried joined #git
10:02 tvw joined #git
10:05 r3c0d3x joined #git
10:10 navidr joined #git
10:10 Raging_Hog joined #git
10:13 davimore joined #git
10:16 Siegfried joined #git
10:17 subhojit777 joined #git
10:17 catsup joined #git
10:18 antispaceman joined #git
10:18 catsup joined #git
10:20 mablae joined #git
10:21 seishun joined #git
10:21 nitesh joined #git
10:27 robotroll joined #git
10:27 qws-user-1228 joined #git
10:30 xaxxon joined #git
10:31 rebrec joined #git
10:32 rebrec hello
10:32 gitinfo rebrec: 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.
10:32 m0viefreak joined #git
10:33 xaxxon I was on a detached head and did a commit.   Then I tried to do a push and it complained.  then I did a merge to master and got a merge error .   I fixed the merge conflict and did another commit.   then I did a git checkout master and my changes are gone.   are they still around somewhere or are they lost?   thank you
10:34 xaxxon I still have the terminal window open with all the output from the commands..
10:35 LucaTM joined #git
10:35 elastix joined #git
10:36 xaxxon hrmm... I now see this: Warning: you are leaving 3 commits behind, not connected to
10:36 xaxxon any of your branches:
10:37 rebrec i was in master branch, i reverted to some previous one "77d8d9c" i made modifications and it worked, so, i have then done git add and git commit my modified files and then git push. When i do a git status, it tells me i am on a detached head. i decided to switch to master but now i cannot find my modification, even in git log i can't manage to find where my commit is and how to set this commit to not being detached, can someone help on
10:37 rebrec this please (if i am clear enough...)
10:37 User458764 joined #git
10:38 rebrec xaxxon: i think i am in the same kind of situation as you...
10:38 xaxxon rebrec: wow... yep, almost exactly
10:38 xaxxon rebrec: do you have that message that I posted just a sec ago?
10:39 xaxxon rebrec: Warning: you are leaving 3 commits behind, not connected to any of your branches:  <list of commits>
10:39 rebrec nope, not at all
10:39 rebrec but if i do a git log --graph, i don't see my commit -_-
10:40 xaxxon rebrec: when you "switched to master" you should have seen it if you did waht I did
10:41 xaxxon anyhow, I just did what it said about how to make a new branch from the commit and I've got my stuff back
10:41 rebrec maybe i didn't read carefully enough and my log is over :/
10:42 xaxxon that stinks.   I don't know how to find those.
10:42 romerocesar joined #git
10:43 xaxxon rebrec: http://stackoverflow.com/questions/4845505/gitx-how-do-i-get-my-detached-head-commits-back-into-master
10:43 xaxxon git reflog
10:43 xaxxon or git log -p
10:43 xaxxon (maybe
10:43 xaxxon read the link first -- I don't know much about git)
10:44 bocaneri joined #git
10:44 xaxxon rebrec: also http://stackoverflow.com/questions/5772192/how-can-i-reconcile-detached-head-with-master-origin
10:45 rebrec oh yes xaxxon, now i see my commit ref
10:45 meauses joined #git
10:45 xaxxon yay!
10:46 rebrec that's a good thing
10:46 rebrec now i can checkout master and them merge myref master ?
10:46 xaxxon git branch <newbranchname> 727ab3
10:46 xaxxon that will give it a nice safe place to live
10:46 rebrec i need to create branch ?
10:46 rebrec ok
10:46 xaxxon I don't know if you need to
10:47 xaxxon but that makes things make more sense to me
10:48 ahmedelgabri joined #git
10:49 rebrec yes you are right, for now i try to decompose as much as i can, not taking any shortcuts
10:50 uebera|| joined #git
10:50 uebera|| joined #git
10:50 Siegfried joined #git
10:53 rebrec thanks for your help xaxxon and sorry to not beint able to help you
10:53 mindriot101 joined #git
10:58 Siegfried joined #git
10:58 eivarv joined #git
11:00 blackwind_123 joined #git
11:01 brillenfux joined #git
11:02 mycyber joined #git
11:02 barteks2x Is there REALLY no way to stop git from seeing "removed one file, added another" as "moved file"? Such things make it much harder to see what is changes when looking at the diff (which is what github shows)
11:03 barteks2x The only similarities in that case is braces and license header
11:04 cdown joined #git
11:05 ramsub07 joined #git
11:06 bocaneri joined #git
11:07 barteks2x nevermind, probably problem with github
11:08 mikecmpbll joined #git
11:09 ciechomke joined #git
11:09 hahuang65 joined #git
11:09 GavinMagnus joined #git
11:10 davimore_ joined #git
11:13 grumble joined #git
11:13 bocaneri joined #git
11:16 blackwind_123 joined #git
11:23 brillenfux_ joined #git
11:27 meauses joined #git
11:28 paul424 joined #git
11:33 nwkj86 joined #git
11:35 stefanct joined #git
11:35 King_Hual joined #git
11:35 King_Hual joined #git
11:36 stefanct there once was a patch for a fetch hook... that never got merged unfortunately, because id need it now :)
11:37 stefanct that or another way to hook into fetches, but since aliasing git commands is also out of the question i am kinda stuck
11:37 stefanct here comes the use case...
11:37 stefanct i want to implement a more readable version numbering based on the upstream repo's tags and branches
11:38 stefanct to that end i currently keep a shadow copy in refs/upstream_repo/master
11:39 stefanct the generation of the version strings based on that works fine (some shell script git rev-parse etc. hackery executed during build time)
11:39 stefanct however, keeping the shadow copy up to date is a problem...
11:41 stefanct to get consistent results i would need to update it on pushes and fetches (to/from the upstream repo), and local commits on top of the tip of the shadowed upstream branches
11:41 stefanct the latter is no problem (post-commit hook)
11:41 stefanct but i struggle with the former
11:41 stefanct because there are no suitable client-side hooks
11:42 leeN joined #git
11:42 nwkj86 joined #git
11:47 User458764 joined #git
11:48 User458764 joined #git
11:49 iLembus joined #git
11:50 mycyber joined #git
11:50 thebope joined #git
11:53 mindriot101 joined #git
11:56 xall joined #git
11:56 irco joined #git
11:56 manuels joined #git
12:02 xtriz where can i get well configured .gitconfig ?
12:02 Jameser joined #git
12:02 mindriot101 joined #git
12:03 bremner git should work fine with an empty .gitconfig
12:03 bremner I guess it's helpful to set your name and email.
12:04 xtriz bremner, already done that, just looking for some additional things which i might not aware of..
12:06 vuoto joined #git
12:09 Silenced joined #git
12:09 bremner I generally find copying people's configs to be a bad idea, because you get a bunch of settings you don't need or understand. *shrug* it's a personal thing I guess
12:10 Silenced joined #git
12:10 bocaneri joined #git
12:15 GavinMagnus joined #git
12:17 sunri5e joined #git
12:26 j416 xtriz: man git-config
12:26 gitinfo xtriz: the git-config manpage is available at http://jk.gs/git-config.html
12:28 SuperSeriousCat joined #git
12:35 GodEater joined #git
12:35 GodEater joined #git
12:42 ToBeCloud joined #git
12:43 dreiss joined #git
12:45 shinnya joined #git
12:47 PCatinean joined #git
12:48 anuxivm joined #git
12:48 xtriz bremner, agreed but atleast you can get an idea
12:48 xtriz j416, thanks
12:50 xaxxon left #git
12:53 seishun joined #git
13:01 montrehack joined #git
13:04 mindriot101 joined #git
13:05 pks joined #git
13:08 uxl01 joined #git
13:09 manfredn joined #git
13:09 Plantu joined #git
13:12 brk_ joined #git
13:15 Orbitrix joined #git
13:15 Orbitrix joined #git
13:16 pks joined #git
13:16 fmcgeough joined #git
13:17 aavrug joined #git
13:18 BSAlb joined #git
13:20 joki joined #git
13:21 Oatmeal joined #git
13:23 vdv joined #git
13:29 msm joined #git
13:30 mda1 joined #git
13:30 Endarked joined #git
13:32 courrier joined #git
13:33 cdg joined #git
13:34 re1 joined #git
13:34 sdothum joined #git
13:36 hsk3 joined #git
13:37 cyan__ joined #git
13:37 tvw joined #git
13:37 hsk3 left #git
13:41 aavrug_ joined #git
13:43 Blaguvest joined #git
13:44 Phreya joined #git
13:45 cosmos_ left #git
13:48 thebope joined #git
13:50 raijin joined #git
13:50 raspado joined #git
13:51 dreamseeker_ joined #git
13:54 Silenced joined #git
13:54 Silenced joined #git
13:54 sunri5e joined #git
13:57 ericP joined #git
13:58 re1 joined #git
13:59 thierryp joined #git
14:00 vuoto joined #git
14:03 Silenced joined #git
14:04 User458764 joined #git
14:04 Silenced joined #git
14:06 mindriot101 joined #git
14:06 moop joined #git
14:08 ieee joined #git
14:09 synthroid joined #git
14:10 thebope joined #git
14:12 BSaboia joined #git
14:13 overlord_tm joined #git
14:16 BSAlb joined #git
14:17 guideX joined #git
14:17 guideX I don't understand the value of the local git repo
14:17 guideX it just seems like something extra to yutz with, and a stumbling point
14:18 _ikke_ You mean that you have a full copy of the repository?
14:18 _ikke_ It means that you can do a lot without even needing to hit the internet
14:18 _ikke_ /network
14:18 _ikke_ Speeds up everything
14:18 guideX well, in svn, I do a commit, and then it ends up on the server.. but with git, I must do one push to a local repo, then another to reach the server, sometimes I can't reach the remote server, which makes that problematic
14:18 _ikke_ Also gives you a private space to work on without affecting anyone else
14:19 converge joined #git
14:19 converge joined #git
14:19 _ikke_ guideX: Well, especially then you should be glad you have a local repositoryt
14:19 _ikke_ You can at least work
14:19 guideX well it's a bad thing, if I can't reach the remote git repo, then I have no idea the status of that repository, or those code changes, they're just lost on some local repo
14:20 HoierM joined #git
14:20 guideX so if I go to another machine, that code hasn't reached the remote git repo
14:20 _ikke_ In svn, you cannot even commit if you cannot reach the remote server
14:21 guideX the thing about that is, that lets me know there's a problem, and the code will sit on that machine until then
14:21 guideX which is good
14:21 _ikke_ guideX: just replace commit in svn with push in git, and you have exactly hte same
14:21 _ikke_ the
14:21 _ikke_ Just a change of view
14:21 guideX with git, I have this false sense of security that, I can send it up, and then it like, I don't know what changes are waiting to go up etc, I have a repo like that now, not real sure what to do
14:23 guideX well thanks for the explaination, it doesn't seem like value that I can commit without reaching the repo though
14:23 quetz joined #git
14:23 guideX seems like the whole point is to reach the remote server, so to me commiting to local has no value
14:24 kulelu88 joined #git
14:28 vuoto joined #git
14:28 krillr joined #git
14:29 Endarked joined #git
14:30 matumbo joined #git
14:30 r3c0d3x joined #git
14:31 devhoag joined #git
14:31 blackjid joined #git
14:32 guideX Git has alot of stuff going on, it's hard to understand what happens now that the local repo is there.. https://i.stack.imgur.com/UvZ0M.png .. for instance, when I have a conflict with my local repo, or what if my local repo has a conflict with the remote repo
14:32 venmx joined #git
14:32 guideX the possibilities on what can go wrong seem endless
14:33 Puffball_ joined #git
14:35 ieee joined #git
14:36 Puffball joined #git
14:41 Silenced joined #git
14:43 jost joined #git
14:43 xall joined #git
14:44 romerocesar joined #git
14:45 shbt joined #git
14:45 thierryp joined #git
14:46 RxMcDonald joined #git
14:47 RxMcDonald Hello, anyone knows how to ignore files with names like "04ffc00f50fd7d268d0aa534a707f2c2"?
14:48 fees joined #git
14:53 GavinMagnus joined #git
14:53 converge joined #git
14:53 vlt RxMcDonald: Because I don’t know how to write that as a pattern I would run a script that appends the exact name to .gitignore ;-)
14:54 User458764 joined #git
14:55 NeverDie joined #git
14:57 NeverDie_ joined #git
14:59 re1 joined #git
14:59 _ADN_ joined #git
15:01 raijin joined #git
15:01 garethdaine joined #git
15:01 overlord_tm joined #git
15:01 mmlb joined #git
15:03 Domhack joined #git
15:04 nicoulaj joined #git
15:06 User458764 joined #git
15:07 mindriot101 joined #git
15:08 jstein_ joined #git
15:08 Endarked joined #git
15:10 TestingIRC joined #git
15:10 ericP RxMcDonald, is there some way to make all the tmp files (which is what i assume are the long, hex names) appear only in an otherwise empty directory?
15:11 RxMcDonald vlt: mmh you would still have to write that as a pattern? added ./???????????????????????????????? and it's not working =(
15:11 bitsimple joined #git
15:11 bitsimple 1
15:11 bitsimple is this sentence correct: "The Git repository is available at https://sourceforge.net/p/opencamera/code/" ?
15:11 bitsimple I mean how is "sourceforge.net" a Git repository ?
15:11 RxMcDonald ericP: maybe, but I would rather use a pattern? Seems easier, I don't even know which file is creating them
15:11 bitsimple or is it ?
15:11 jpX joined #git
15:11 TestingIRC left #git
15:13 nicoulaj joined #git
15:15 WoodLeg joined #git
15:16 osse bitsimple: it's correct if you can do  "git clone https://sourceforge.net/p/opencamera/code/"  and it works
15:16 osse that's usually what sentences like that mean
15:17 mikecmpbll joined #git
15:17 satifant joined #git
15:18 RxMcDonald could it be that it doesn't work because the file is created as root?
15:19 RxMcDonald it should match it with ./????????????????????????????????
15:19 xtriz joined #git
15:23 ych joined #git
15:23 jstein__ joined #git
15:23 raspado joined #git
15:25 acetakwas joined #git
15:27 CamonZ joined #git
15:29 justanotheruser joined #git
15:37 r3c0d3x joined #git
15:37 nettoweb joined #git
15:39 thebope joined #git
15:41 cyan__ joined #git
15:42 anonymuse joined #git
15:46 CheckDavid joined #git
15:47 col joined #git
15:49 vaesper joined #git
15:50 hahuang65 joined #git
15:51 cjohnson bitsimple: git repositories can be served over http, to answer your "how"
15:52 cjohnson guideX: the point of committing locally is so you can work on things in an incremental state and be able to track chunks of work, before pushing all your changes up
15:53 cjohnson guideX: it also lets you work with those changes in chunks later on. let's say I'm working on feature X and to dothat requires me to refactor another feature elsewhere. Often when I do that, I will implement my feature, implement that refactor, and then commit hte refactor independently of the feature change
15:54 cjohnson then I can merge that refactor into the main branch before the rest of my changes are ready to go
15:54 cjohnson well, cherry pick it
15:54 lindenle joined #git
15:55 cjohnson also if I'm working on a file over several days I like to have detailed history to know when I did what. If I do the "all in one commit" approach I lose that
15:57 eivarv joined #git
15:59 re1 joined #git
16:00 Noldorin joined #git
16:06 mustmodify Does "physical feature branching" mean anything to you?
16:06 snowkidind joined #git
16:09 mindriot101 joined #git
16:09 InfoTest joined #git
16:10 ojdo joined #git
16:11 bitsimple left #git
16:13 vlt RxMcDonald: Yes, but that script might only be a few lines long.
16:13 bremner mustmodify: nope
16:13 dfdfdf joined #git
16:14 vlt RxMcDonald: Just compare each project file to a pattern like "^[0-9a-f]{32}$".
16:14 seishun joined #git
16:15 vlt RxMcDonald: If a match is found and it’s currently not in .gitignore ==> add it.
16:15 todd_dsm joined #git
16:16 dfdfdf i mistakenly added a deleted file, how do i undo the staging?
16:16 dfdfdf i did "git add ."
16:16 dfdfdf i did "git add ."
16:16 dfdfdf i mistakenly added a deleted file, how do i undo the staging?
16:16 dfdfdf would "git add -A" rm the delted fiels and add the modified and new ones?
16:17 bremner dfdfdf: git reset -p
16:18 vlt RxMcDonald: Along the lines of: import os, re; with open(".gitignore") as f: gitignore = f.read().splitlines(); pattern = re.compile("^[0-9a-f]{32}$"; for path, dirs, files in os.walk("."): for file in files: if pattern.match(file) and file not in gitignore: with open(".gitignore", "a") as f: f.write(file) ...
16:19 dfdfdf bremner: and it does not undo the delete operation? just he staging?
16:19 dfdfdf bremner: and it does not undo the delete operation? just he staging?
16:19 bremner unless you use --hard
16:21 adac joined #git
16:22 anuxivm joined #git
16:22 fmcgeough joined #git
16:22 harrymoreno joined #git
16:24 madewokherd joined #git
16:24 Learath2 joined #git
16:26 dfdfdf git reset -p is not what iw ant
16:28 ronny hi
16:29 thierryp joined #git
16:29 ronny how sensible would it be to auto force rebases if detected, and is there a reasonabl simple way to do it?
16:31 _ikke_ Auto force when?
16:34 pR0Ps joined #git
16:34 eivarv joined #git
16:36 kyan joined #git
16:37 lucido joined #git
16:38 lucido Hi, I stashed my uncommited changes to look at another branch and I forgot to apply the stash before I resumed work on the branch. How can I ignore my changes and continue working with the state before the stash?
16:40 osse lucido: remove your current changes, then git pop stash
16:40 lucido osse, is git pop stash the same as git stash apply? how can I remove my changes?
16:41 lucido git reset ---hard?
16:41 lucido --
16:41 mikecmpbll joined #git
16:41 osse lucido: git status tells you how
16:41 rominronin joined #git
16:42 osse lucido: i mean 'git stash pop'. it is similar to 'git stash apply', but it also removes the stash if it applied successfully
16:42 osse it's like 'git stash apply && git stash drop'. in fact, that's literally what it is
16:42 lucido thanks osse
16:43 osse reset --hard will do the trick too
16:50 Gsham joined #git
16:51 nunchuck joined #git
16:52 rominronin joined #git
16:52 Aboba_ joined #git
16:54 nd joined #git
16:56 lindenle joined #git
16:56 gfixler joined #git
16:57 WoodLeg joined #git
16:58 ych joined #git
16:59 re1 joined #git
17:00 ugjka joined #git
17:02 leb joined #git
17:08 Orbitrix joined #git
17:09 Orbitrix joined #git
17:10 mindriot101 joined #git
17:14 sq-one joined #git
17:14 manuels joined #git
17:15 sammyo joined #git
17:18 converge joined #git
17:18 converge joined #git
17:19 mustmodify left #git
17:19 watabou joined #git
17:21 JanC_ joined #git
17:24 RxMcDonald vlt: looks too complicated
17:24 RxMcDonald vlt: id rather find an easier way
17:24 seishun joined #git
17:25 rivarun joined #git
17:26 User458764 joined #git
17:28 vuoto joined #git
17:30 Endarked joined #git
17:30 cdown joined #git
17:31 Vampire0 joined #git
17:37 _ADN_ joined #git
17:39 seishun joined #git
17:41 jaafar joined #git
17:41 anonymuse joined #git
17:42 eivarv joined #git
17:43 clemf joined #git
17:44 sangy joined #git
17:45 romerocesar joined #git
17:51 shubhnik joined #git
17:52 johnny56 joined #git
17:53 jaafar joined #git
17:53 cdown_ joined #git
17:53 davimore__ joined #git
17:54 jrm2 joined #git
17:55 tilpner joined #git
17:55 dreiss joined #git
17:56 dan2k3k4 joined #git
17:56 axisys joined #git
17:56 wloncom joined #git
17:56 masak joined #git
17:56 PerlJam joined #git
17:56 reverse_light joined #git
17:56 Kuukunen joined #git
17:56 rawtaz joined #git
17:56 ManiacTwister joined #git
17:56 nd joined #git
17:56 AndreSomers joined #git
17:57 fus joined #git
17:57 noctux joined #git
17:57 ujjain joined #git
17:57 ujjain joined #git
17:57 Hogofwar joined #git
17:57 rominronin joined #git
17:57 unreal joined #git
17:57 ahf joined #git
17:57 SirFunk joined #git
17:58 manfredn joined #git
17:58 ulkesh_ joined #git
17:58 Ciblia joined #git
17:59 re1 joined #git
18:01 qlkzy joined #git
18:02 ghostlight joined #git
18:08 Vampire0_ joined #git
18:09 Goplat joined #git
18:11 mindriot101 joined #git
18:11 macivy joined #git
18:13 sea-gull joined #git
18:13 SwiftMatt joined #git
18:14 aavrug_ joined #git
18:15 perrier-jouet joined #git
18:15 mindriot101 joined #git
18:15 jaafar joined #git
18:15 mihaicris joined #git
18:19 ayjay_t joined #git
18:22 griffindy joined #git
18:22 adac joined #git
18:24 quetz^^ joined #git
18:25 elastix joined #git
18:27 leb joined #git
18:28 nettoweb joined #git
18:30 GavinMagnus joined #git
18:34 fmcgeough joined #git
18:40 eivarv joined #git
18:41 Guest12430 joined #git
18:44 Guest12430 left #git
18:45 Guest12430 joined #git
18:46 mischat joined #git
18:46 dikiaap joined #git
18:48 cust_ joined #git
18:50 rebrec joined #git
18:50 Silenced joined #git
18:53 vuoto joined #git
18:54 tvw joined #git
18:57 rominronin joined #git
18:59 re1 joined #git
19:00 xtriz joined #git
19:01 dviola joined #git
19:06 manuel joined #git
19:07 [cust] joined #git
19:09 hendry joined #git
19:11 Sonderblade joined #git
19:12 eivarv joined #git
19:14 mindriot101 joined #git
19:16 dooglius joined #git
19:21 Giordano joined #git
19:22 PaulCapestany joined #git
19:24 Giordano Hi everyone, I have one question. Can rebase one branch on top of another solve some types of merge conflicts? Intuitively, it seems to me that if there is a merge conflict, rebase won't solve it, but I'm not sure.
19:25 thiago where were the conflicts in the first place?
19:25 nedzadhrnjica joined #git
19:25 thiago conflicts exist only during a merge or a rebase or cherry-pick, so you're doing some other operation
19:26 Giordano yeah, I think I didn't expressed myself correctly
19:26 _ikke_ rebase can even have more merge conflicts, because you apply each commit individually
19:26 brAldHtS joined #git
19:28 QCnYDURM joined #git
19:28 overlord_tm joined #git
19:29 Giordano let me reformulate my question. If I got a merge conflict trying to merge branch B into branch A, is there a situation where rebasing B on top of A, before trying to merge them together, would prevent the merge conflict?
19:30 thiago it's theoretically possible
19:30 thiago it's extremely unlikely, though. Rebases often have more conflicts than the merges.
19:30 Giordano but unlikely to occur?
19:30 Giordano ok
19:30 thiago the merge at the end will have no conflicts
19:30 thiago but the rebasing will
19:31 ssFQHOgT joined #git
19:31 _ikke_ because the merge in the end will be a simple ff-merge
19:32 thiago yep
19:32 _ikke_ Imo it's confusing to even call it a merge
19:32 _ikke_ It's just a plain fast-forward
19:32 j416 on the other hand, if there are a lot of unrelated conflicts (introduced by many commits), rebase may make them easier to handle since you get to handle each commit separately
19:33 _ikke_ But at the same time possibly increasing the total amount of conflicts
19:33 j416 nod
19:33 j416 but at the same time reducing the risk for human error
19:33 j416 possibly.
19:33 jccn joined #git
19:33 _ikke_ hypothetically :P
19:34 astrofog joined #git
19:34 Giordano so it is safe to say that I can't solve conflicts without human intervention?
19:34 _ikke_ But I agree, smaller conflicts are easier to deal with
19:34 _ikke_ Giordano: Correct
19:34 PaulCapestany joined #git
19:34 _ikke_ Giordano: A conflict happens because machines do not know how to handle them
19:34 j416 :D
19:34 umCYPrwL joined #git
19:35 j416 also, the history tends to be more useful if there are not a lot of merge conflict resolutions in merge commits
19:36 j416 because you want to avoid the number of changes introduced in a merge commit (it doesn't have much information about why those changes were done in that way, other than "to fix the conflict")
19:36 j416 unless you add that information of course, but mostly people don't
19:36 mindriot101 joined #git
19:36 j416 in my experience it's always nicer to have the original commit explain the change
19:36 mindriot101 joined #git
19:37 raijin joined #git
19:37 _ikke_ Right
19:37 _ikke_ agree
19:37 _ikke_ Never thought of that
19:38 _ikke_ Going to give a introduction into git to colleagues. Any suggestions?
19:38 bremner call in sick
19:38 Giordano ok, thank you very much for your help guys
19:38 _ikke_ bremner: I suggested giving the introduction :)
19:39 KuyGkoKi joined #git
19:39 _ikke_ Most don't have any experience with programming or version control, but run into it from time to time
19:40 _ikke_ (ie, they're interested themselves in the subject)
19:40 kulelu88 left #git
19:40 j416 :D @ call in sick
19:41 bremner dunno, I usually throw man gittutorial at people
19:41 gitinfo the gittutorial manpage is available at http://jk.gs/gittutorial.html
19:42 Giordano _ikke_: there are some videos from GitMerge 2016 conference at GitHub channel. There is one called "Dissecting Git's Gut" that is really nice. I don't know if it's to advanced for your audience, but maybe the content can give you some insights
19:42 thebope joined #git
19:43 thierryp joined #git
19:43 j416 _ikke_: focus on problems they have currently; avoid "look at this elegant object model"; in my experience explaining things without a solid "this can help solve your problem X" tends to make it hard to keep people interested
19:44 j416 or, that's probably what I would try.
19:44 PaulCapestany joined #git
19:46 JKHfxIZQ joined #git
19:48 Mobutils joined #git
19:48 atrus j416: i've never looked at their git stuff specifically, but i like software carpentry's angle on stuff like this often: https://swcarpentry.github.io/git-novice/
19:49 sdothum joined #git
19:49 _ikke_ j416: Yeah, I didn't plan to go into the object model
19:49 j416 atrus: always good with extra resources! :)
19:49 _ikke_ But I do plan to show how commits and branches work
19:50 _ikke_ a la !gcs
19:50 gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
19:51 atrus j416: SC is generally targeted at making software-development methodology approachable for non-compsci/non-compeng academia (eg, researchers that increasingly write software as a part of their job, and publish software along with their research), so it's very practical, but with CS chops behind it.
19:51 nettoweb joined #git
19:51 j416 _ikke_: I use this a lot when explaining git concepts to colleagues http://learngitbranching.js.org/?NODEMO
19:51 j416 _ikke_: such as difference between merge and rebase, or git reset, etc
19:52 * BlessJah recently had to explain git to students who didn't know what VCS is
19:52 j416 atrus: cool.
19:52 atrus https://rgaiacs.github.io/swc-git-intermediate/ looks like a reasonable next-step in the SC project.
19:52 rominronin joined #git
19:53 seishun joined #git
19:54 BlessJah it's a challenge to explain this stuff to folks some of which never reached project-2-Copy-Copy-final.zip sent over e-mail, which is... surprising
19:55 _ikke_ j416: I don't think I'm even going to mention rebasing
19:55 j416 _ikke_: sounds like a sane start :)
19:56 dan2k3k4 joined #git
19:56 j416 _ikke_: init, add, commit, checkout is perhaps enough for the first session
19:56 _ikke_ log also
19:56 BlessJah j416: that's how fear for rebase starts
19:56 j416 ah yes
19:56 Giordano _ikke_: Also, I suggest you to take a look at the MIT initiative to simplify GIT: https://news.mit.edu/2016/gitless-making-it-easier-to-collaborate-on-code-1025
19:56 j416 maybe not checkout
19:56 j416 or, maybe checkout.
19:56 drmt joined #git
19:56 j416 checkout last.
19:56 _ikke_ Giordano: I want to explain vanilly git
19:56 _ikke_ vinalla*
19:57 j416 how's that going :D
19:57 j416 venalli
19:57 bremner Giordano: tbh, I think the benefit of explaining tools that not widely used is pretty limited
19:57 _ikke_ And only confusing imo
19:57 BlessJah Giordano: it would actually make sense to get sane UI?UX, not run around git with razor cutting pieces of it
19:57 j416 I don't believe in "simplified git" attempts
19:58 Giordano BlessJah: something like gitkraken?
19:58 blr joined #git
19:59 Giordano _ikke_: gitkraken could be a nice way to show things graphically
19:59 Gsham joined #git
19:59 BlessJah Giordano: something like "git branch deals with branches" not "git branch is for branching, but sometimes it's checkout, reset, which by the way is for staging area, as well as git add and remove"
19:59 re1 joined #git
19:59 Walex joined #git
20:00 _ikke_ Giordano: Ok, might look into it
20:00 _ikke_ I was also looking at graphviz for visualization
20:01 mindriot101 joined #git
20:01 mindriot101 joined #git
20:02 Giordano BlessJah: Yeah, I didn't had the time to read their study (http://people.csail.mit.edu/sperezde/pre-print-oopsla16.pdf), but I think their methodology could be interesting
20:02 Giordano BlessJah: But I can't say too much about it
20:02 mischat joined #git
20:02 BlessJah Giordano: still, they're making distributed svn out of git
20:03 BlessJah staging area is feature, not a bug
20:03 _ikke_ Right
20:03 _ikke_ agree
20:03 cyan__ joined #git
20:04 _ikke_ imo proper use of it leads to better history
20:04 j416 I want something like that javascript visualiser thing I linked above, but that can take an existing repo and render it
20:04 BlessJah they effort actually reimplements VCS on top of git data model
20:04 _ikke_ Hiding it from users makes it look it's some obscure feature you only need in very special cases
20:04 _ikke_ j416: Yeah, that would be nice
20:05 Giordano BlessJah: I also agree
20:05 BlessJah _ikke_: check out gitkraken and sourcetree
20:06 _ikke_ I know source tree
20:06 _ikke_ Looks nice, but otherwise not much impressed
20:07 SUetTGqT joined #git
20:07 BlessJah most of folks I deal with are windows with hatred for CLI and used to TortoiseSVN which is fine, but TortoiseGIT is horrible
20:07 [cust] joined #git
20:08 _ikke_ My coleagues are windows people, but not afraid of the CLI (most at least)
20:10 Mobutils joined #git
20:10 ericP gravity, i the answer to my question where i delete stuff from branch A but create a branch D in which to keep it was "merge -s ours"
20:11 mischat joined #git
20:11 ericP in toto: checkout -b D; push origin D; checkout A; /* delete and tweak */; commit; checkout D; merge -s ours A~0
20:11 NeXTSUN joined #git
20:14 converge left #git
20:16 bmahe joined #git
20:18 dar123 joined #git
20:20 msonntag joined #git
20:21 FuzzySockets joined #git
20:23 jdd3d joined #git
20:23 Guest42062 left #git
20:24 mischat joined #git
20:24 dhollinger joined #git
20:25 leb joined #git
20:26 WaReZ joined #git
20:30 ericP what happens when i merge in an ammended commit if i've already merged the commit in before being amended?
20:32 thiago unpredictable
20:32 Raging_Hog joined #git
20:34 ignarps- joined #git
20:35 mindriot101 joined #git
20:36 cagedwisdom joined #git
20:36 jaafar joined #git
20:39 nsh joined #git
20:39 mindriot101 joined #git
20:42 ericP thiago, a quick experiment shows conflicts on regular merges
20:43 re1 joined #git
20:43 ericP not surprisingly, -s ours gives no conflicts, but that's a pretty rare case
20:43 ericP my client said that there was no -s theirs ("Available strategies are: octopus ours recursive resolve subtree.")
20:44 ericP so i had to resolve all the conflicts manually in favor of theirs. (why doesn't -s theirs exist in git version 2.7.4?)
20:45 thiago -s ours can't conflict
20:45 thiago by definition
20:46 thiago if you want to use -s theirs, just invert the merge
20:50 jsgrant joined #git
20:50 ribasushi joined #git
20:51 ericP thiago, is inverting the merge something i'd do with revert?
20:51 User458764 joined #git
20:54 anonymuse joined #git
20:54 macivy joined #git
20:55 macivy git workflow question, http://lpaste.net/344145
20:56 thiago what's your question?
20:59 _ikke_ macivy: You abandon your topic branches once upstream merged in
20:59 _ikke_ You just pull changes from upstream
20:59 _ikke_ You never commit onto maint or master
21:00 re1 joined #git
21:03 nettoweb joined #git
21:03 anuxivm joined #git
21:04 macivy _kke_ okay that makes sense
21:04 macivy _ikke_, I meant, thanks
21:05 tvw joined #git
21:05 macivy _ikke_ so what's the command to ignore conflicts and merge anyway?
21:06 _ikke_ When are you running into conflicts?
21:06 WoodLeg joined #git
21:11 nedzadhrnjica joined #git
21:12 LaptopBrain joined #git
21:12 hashpuppy joined #git
21:13 macivy when I do a git pull, before deleting the branch
21:17 fmcgeough joined #git
21:21 paul424_ joined #git
21:24 fstd_ joined #git
21:25 nonconvergent joined #git
21:26 processkiller joined #git
21:26 ericP i'm renaming my master branch to V1 and my V2 branch to master
21:26 ericP do i want to push a delete of master off to github in between?
21:28 nedzadhrnjica joined #git
21:28 tobiasvl ericP: doesn't matter, you can delete master, or you can force push it afterwards
21:29 ericP tobiasvl, i noticed that when i renamed V2 to master i got six months worth of unpushed commits
21:30 ok91 joined #git
21:30 re1_ joined #git
21:30 ericP oh yeah, V2 was branched from master (about six months ago, not surprisingly)
21:30 fullstack joined #git
21:31 fullstack joined #git
21:31 aidalgol joined #git
21:34 fullstack joined #git
21:34 nedzadhrnjica joined #git
21:35 dreiss joined #git
21:35 bcc joined #git
21:35 bcc joined #git
21:40 hhee joined #git
21:43 mindriot101 joined #git
21:44 mellernoia joined #git
21:45 romerocesar joined #git
21:47 romerocesar joined #git
21:48 thebope_ joined #git
21:49 fullstack joined #git
21:51 [cust] joined #git
21:52 sawk_ joined #git
21:55 sawk_ joined #git
21:57 vdv joined #git
22:00 Gsham joined #git
22:01 nidr0x joined #git
22:01 NeXTSUN joined #git
22:02 mindriot101 joined #git
22:02 jstimm joined #git
22:05 derk0pf joined #git
22:12 cdown joined #git
22:12 t4c05 joined #git
22:13 Aboba joined #git
22:13 sawk joined #git
22:13 reactormonk joined #git
22:13 reactormonk Any way to figure out which .gitignore file it is?
22:14 mindriot101 joined #git
22:14 User458764 joined #git
22:14 t4c05 left #git
22:14 perrier-jouet joined #git
22:15 beatrice joined #git
22:16 reactormonk https://stackoverflow.com/questions/12144633/which-gitignore-rule-is-ignoring-my-file
22:16 reactormonk left #git
22:17 NeverDie_ joined #git
22:20 LaptopBrain joined #git
22:23 ribasushi joined #git
22:24 mischat joined #git
22:26 A5101 joined #git
22:28 cagedwisdom joined #git
22:28 alex1a joined #git
22:29 tojoko joined #git
22:30 koo joined #git
22:30 mindriot101 joined #git
22:34 test__ joined #git
22:35 test__ joined #git
22:37 User458764 joined #git
22:37 test__ joined #git
22:38 mischat joined #git
22:40 venmx joined #git
22:40 test__ joined #git
22:40 jstimm joined #git
22:41 ok91 joined #git
22:42 beatrice joined #git
22:42 test1 joined #git
22:43 raijin joined #git
22:44 jnewt joined #git
22:47 buzzLightBeer joined #git
22:48 moei joined #git
22:49 moei joined #git
22:49 thebope_ joined #git
22:52 nicksloan joined #git
22:52 jmpp_ joined #git
22:52 jmpp_ joined #git
22:53 test1 joined #git
22:54 test1 joined #git
22:54 whitby joined #git
22:54 mindriot101 joined #git
23:03 nedzadhrnjica joined #git
23:03 jaggz_ joined #git
23:05 nicoulaj joined #git
23:08 gmn8719 joined #git
23:13 jmpp_ joined #git
23:13 jmpp_ joined #git
23:14 urda joined #git
23:17 jstimm joined #git
23:18 DistantStar joined #git
23:19 jmpp_ joined #git
23:20 ayjay_t joined #git
23:22 anonymuse joined #git
23:23 ToBeCloud joined #git
23:24 ToBeCloud joined #git
23:29 al-damiri joined #git
23:31 isysd joined #git
23:41 mellernoia joined #git
23:44 NeXTSUN joined #git
23:48 Cxcf joined #git
23:48 Cxcf joined #git
23:50 thebope_ joined #git
23:50 Cxcf joined #git
23:50 Cxcf joined #git
23:55 leb joined #git

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