| 2016-12-26 |
| ← clemf left | 00:00 |
| → ejb joined | 00:01 |
| ← joki left | 00:03 |
| ← howitdo left | 00:04 |
| → rizonz joined | 00:04 |
|
rizonz
| I'm migrating SVN to git but I wonder what I should do here with the [email@hidden.address] as it's my local git-install git remote add origin [email@hidden.address] | 00:05 |
| ← cdown left | 00:08 |
| → masuberu joined | 00:08 |
| ← d1b left | 00:08 |
| → d1b joined | 00:08 |
| ← nisseni left | 00:08 |
| ← finalbeta left | 00:10 |
| → fatalhalt joined | 00:10 |
| → howitdo joined | 00:11 |
| ← Glooomy left | 00:11 |
| → cdown joined | 00:14 |
| ← howitdo left | 00:15 |
| ← stick-shift left | 00:15 |
| ← cdown left | 00:16 |
| → cdown joined | 00:17 |
| → howitdo joined | 00:17 |
| → FSadino joined | 00:17 |
| ← cdown left | 00:18 |
| → denimsoft joined | 00:19 |
| → bronson joined | 00:19 |
|
kexmex
| rizonz: i've used some script | 00:22 |
|
| svn2git or something like that | 00:22 |
|
| https://github.com/nirvdrum/svn2git | 00:23 |
|
| worked well and kept timestamps and all | 00:23 |
|
| also lets you create a file that maps authors (svn usernames to git users) | 00:23 |
| ← bronson left | 00:24 |
| → d0xygen joined | 00:24 |
| ← d0xygen left | 00:24 |
|
rizonz
| kexmex: yes but I do ldap so that will be fixed | 00:30 |
| ← kexmex left | 00:30 |
|
rizonz
| but I don't see how it comes into my new created project | 00:30 |
| ← dreiss left | 00:31 |
|
rawtaz
| i recall i used the instructions from atlassian | 00:33 |
| ← YuGiOhJCJ left | 00:33 |
| → watabou joined | 00:34 |
| → guest_ joined | 00:34 |
| → guest__ joined | 00:35 |
|
rizonz
| rawtaz: erm | 00:36 |
|
| rawtaz: :D | 00:36 |
|
| Kulrak: but where do I run that svn2git command ? how do I get it into git ? | 00:37 |
|
rawtaz
| its a script or similar | 00:38 |
|
rizonz
| yeah I used that I can get all in a dir where I am but then ? | 00:38 |
| → nowhereman joined | 00:38 |
| ← guest_ left | 00:39 |
|
rawtaz
| what? i dont understand the question | 00:39 |
|
rizonz
| I can svn2git my svn repo in some /home/myfolder but then ? | 00:39 |
|
| I need to push it | 00:40 |
| → diogenese joined | 00:40 |
|
rawtaz
| well assuming it went the way it should then i presume you have a local git repository there in your folder? | 00:40 |
| ← guest__ left | 00:40 |
| ← Darcidride left | 00:40 |
|
rizonz
| rawtaz: true | 00:40 |
|
rawtaz
| which you can push to whatever server or similar such as github or your own | 00:40 |
| ← nowhereman left | 00:41 |
|
rawtaz
| try `git log` in your migrated to repo and see if it looks right | 00:41 |
| → nowhereman joined | 00:41 |
|
rizonz
| rawtaz: yes :D | 00:41 |
|
| I'm pretty exited about git | 00:42 |
| → pbrewczynski joined | 00:42 |
| ← FSadino left | 00:42 |
|
rawtaz
| it is really really nice mate, i give you that :) | 00:42 |
|
rizonz
| has been improved a lot last 4 years | 00:42 |
|
rawtaz
| not good with large files but that hasnt been a problem for me | 00:42 |
| → nowhere_man joined | 00:42 |
| ← nowhereman left | 00:42 |
|
rizonz
| yeah I need the extra tools in the panels and need to see what is merged | 00:42 |
|
rawtaz
| what panels? | 00:42 |
|
rizonz
| what is la rge ? | 00:42 |
|
| rawtaz: gitlab | 00:42 |
|
rawtaz
| i dont know, ive only had files a few tens of MBs big | 00:43 |
|
| aha | 00:43 |
|
rizonz
| I need to pee | 00:43 |
|
| brb | 00:43 |
| → ToBeCloud joined | 00:43 |
| gitinfo set mode: +v | 00:43 |
|
rawtaz
| rizonz: personally i just did a crash course on the basics, then looked things up as i went along. quite a bumpy road but sooner or later you start to get a somewhat bigger picture of how it fits together, so just have at it :) | 00:43 |
|
rizonz
| yeah | 00:44 |
| → sernik joined | 00:47 |
| ← Goplat left | 00:48 |
|
rizonz
| rawtaz: ok, so what now ? | 00:50 |
|
| I have my local repo and need to get it into my project | 00:50 |
| ← ThomasTang left | 00:51 |
| ← denimsoft left | 00:52 |
| ← sybariten left | 00:53 |
|
rawtaz
| rizonz: i still dont understand the question. if you have a local repo that is good then you can do whatevre you want. if you want to puch it to a server then do that | 00:53 |
|
| i especially dont understand what you mean by "i have my local repo and need to get it into my project" - it should presumably BE your project or part of it | 00:53 |
|
rizonz
| rawtaz: yeah I need to push it onto this server | 00:56 |
|
| but how ? | 00:56 |
|
| don't see it really :D | 00:56 |
|
rawtaz
| rizonz: did you even google this? there's like a million hits on that question | 00:57 |
|
| i mean cmon | 00:57 |
| → Rodya_ joined | 00:57 |
|
rizonz
| yeah I know and I google but I don't see it about the [email@hidden.address] | 00:57 |
|
| and such | 00:57 |
|
rawtaz
| just create a repo in your gitlaba dn then add it as a remote in your local git repo, then you can push to it | 00:58 |
|
| git help remote | 00:58 |
|
| git help push | 00:58 |
|
| i think those are the relevant ones | 00:58 |
|
| and some overview on google/duck | 00:58 |
|
rizonz
| ok | 00:58 |
|
| but I need to create that repo in my project first ? | 00:59 |
|
rawtaz
| yah, thats usually the ay | 00:59 |
|
| way* | 00:59 |
|
| not sure what you mean by project though, i guess thats in gitlab | 00:59 |
|
rizonz
| yap | 00:59 |
|
| project seems to be repo there | 00:59 |
|
rawtaz
| let me put it this way; to push your local repo to a remote place, you need tp point to a remote repo for git to have something to push to | 00:59 |
|
| that sounds right | 00:59 |
|
rizonz
| yap | 01:00 |
|
rawtaz
| yip | 01:00 |
|
rizonz
| ah I se | 01:00 |
| ← GavinMagnus left | 01:01 |
| ← Rodya_ left | 01:01 |
|
rizonz
| but [email@hidden.address] is the user ? | 01:01 |
|
rawtaz
| dont ask me | 01:01 |
|
| suppose gitlab tells you that | 01:02 |
|
preaction
| git is the user gitlub.com is the host | 01:02 |
| → fling joined | 01:02 |
|
rizonz
| ok, but that will work with ldap ? | 01:02 |
|
| like [email@hidden.address] ? | 01:02 |
|
preaction
| that sounds like a question for gitlub's docs | 01:03 |
|
rizonz
| rawtaz: no all howto's | 01:03 |
| ← dminuoso left | 01:03 |
| ← [log] left | 01:03 |
| → [log] joined | 01:03 |
| ← [log] left | 01:05 |
| → [log] joined | 01:06 |
| → Atm0spher1c joined | 01:06 |
| qpdb → Guest2952 | 01:06 |
| ← Guest2952 left | 01:06 |
| → qpdb joined | 01:06 |
| → dodobrain joined | 01:07 |
|
rizonz
| ok doing better now | 01:08 |
|
| my repo is in /root/my-repo.git but when I add it and push it doesn't recognize it | 01:08 |
|
rawtaz
| what does that mean | 01:08 |
| ← davimore__ left | 01:09 |
|
rizonz
| does not appear to be a git repository | 01:09 |
|
| fatal: Could not read from remote repository. | 01:09 |
|
rawtaz
| well then youre doing something wrong, and if you want help you should naturally be more precise in explaining the symptoms | 01:10 |
| → mingrammer joined | 01:10 |
| → davimore joined | 01:10 |
|
rizonz
| I'm just doing the last part here https://docs.gitlab.com/ee/workflow/importing/migrating_from_svn.html | 01:11 |
|
rawtaz
| dont make people have to drag information out of you, instead provide the needed info | 01:11 |
|
| what commands are you running and whats the output, for example | 01:11 |
|
| you can use a pastebin to show multiple lines | 01:11 |
|
rizonz
| git remote add origin [email@hidden.address] | 01:12 |
|
| git push --all origin | 01:12 |
|
| rawtaz: nah it's more that you can see where I come from :) | 01:12 |
| ← ayjay_t left | 01:12 |
|
rawtaz
| rizonz: what are the exact commands you ran? you didnt run the exact things you pasted above did you? | 01:13 |
|
rizonz
| git remote add origin [email@hidden.address] | 01:15 |
|
| and then push --all origin | 01:15 |
|
rawtaz
| are you sure the grop part is right, is there really a group named root? | 01:15 |
|
| rizonz: if you go to your repo in gitlab, doesnt it show some kind of URL or similar that you can copy and paste in the command straight away? | 01:16 |
|
rizonz
| rawtaz: yes i used that one without the http:// | 01:17 |
| → menip joined | 01:18 |
|
rawtaz
| rizonz: and the repo is hosted at gitlab.com, its not your own server? | 01:19 |
|
rizonz
| no my own server as you can see | 01:19 |
|
rawtaz
| ah yes | 01:20 |
| → bronson joined | 01:20 |
|
rawtaz
| so what about the group name i asked about? | 01:20 |
|
| is it really root? | 01:20 |
|
rizonz
| rawtaz: yes, I just added one as root | 01:20 |
|
| can't I move it over later on ? | 01:20 |
|
rawtaz
| sure you can push whenever you want, and work on it now before that | 01:21 |
|
rizonz
| yes but with all old commits again ? | 01:21 |
|
rawtaz
| not sure waht you mean | 01:21 |
|
| you have a complete copy of the repository now i presume | 01:21 |
|
rizonz
| rawtaz: I want to keep my history | 01:22 |
|
rawtaz
| you can continue working on it all you want | 01:22 |
|
| of course, that is what the VCS/git there is for | 01:22 |
|
rizonz
| when I change from /root to /ohmynewgroup | 01:22 |
|
| :) | 01:22 |
|
| nice | 01:22 |
|
| svn is more difficult there | 01:22 |
|
rawtaz
| yes, the history in your repo is what it is, regardless of where you push it | 01:22 |
|
rizonz
| :D | 01:22 |
|
| that is what I needed for 3 years | 01:22 |
|
| but git panels have been improbed as well | 01:23 |
|
| *improved | 01:23 |
| ← Spec-Chum left | 01:23 |
|
rawtaz
| theres a bunch of them now i think | 01:23 |
|
rizonz
| yap | 01:23 |
|
| gitlab looks best | 01:23 |
| emiserson → emerson | 01:23 |
|
rawtaz
| not sure what you need them for though unless youre a team | 01:23 |
|
rizonz
| and when you can create debs from it I'm happy :) | 01:24 |
|
| yeah I need to have it team ready | 01:24 |
|
| I have a about 300 server for one repo that is being pulled from ;) | 01:24 |
|
rawtaz
| what? | 01:25 |
|
| you have what? | 01:25 |
| ← bronson left | 01:25 |
|
rizonz
| 300 servers that run one project | 01:25 |
|
rawtaz
| okay | 01:26 |
| ← Discovery left | 01:26 |
| ← IlNominePatre left | 01:26 |
|
rizonz
| so this needs to be team ready and that is why I move over | 01:27 |
|
| but no push yet | 01:27 |
| ← netj left | 01:27 |
| → netj joined | 01:28 |
| → denimsoft joined | 01:28 |
| ← denimsoft left | 01:28 |
|
rawtaz
| okay :) | 01:28 |
| ← [log] left | 01:30 |
|
rizonz
| holy cow this is really like it should work | 01:30 |
| → [log] joined | 01:30 |
|
rizonz
| so everyone who pushes can be merged later on | 01:30 |
|
rawtaz
| yes | 01:32 |
|
| distributed ftw | 01:32 |
|
rizonz
| rawtaz: would be nice if gitlab has nested groups | 01:32 |
|
rawtaz
| you mean like hierachical groups? | 01:33 |
| → dirtyroshi joined | 01:34 |
|
rizonz
| rawtaz: yap | 01:34 |
|
rawtaz
| what do you need that for | 01:34 |
|
| ? | 01:34 |
|
rizonz
| so you have project/main-devs | 01:34 |
|
| and etc | 01:34 |
|
rawtaz
| meh | 01:34 |
|
rizonz
| it's sexy | 01:34 |
| → adino joined | 01:36 |
|
rawtaz
| bah | 01:38 |
| ← adino left | 01:38 |
|
rizonz
| no sexy means yummie! | 01:38 |
|
| liek candy | 01:38 |
|
| *like | 01:38 |
| → xaviergmail joined | 01:38 |
| → adino joined | 01:39 |
| ← Noldorin left | 01:39 |
|
rizonz
| rawtaz: what do you prefer then ? | 01:39 |
| ← Singmyr left | 01:39 |
|
rawtaz
| rizonz: what i prefer in terms of how nested groups are to be? | 01:40 |
| ← WaReZ left | 01:40 |
| → DolphinDream joined | 01:40 |
|
rizonz
| rawtaz: yap | 01:41 |
| → Nilesh_ joined | 01:43 |
|
rawtaz
| lol | 01:43 |
|
| honestly i dont give a shit, it's not a question for me at all | 01:43 |
| ← d0nn1e left | 01:43 |
| ← tcurdt left | 01:44 |
|
rawtaz
| looking at github i'd rather have the ability to add tags to repos, so it's fine with one level of "groups", then one could easily find stuff with tags | 01:44 |
| → d0nn1e joined | 01:45 |
|
rizonz
| rawtaz: you use github ? | 01:46 |
|
rawtaz
| not for my own projects, just to contribute or check out other projects | 01:47 |
| → NeverDie joined | 01:47 |
|
rawtaz
| i just use git as it is and push to servers when i need to share a repo | 01:47 |
|
rizonz
| rawtaz: ah ok, I don't like to have my data public | 01:48 |
|
rawtaz
| same here, thats why i dont use github | 01:48 |
|
rizonz
| :D | 01:48 |
|
rawtaz
| for my own stuff* | 01:48 |
| → davimore_ joined | 01:50 |
| → FSadino joined | 01:51 |
| → duderonomy joined | 01:52 |
| ← donught left | 01:52 |
| ← kulelu88 left | 01:52 |
| ← davimore left | 01:53 |
| ← fatalhalt left | 01:53 |
|
rizonz
| yeah kewl | 01:54 |
| ← adino left | 01:55 |
| ← ejb left | 01:55 |
| → adino joined | 01:56 |
|
rawtaz
| yap | 01:57 |
| ← diogenese left | 01:58 |
|
rizonz
| yeah it looks promising, SVN is not bad at all but I like to have it all with me and then merge what has been puished | 01:58 |
|
| *pushed | 01:58 |
|
rawtaz
| i love how you can rewrite and rebase in git | 01:59 |
|
rizonz
| even when you have a single member team, you can see what happened in the panel | 01:59 |
| → dminuoso joined | 02:01 |
| → cdown joined | 02:05 |
| ← sernik left | 02:08 |
| → finalbeta joined | 02:08 |
| → mizu_no_oto joined | 02:08 |
| ← mizu_no_oto left | 02:09 |
|
rawtaz
| good luck rizonz | 02:09 |
|
| rawtaz & | 02:09 |
| ← cdown left | 02:10 |
| ← adino left | 02:10 |
| → adino joined | 02:13 |
| dmc → Winston_Bishop | 02:16 |
| ← cyan__ left | 02:16 |
| ← FSadino left | 02:17 |
| → andrew710 joined | 02:17 |
| → Poppa joined | 02:20 |
| → bronson joined | 02:21 |
|
rizonz
| rawtaz: thanks! | 02:22 |
| ← bronson left | 02:26 |
| → kyan joined | 02:26 |
| ← pks left | 02:26 |
| → pks joined | 02:26 |
| ← d^sh left | 02:30 |
| → d^sh joined | 02:30 |
| ← masuberu left | 02:31 |
| → LiMp^_ joined | 02:36 |
| → dan2k3k4 joined | 02:37 |
| Winston_Bishop → dmc | 02:41 |
| → Vampire0 joined | 02:42 |
| → ejb joined | 02:43 |
| ← xaviergmail left | 02:43 |
| → kadoban joined | 02:43 |
| ← Vampire0_ left | 02:45 |
| ← ToBeCloud left | 02:46 |
| ← flavius left | 02:51 |
| → Electrom_ joined | 02:53 |
| ← Electrometro left | 02:53 |
| ← cqi left | 02:54 |
| → cqi joined | 02:55 |
| → Rodya_ joined | 02:58 |
| → ResidentBiscuit joined | 03:01 |
| ← Rodya_ left | 03:03 |
| ← y0zg left | 03:04 |
| → AndChat601929 joined | 03:04 |
| → mizu_no_oto joined | 03:05 |
| ← ResidentBiscuit left | 03:05 |
| ← AndChat601929 left | 03:05 |
| → nd joined | 03:06 |
| ← chachasmooth left | 03:07 |
| → chachasmooth joined | 03:09 |
| → JanC_ joined | 03:10 |
| ← JanC left | 03:10 |
| JanC_ → JanC | 03:10 |
| ← nd_ left | 03:10 |
| ← chachasmooth left | 03:11 |
| ← moestevens left | 03:11 |
| ← nydel07 left | 03:11 |
| ← yanome left | 03:11 |
| → moestevens joined | 03:12 |
| ← pothepanda left | 03:12 |
| ← grawity left | 03:12 |
| ← nwkj86 left | 03:12 |
| → chachasmooth joined | 03:12 |
| → grawity joined | 03:12 |
| → pothepanda joined | 03:12 |
| → nydel07 joined | 03:12 |
| → chrisml joined | 03:12 |
| → ResidentBiscuit joined | 03:13 |
| → robogoat_ joined | 03:13 |
| → Nugget_ joined | 03:13 |
| → tazle__ joined | 03:13 |
| → weSpe joined | 03:13 |
| ← Ragnor left | 03:13 |
| ← WayToDoor left | 03:13 |
| ← tazle_ left | 03:13 |
| ← catsup left | 03:13 |
| ← atomi left | 03:13 |
| ← SJr left | 03:13 |
| → axisys_ joined | 03:13 |
| → catsup_ joined | 03:13 |
| → Ragnor joined | 03:13 |
| ← Nugget left | 03:13 |
| → lkurusa joined | 03:13 |
| → atomi joined | 03:13 |
| → yanome joined | 03:13 |
| → aavrug joined | 03:14 |
| ← Wasp left | 03:14 |
| ← maxb left | 03:14 |
| ← Levex left | 03:14 |
| ← axisys left | 03:14 |
| ← reverse_light left | 03:14 |
| ← weckstrom left | 03:14 |
| ← nivag left | 03:14 |
| ← Hello71 left | 03:14 |
| ← Kaisyu left | 03:14 |
| ← robogoat left | 03:14 |
| ← gkatsev left | 03:14 |
| → Hello71_ joined | 03:14 |
| → Kaisyu joined | 03:14 |
| → forgot joined | 03:14 |
| → bond joined | 03:14 |
| → nivag joined | 03:14 |
| → nwkj86 joined | 03:14 |
| ← adino left | 03:14 |
| → SJr joined | 03:14 |
| bond → Guest91900 | 03:15 |
| ← jfr left | 03:15 |
| → jfr joined | 03:15 |
| ← ghostlight left | 03:15 |
| → Andrew_K joined | 03:17 |
| ← ResidentBiscuit left | 03:17 |
| → reverse_light joined | 03:18 |
| → maxb joined | 03:18 |
| ← ejb left | 03:18 |
| → gkatsev joined | 03:18 |
| ← AlineGomes left | 03:19 |
| ← dan2k3k4 left | 03:19 |
| → tyriondwarf joined | 03:19 |
| → ghostlight joined | 03:19 |
| ← tyriondwarf left | 03:20 |
| ← uu left | 03:21 |
| → bronson joined | 03:22 |
| ← arescorpio left | 03:24 |
| ← bronson left | 03:27 |
| → uu joined | 03:27 |
| → ResidentBiscuit joined | 03:28 |
| → Emperor_Earth joined | 03:29 |
| → Vortex34 joined | 03:31 |
| ← fk left | 03:32 |
| ← ResidentBiscuit left | 03:32 |
| → Lyqyd joined | 03:33 |
| ← Vortex35 left | 03:35 |
| → kexmex joined | 03:37 |
| ← hexagoxel left | 03:38 |
| → Gsham joined | 03:39 |
| → FederationOfNULL joined | 03:41 |
| ← mingrammer left | 03:42 |
| → adino joined | 03:42 |
| ← [0xAA] left | 03:42 |
| → hexagoxel joined | 03:43 |
| FederationOfNULL → [0xAA] | 03:45 |
| → Guest55 joined | 03:46 |
| → fk joined | 03:48 |
| → justanotheruser joined | 03:48 |
| ← nowhere_man left | 03:50 |
| → Goplat joined | 03:51 |
| ← adino left | 03:52 |
| ← sunri5e left | 03:53 |
| → sunri5e joined | 03:53 |
| → xaviergmail joined | 03:54 |
| → arescorpio joined | 03:59 |
| → Rodya_ joined | 03:59 |
| ← cagedwisdom left | 04:00 |
| ← Guest55 left | 04:00 |
| → chrono joined | 04:02 |
| ← chrono left | 04:03 |
| ← Rodya_ left | 04:03 |
| ← mizu_no_oto left | 04:04 |
| ← snowkidind left | 04:05 |
| → mizu_no_oto joined | 04:08 |
| → a_thakur joined | 04:10 |
| → a_thakur_ joined | 04:11 |
| ← a_thakur left | 04:11 |
| → snowkidind joined | 04:11 |
| ← Lyqyd left | 04:13 |
| ← snowkidind left | 04:14 |
| ← dling left | 04:16 |
| → shgysk8zer0 joined | 04:19 |
| → fstd_ joined | 04:22 |
| → bronson joined | 04:23 |
| → z8z joined | 04:23 |
| ← madewokherd left | 04:24 |
| ← fstd left | 04:26 |
| fstd_ → fstd | 04:26 |
| ← bronson left | 04:27 |
| → rchavik joined | 04:28 |
| → aruns joined | 04:29 |
| → navidr joined | 04:30 |
| → madewokherd joined | 04:34 |
| ← miczac left | 04:35 |
| ← jw4242 left | 04:36 |
| ← NeverDie left | 04:38 |
| → NeverDie joined | 04:39 |
| → boombatower joined | 04:39 |
| ← aavrug left | 04:40 |
| → subhojit777 joined | 04:42 |
| → donught joined | 04:45 |
| → Oatmeal joined | 04:47 |
| ← [0xAA] left | 04:47 |
| ← cqi left | 04:48 |
| → NeverDie_ joined | 04:51 |
| → aavrug joined | 04:52 |
| ← NeverDie left | 04:53 |
| ← xaviergmail left | 04:53 |
| ← Oatmeal left | 04:56 |
| → justan0theruser joined | 04:57 |
| → MutantMahesh joined | 04:59 |
| ← justanotheruser left | 05:00 |
| ← sdothum left | 05:00 |
| → Rodya_ joined | 05:00 |
| ← MutantMahesh left | 05:00 |
| → MutantMahesh joined | 05:00 |
| → GT4066 joined | 05:01 |
| → Guest55 joined | 05:02 |
| ← MutantMahesh left | 05:02 |
| ← Andrew_K left | 05:02 |
| → MutantMahesh joined | 05:02 |
| ← MutantMahesh left | 05:04 |
| ← Rodya_ left | 05:05 |
| → diogenese joined | 05:05 |
| → b100s joined | 05:05 |
| ← arescorpio left | 05:05 |
| → Oatmeal joined | 05:07 |
| → snowkidind joined | 05:07 |
| ← madewokherd left | 05:07 |
| → madewokherd joined | 05:09 |
| ← axisys_ left | 05:10 |
| → axisys joined | 05:10 |
| → _ng joined | 05:11 |
| → howdoi joined | 05:13 |
| ← Cabanossi left | 05:14 |
| → MutantMahesh joined | 05:14 |
| → Cabanossi joined | 05:16 |
| → [0xAA] joined | 05:18 |
| ← pothepanda left | 05:19 |
| ← kyan left | 05:21 |
| → bronson joined | 05:24 |
| ← bronson left | 05:28 |
| → dave0x6d joined | 05:29 |
| → Limes joined | 05:29 |
| ← howitdo left | 05:29 |
| → sbulage joined | 05:30 |
| → shubhnik joined | 05:31 |
| johnny56_ → johnny56 | 05:31 |
| ← m0viefreak left | 05:33 |
| ← Limes left | 05:36 |
| ← z8z left | 05:37 |
| ← aw1 left | 05:39 |
| ← Oatmeal left | 05:40 |
| ← Guest55 left | 05:40 |
| → xaviergmail joined | 05:43 |
| → ResidentBiscuit joined | 05:43 |
| → Guest55 joined | 05:43 |
| → jasondockers___ joined | 05:47 |
| ← ResidentBiscuit left | 05:47 |
| ← jasondockers__ left | 05:47 |
| → aw1 joined | 05:51 |
| → mahendratech joined | 05:54 |
| ← mizu_no_oto left | 05:54 |
| ← kexmex left | 05:58 |
| ← Gsham left | 06:02 |
| → thinsoldier joined | 06:04 |
| ← thinsoldier left | 06:05 |
| → plos joined | 06:09 |
| ← DolphinDream left | 06:10 |
| ← CheckDavid left | 06:12 |
| ← hussam left | 06:16 |
| ← shgysk8zer0 left | 06:18 |
| ← NeverDie_ left | 06:18 |
| ← dirtyroshi left | 06:19 |
| → youser joined | 06:19 |
| ← Guest55 left | 06:20 |
| ← pbrewczynski left | 06:20 |
| → cqi joined | 06:22 |
| → shgysk8zer0 joined | 06:22 |
| → bronson joined | 06:24 |
| ← menip left | 06:25 |
| → NeverDie joined | 06:25 |
| ← NeverDie left | 06:26 |
| ← svm_invictvs left | 06:28 |
| ← bronson left | 06:29 |
| ← b100s left | 06:30 |
| → nowhere_man joined | 06:32 |
| → svm_invictvs joined | 06:33 |
| ← diogenese left | 06:33 |
| ← bill99 left | 06:33 |
| ← netj left | 06:33 |
| → netj joined | 06:34 |
| → cagedwisdom joined | 06:35 |
| ← snowkidind left | 06:36 |
| → bernardio joined | 06:38 |
| ← bernardio left | 06:38 |
| → hussam joined | 06:40 |
| → diogenese joined | 06:40 |
| ← [0xAA] left | 06:40 |
| ← shubhnik left | 06:44 |
| ← xaviergmail left | 06:46 |
| ← duderonomy left | 06:46 |
| → ilogger2 joined | 06:54 |
| → Soliton joined | 06:54 |
| → bambams joined | 06:54 |
| ← bambams left | 06:54 |
| → bambams joined | 06:54 |
| → Stravy joined | 06:54 |
| → sbulage joined | 06:54 |
| → tabakhase joined | 06:54 |
| → bauruine joined | 06:54 |
| → alcohol joined | 06:54 |
| → WebDawg joined | 06:54 |
| → chridal joined | 06:54 |
| → bdeferme joined | 06:54 |
| → rt joined | 06:54 |
| → cbreak joined | 06:54 |
| → Sc0rpius joined | 06:54 |
| → gnoirzox joined | 06:54 |
| → nyuszika7h joined | 06:54 |
| → pR0Ps joined | 06:54 |
| → rossome joined | 06:55 |
| → hagridaaron joined | 06:55 |
| → Werring joined | 06:55 |
| → Ram-Z_ joined | 06:55 |
| → Dyonisos joined | 06:55 |
| ← Dyonisos left | 06:55 |
| → Dyonisos joined | 06:55 |
| → Dandelock joined | 06:55 |
| → watabou_ joined | 06:55 |
| → RiPer joined | 06:55 |
| → sab3r joined | 06:55 |
| → Vaelatern joined | 06:55 |
| → sweatsuit joined | 06:55 |
| → Xarodon joined | 06:55 |
| → watmm joined | 06:56 |
| → malide joined | 06:56 |
| → paramourne joined | 06:56 |
| → ThunderChicken joined | 06:56 |
| → zyxep joined | 06:56 |
| → worstadmin joined | 06:56 |
| → hiwk joined | 06:56 |
| → dave0x6d joined | 06:57 |
| → markmarkmark joined | 06:57 |
| → maxorator joined | 06:57 |
| → bill99 joined | 06:57 |
| → LiMp^ joined | 06:57 |
| → dreiss joined | 06:58 |
| → navidr joined | 06:58 |
| → unholycrab joined | 06:58 |
| → LiMp^_ joined | 06:58 |
| → ilbot3 joined | 06:58 |
| → [diecast] joined | 06:58 |
| → ugjka joined | 06:58 |
| → _ng joined | 06:58 |
| → kier joined | 06:58 |
| → ToeSnacks joined | 06:59 |
| → Cork joined | 06:59 |
| → wizonesolutions joined | 06:59 |
| → dwts joined | 06:59 |
| → Log1x joined | 06:59 |
| → mmlb joined | 06:59 |
| → freimatz joined | 07:00 |
| → ayogi joined | 07:00 |
| → Rodya_ joined | 07:00 |
| → dermoth joined | 07:01 |
| → D-Boy joined | 07:01 |
| → noodle joined | 07:02 |
| → Oatmeal joined | 07:03 |
| → akkad joined | 07:04 |
| → rchavik joined | 07:04 |
| ← Rodya_ left | 07:05 |
| → Sasazuka joined | 07:09 |
| → uu joined | 07:19 |
| → TunaVaruna joined | 07:19 |
| ← RiPer left | 07:22 |
| ← Soliton left | 07:22 |
| ← Werring left | 07:22 |
| ← gnoirzox left | 07:22 |
| → ekneuss_ joined | 07:22 |
| → gnoirzox1 joined | 07:22 |
| ← dwts left | 07:22 |
| ← bambams left | 07:22 |
| → bambams joined | 07:22 |
| ← bambams left | 07:22 |
| → bambams joined | 07:22 |
| → kenansulayman joined | 07:22 |
| → Soliton joined | 07:23 |
| ← WebDawg left | 07:23 |
| → Werring joined | 07:23 |
| → cyphase joined | 07:24 |
| → WebDawg joined | 07:24 |
| → rawtaz joined | 07:24 |
| → dwts joined | 07:24 |
| ← zyxep left | 07:25 |
| → zyxep joined | 07:25 |
| → ujjain joined | 07:25 |
| ← ujjain left | 07:25 |
| → ujjain joined | 07:25 |
| → bronson joined | 07:25 |
| → HarryHallman joined | 07:26 |
| → HM joined | 07:26 |
| → menip joined | 07:26 |
| → RiPer joined | 07:27 |
| ← rt left | 07:28 |
| → ghostlight joined | 07:29 |
| → rt joined | 07:29 |
| ← bronson left | 07:30 |
| ← TunaVaruna left | 07:31 |
| ← freimatz left | 07:32 |
| → svm_invictvs joined | 07:34 |
| → howitdo joined | 07:34 |
| ← svm_invictvs left | 07:36 |
| → a_thakur joined | 07:44 |
| Ram-Z_ → Ram-Z | 07:47 |
| ← dreiss left | 07:50 |
| → ayjay_t joined | 07:51 |
| ← ayjay_t left | 07:51 |
| → ayjay_t joined | 07:51 |
| → robattila256 joined | 07:51 |
| → Rodya_ joined | 08:02 |
| ← menip left | 08:03 |
| ← dave0x6d left | 08:03 |
| → Xethron joined | 08:03 |
| → rominronin joined | 08:06 |
| ← Rodya_ left | 08:06 |
| ← a_thakur left | 08:09 |
| ← howitdo left | 08:15 |
| ← cyphase left | 08:16 |
| → finalbeta joined | 08:16 |
| → Ekho joined | 08:18 |
| → zefferno joined | 08:20 |
| → cyphase joined | 08:20 |
| → LarArT joined | 08:26 |
| → bronson joined | 08:26 |
| → freimatz joined | 08:31 |
| ← bronson left | 08:31 |
| → stick-shift joined | 08:32 |
|
selckin
| i want to do a merge, where i throw away evrything in the current branch and take the state of another branch (basicly what reset --hard would do but with a normal forward commit) | 08:36 |
| → rominron_ joined | 08:37 |
| ← ilbot3 left | 08:38 |
| ← RiPer left | 08:38 |
| ← rominronin left | 08:39 |
| → ilbot3 joined | 08:40 |
| → RiPer joined | 08:41 |
| → glebihan_ joined | 08:41 |
| → a_thakur joined | 08:42 |
| ← Sasazuka left | 08:46 |
| → Macaveli joined | 08:46 |
| → jnavila joined | 08:48 |
| → cqi joined | 08:52 |
| → Mission-Critical joined | 08:54 |
| → sea-gull joined | 08:56 |
| → bannakaffalatta joined | 08:57 |
| ← LiMp^ left | 09:00 |
| ← LiMp^_ left | 09:00 |
| Mission-Critical → MissionCritical | 09:10 |
| → Jackneill joined | 09:14 |
| → Jackneill_ joined | 09:14 |
| ← a_thakur left | 09:14 |
| ← Jackneill_ left | 09:14 |
| → a_thakur joined | 09:18 |
| ← jnavila left | 09:18 |
| ← a_thakur left | 09:18 |
| → a_thakur joined | 09:18 |
| → qswz joined | 09:26 |
| → bronson joined | 09:27 |
|
phroa
| selckin: see man git-merge for the "-Xtheirs" strategy option. throws away conflicting content in the being-merged branch and keeps what's in the target. !backup | 09:28 |
|
gitinfo
| selckin: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups | 09:28 |
|
| selckin: the git-merge manpage is available at http://jk.gs/git-merge.html | 09:28 |
| ← bronson left | 09:32 |
| → t0by joined | 09:32 |
| ← t0by left | 09:32 |
| → t0by joined | 09:32 |
|
selckin
| phroa: that will still keep non conflicting differences right? | 09:35 |
| ← LarArT left | 09:35 |
|
phroa
| it will. there's a strategy (not an option to the default recursive strategy, but one named) 'ours' to _really_ trash everything in the _target_ branch, but there isn't an equivalent 'theirs' built in | 09:37 |
|
| it seems you can kinda fake '-s theirs' with http://stackoverflow.com/a/4969679 | 09:38 |
| → LarArT joined | 09:38 |
|
selckin
| so easiest way to fake it i can think of, is do a merge and then when it conflicts git checkout branch -- .; git add .; git commit; etc, so it records both parents, but resets everything to the branch as a conflcit resolution type thing | 09:38 |
| → z8z joined | 09:38 |
| → vuoto joined | 09:39 |
|
phroa
| manual merging is always an option, sure :) | 09:39 |
| ← vuoto left | 09:40 |
| ← qswz left | 09:40 |
| ← cqi left | 09:41 |
|
selckin
| ty | 09:44 |
| → Juanito[m] joined | 09:44 |
| → pks joined | 09:46 |
| → clemf joined | 09:47 |
| → moei joined | 09:49 |
| → nettoweb joined | 09:52 |
| ← rominron_ left | 09:52 |
| → knot joined | 10:04 |
| → cqi joined | 10:04 |
| → Anja joined | 10:05 |
| → littlebit joined | 10:05 |
| → nisseni joined | 10:06 |
| → gambler joined | 10:15 |
| → howitdo joined | 10:16 |
| ← howitdo left | 10:16 |
| → howitdo joined | 10:16 |
| → rnsanchez joined | 10:20 |
| ← littlebit left | 10:20 |
| → cyan__ joined | 10:22 |
| → littlebit joined | 10:23 |
| ← knot left | 10:25 |
| → bronson joined | 10:28 |
| ← sea-gull left | 10:30 |
| ← bronson left | 10:33 |
| → vrlx joined | 10:42 |
| → YuGiOhJCJ joined | 10:46 |
| → Mowgli joined | 10:48 |
| → pks_ joined | 10:48 |
| ← pks left | 10:48 |
| pks_ → pks | 10:48 |
| → armyriad joined | 10:48 |
| → eizua joined | 10:48 |
| ← z8z left | 10:48 |
| → b100s joined | 10:53 |
| → sea-gull joined | 10:56 |
| ← WebDawg left | 10:57 |
| → littlebit1 joined | 10:57 |
| ← dwts left | 10:58 |
| → dwts joined | 10:58 |
| ← rt left | 10:58 |
| ← nisseni left | 10:58 |
| → [0xAA] joined | 10:58 |
| ← littlebit left | 10:58 |
| littlebit1 → littlebit | 10:58 |
| → msonntag joined | 10:59 |
| → WebDawg joined | 11:01 |
| → Noodlewitt joined | 11:01 |
| ← clemf left | 11:01 |
| ← t0by left | 11:02 |
| ← mmlb left | 11:02 |
| ← hagridaaron left | 11:02 |
| ← howitdo left | 11:03 |
| → rt joined | 11:03 |
| → boz_v1 joined | 11:03 |
| → hagridaaron joined | 11:03 |
| ← sea-gull left | 11:04 |
| → Rodya_ joined | 11:04 |
| → t0by joined | 11:05 |
| → mmlb joined | 11:05 |
| ← Noodlewitt left | 11:06 |
| → howitdo joined | 11:06 |
| → jnavila joined | 11:08 |
| ← Rodya_ left | 11:08 |
| → Noodlewitt joined | 11:08 |
| → nisseni joined | 11:10 |
| ← Noodlewitt left | 11:10 |
| → Noodlewitt joined | 11:14 |
| ← armyriad left | 11:15 |
| ← cqi left | 11:15 |
| ← Noodlewitt left | 11:16 |
| → cdown joined | 11:18 |
| → rahtgaz joined | 11:18 |
| → FSadino joined | 11:19 |
| → cdown_ joined | 11:22 |
| → arunpyasi joined | 11:22 |
| → mage_ joined | 11:23 |
|
mage_
| hello | 11:23 |
|
| I have a branch named "wip" which I'm just using to sync my workspace between two machines | 11:23 |
|
| so I have a lot of commit messages like "sync" or "wip" or .. | 11:24 |
|
| now I'd like to merge this branch to master but by replacing all those commit messages by just one .. how could I do this? | 11:24 |
| ← cdown left | 11:24 |
| cdown_ → cdown | 11:24 |
|
nedbat
| mage_: git rebase -i # squashes commits | 11:24 |
|
mage_
| do I need to checkout on master first ? | 11:25 |
|
nedbat
| mage_: no, you work on the wip branch, you rebase to squash its commits, and then you can merge (or rebase) the single resulting commit onto master. | 11:25 |
|
mage_
| excellent, thank you | 11:26 |
|
nedbat
| mage_: you can also do them both in one step, but there's no need to, and it's easier to keep it straight if you do it in two steps. | 11:26 |
| → miczac joined | 11:27 |
| gitinfo set mode: +v | 11:28 |
| ← nisseni left | 11:28 |
| ← Mowgli left | 11:29 |
| → bronson joined | 11:29 |
| → Noodlewitt joined | 11:29 |
| → gkatsev joined | 11:29 |
| ← Noodlewitt left | 11:31 |
| ← bronson left | 11:34 |
| → Panacea joined | 11:35 |
| ← FSadino left | 11:36 |
| → masuberu joined | 11:40 |
| ← freimatz left | 11:41 |
| → Mowgli joined | 11:47 |
| → byte512 joined | 11:51 |
| → WaReZ joined | 11:52 |
|
littlebit
| hi people, I'm new at gitlab and I setup gitlab as a vbox instance, and I'm not aware that I did anything but when pushing to my gitlab, it is not accepting my password. And I didn't change any passwords. How do I change the password for pushing to my gitlab? | 11:53 |
| ← watabou_ left | 11:53 |
| → Bast joined | 11:55 |
| ← Bast left | 11:56 |
| → Cavallari joined | 11:57 |
| → LarArT_ joined | 11:58 |
|
littlebit
| can someone walk me throught? | 12:01 |
| ← LarArT left | 12:01 |
| → Darcidride joined | 12:04 |
| → Rodya_ joined | 12:05 |
| ← LarArT_ left | 12:07 |
| → buzzLightBeer joined | 12:08 |
| ← Rodya_ left | 12:09 |
| ← t0by left | 12:11 |
| → ski7777 joined | 12:11 |
| → nowhere_man joined | 12:11 |
| ← cdown left | 12:11 |
|
osse
| !gitlab | 12:12 |
|
gitinfo
| Gitlab is Git hosting similar to Github, but for your own server or on gitlab.com, giving you unlimited free private repositories: http://gitlab.com/ | 12:12 |
|
osse
| hmm | 12:12 |
| ← ayogi left | 12:13 |
|
osse
| littlebit: Someone might know, but don't count on it. This channel is about git itself | 12:13 |
| → Juzzika joined | 12:14 |
|
littlebit
| osse: ah ok | 12:14 |
| ← Panacea left | 12:14 |
| → Panacea_ joined | 12:14 |
| ← Panacea_ left | 12:15 |
| ← Mowgli left | 12:15 |
| → cdown_ joined | 12:16 |
| → Panacea joined | 12:18 |
| cdown_ → cdown | 12:18 |
| → sea-gull joined | 12:18 |
| ← nowhere_man left | 12:22 |
| ← cyan__ left | 12:22 |
| → RahulAN joined | 12:23 |
| → pothepanda joined | 12:23 |
|
RahulAN
| Hi All | 12:23 |
|
| Is this correct channel to talk regarding contribution in git ? | 12:24 |
| ← WaReZ left | 12:24 |
| → mahendratech joined | 12:24 |
|
selckin
| probably best on the mailing list, but depends on what specificly it is | 12:24 |
|
RahulAN
| selckin: how about #git-devel | 12:25 |
|
_ikke_
| Not very active | 12:25 |
| → LarArT_ joined | 12:25 |
| ← mahendratech left | 12:26 |
|
RahulAN
| Well we can discuss here too ? | 12:26 |
|
| Is there any way to push db using git ?? like i do some modification in db and i want to make it available to all in there local machine | 12:27 |
|
| I am not much familiar with git but I seen that using a dump only it is possible | 12:29 |
| → bronson joined | 12:30 |
| → zeks joined | 12:31 |
|
bremner
| how does this relate to contributing to git? | 12:31 |
|
thiago
| if it's on the local machine, it's already available to all that can access the files | 12:31 |
|
RahulAN
| Nope .. I don't mean it | 12:32 |
|
bremner
| RahulAN: are you talking about the git object store, or some other database? | 12:32 |
| ← zeks left | 12:32 |
|
RahulAN
| bremner: No .. | 12:32 |
| → zeks joined | 12:32 |
| → Mowgli joined | 12:32 |
|
zeks
| if I push a master branch into remote repostiory. this master has test merged into it, will it also push test branch into thsi repository? | 12:33 |
|
RahulAN
| Well , As per my work , I Do db changes and i have to send it creating dump to all who are working on that project | 12:33 |
|
| PS : I am not hosting any database | 12:33 |
| → rory joined | 12:33 |
|
RahulAN
| thiago: No Hosting means It can't be available for all | 12:33 |
|
| It is in my localhost .. | 12:34 |
|
| I thought of searching for is there any way to do this with git , same like as i do with my source code | 12:34 |
| → Balliad joined | 12:34 |
| ← bronson left | 12:35 |
|
RahulAN
| But i didn't found any thing like that | 12:35 |
|
| I got something like http://stackoverflow.com/questions/846659/how-can-i-put-a-database-under-git-version-control | 12:35 |
|
thiago
| zeks: if you push only a given branch, then only that branch is pushed | 12:35 |
|
| RahulAN: ok. You can do that better with a central Git repository that you push to. | 12:35 |
|
| RahulAN: but if all are on the local machine and all have filesystem access to your repository, they can pull from you | 12:36 |
|
RahulAN
| thiago: How ? | 12:36 |
| ← LarArT_ left | 12:36 |
|
thiago
| one repository that all have access to | 12:36 |
|
RahulAN
| thiago: but it is not necessary that i am every time online and connected | 12:36 |
|
selckin
| RahulAN: looks into what they said there, liquibase or i'd recommend flyway, in the end this is not really git related at all | 12:37 |
|
thiago
| so? | 12:37 |
|
| the server you've made the changes to should be available | 12:37 |
|
| you don't turn servers off | 12:37 |
|
zeks
| thiago, thx, I thought as much, but needed to confirm | 12:37 |
|
RahulAN
| thiago: i am not running any server | 12:37 |
|
thiago
| zeks: the contents of merged branches are pushed too, but the branches themselves don't get updated | 12:37 |
|
| RahulAN: ok, so either you push to a central server that is running all the time or you transfer the changes in another way | 12:37 |
|
| RahulAN: bundles or git format-patch (via emails, dropbox, etc.) | 12:38 |
|
RahulAN
| just as a part time project i keep all my source code on git .. but not db | 12:38 |
|
| Why do i need it .. why can;t there be any thing like #git db push | 12:38 |
|
zeks
| thiago, point of the question: a couple of remote branches were deleted. now a colleague approched me that I "restored them somehow". given that I only ever use "push origin master" I chose not to believe this accusation | 12:38 |
|
thiago
| RahulAN: why can't you use "git push" ? | 12:38 |
|
selckin
| RahulAN: same reason it won't make you dinner | 12:39 |
|
thiago
| zeks: you may have done it, but not with that commad | 12:39 |
|
RahulAN
| thiago: why i need to create a dump every time | 12:39 |
|
thiago
| RahulAN: who says about a dump? | 12:39 |
| → rajkumar joined | 12:39 |
|
thiago
| RahulAN: just use git push. It'll send only what is new. | 12:39 |
|
RahulAN
| thiago: How will it send .. ?? my repo is cloned in /var/www/html and there is not clue of db in there | 12:40 |
|
thiago
| RahulAN: stop talking about DB | 12:40 |
|
| RahulAN: your repository has contents. That's all I care about. | 12:40 |
|
RahulAN
| thiago: I agree git do care about it | 12:41 |
|
thiago
| RahulAN: what is in your repository and you committed gets pushed. What you didn't commit or didn't include in the repository isn't part of Git. | 12:41 |
|
| since it is not part of Git, it's off-topic | 12:41 |
|
RahulAN
| thiago: well i was thinking to modify the code some how so i could make it work in order i want .. | 12:41 |
|
| thiago: And its not a off topic | 12:42 |
|
| i asked as if there is any way.. | 12:42 |
|
thiago
| so include your data | 12:42 |
|
| it's not that difficult | 12:42 |
| → WaReZ joined | 12:42 |
|
RahulAN
| It is just a raw thought | 12:42 |
| → CheckDavid joined | 12:42 |
|
RahulAN
| thiago: it is simple for you .. as you are experienced ;) | 12:43 |
|
| but there are many NOOBs | 12:43 |
| ← sea-gull left | 12:43 |
| → treehug88 joined | 12:43 |
|
RahulAN
| I am also one of them .. | 12:43 |
|
| thiago: Please Don't Mind :) | 12:44 |
|
| It is just a kind proposal .. I found useful :) | 12:45 |
| ← rajkumar left | 12:47 |
|
RahulAN
| Any one with positive thoughts on this? | 12:47 |
|
selckin
| at most you need a script or a hook | 12:48 |
|
j416
| RahulAN: often you would use a set of files that modify the database in the way you wish, and then run those by some means to alter your database | 12:49 |
|
| RahulAN: you can commit these files. | 12:50 |
| → re1_ joined | 12:50 |
| → johnmilton joined | 12:50 |
| ← johnmilton left | 12:50 |
|
RahulAN
| selckin: Yes correct | 12:50 |
|
j416
| RahulAN: the format of those files and how you choose to run them depends on your preference and your project environment. | 12:50 |
|
| RahulAN: every time you change something in your database, you create a new file that contains whatever is needed to do that change | 12:51 |
|
RahulAN
| j416: Yes , something like that | 12:51 |
| → freimatz joined | 12:51 |
|
RahulAN
| j416: I think i can come up with some POC .. That would be better for discussion | 12:52 |
|
j416
| RahulAN: if you're not running the thing in production, you can usually do without them and just have something that creates your database from scratch committed | 12:52 |
|
| RahulAN: there are numerous such systems in existence already | 12:52 |
|
| RahulAN: pick one, or roll your own | 12:52 |
|
| RahulAN: in either case, git does not come with database versioning magic built-in. Put things into files and then track those with git. | 12:53 |
|
RahulAN
| Yes .. that is what. I thought like any one who clone my repo can get a database easily, created | 12:53 |
|
| j416: Yes i know git don't have this magic .. but i can give a try to create it ;) if i could | 12:54 |
|
j416
| just use plain files | 12:54 |
|
| the less magic the better | 12:54 |
|
| have something that can execute them correctly. | 12:55 |
|
RahulAN
| j416: Yes sure .. | 12:55 |
|
bremner
| RahulAN: you really don't want to require a custom version of git for your projects | 12:55 |
| → Vortex35 joined | 12:55 |
|
RahulAN
| bremner: Ok | 12:56 |
| → ojdo joined | 12:56 |
|
RahulAN
| bremner: Not for others but could work for me | 12:57 |
|
bremner
| and when there is an urgent security fix that does not apply cleanly to your code? | 12:58 |
|
| of course you can do what you want as a learning exercise, but it may not leave much room for whatever your actual project is. | 12:59 |
| ← buzzLightBeer left | 13:00 |
| → buzzLightBeer joined | 13:00 |
|
RahulAN
| bremner: Yes that is true .. | 13:00 |
|
| I am very intrested in Contributing in OpenSource world .. May be this could be good Exercise. | 13:01 |
| ← RahulAN left | 13:03 |
| → Rodya_ joined | 13:05 |
| → drbean joined | 13:07 |
| → ayogi joined | 13:08 |
| → modin joined | 13:09 |
| ← rchavik left | 13:10 |
| ← Rodya_ left | 13:10 |
| → vuoto joined | 13:11 |
| → cqi joined | 13:12 |
| ← buzzLightBeer left | 13:12 |
| → t0by joined | 13:13 |
| ← littlebit left | 13:15 |
| → Nugget joined | 13:15 |
| → littlebit joined | 13:16 |
| ← WaReZ left | 13:16 |
| → kexmex joined | 13:17 |
| → jikz joined | 13:19 |
| → nidr0x joined | 13:19 |
| → neunon joined | 13:23 |
| → Vortex34 joined | 13:24 |
| ← Vortex35 left | 13:27 |
| ← cqi left | 13:27 |
| → shubhnik joined | 13:27 |
| ← gambler left | 13:28 |
| ugjka → UgJkA | 13:29 |
| → bronson joined | 13:31 |
| ← treehug88 left | 13:31 |
| ← Balliad left | 13:33 |
| ← a_thakur left | 13:33 |
| → Silox| joined | 13:34 |
| → GavinMagnus joined | 13:34 |
| ← bronson left | 13:36 |
| → mizu_no_oto joined | 13:38 |
| → Groscheri joined | 13:41 |
| → coasterz joined | 13:43 |
| → mmattice joined | 13:44 |
| → dling joined | 13:44 |
| ← shubhnik left | 13:44 |
| ← b100s left | 13:45 |
| ← sbulage left | 13:46 |
| → Gsham joined | 13:50 |
| → aw1 joined | 13:51 |
| → systemovich joined | 13:55 |
| ← littlebit left | 13:56 |
| → BrownBear joined | 13:56 |
| → arnoldoree joined | 13:57 |
| → shubhnik joined | 13:57 |
| ← miczac left | 13:57 |
| ← cdown left | 13:57 |
| → cdown joined | 13:58 |
| ← Gsham left | 13:59 |
| ← BrownBear left | 14:03 |
| → miczac joined | 14:03 |
| → rnsanchez_ joined | 14:04 |
| gitinfo set mode: +v | 14:04 |
| ← ayogi left | 14:05 |
| ← Mowgli left | 14:05 |
| → theoceaniscool joined | 14:06 |
| ← rnsanchez left | 14:07 |
| → nettoweb1 joined | 14:07 |
| ← kexmex left | 14:08 |
| ← nettoweb left | 14:08 |
| ← jikz left | 14:13 |
| → oskarkv joined | 14:16 |
| → evil-t0by joined | 14:17 |
| ← evil-t0by left | 14:17 |
| → evil-t0by joined | 14:17 |
| ← evil-t0by left | 14:18 |
| ← nidr0x left | 14:19 |
| → xaviergmail joined | 14:21 |
| → nidr0x joined | 14:23 |
| → adino joined | 14:24 |
| → Viewtiful joined | 14:25 |
| ← adino left | 14:25 |
| → Gsham joined | 14:26 |
| → ShekharReddy joined | 14:26 |
| ← Viewtiful left | 14:27 |
| → Viewtiful joined | 14:27 |
| → Angel47 joined | 14:28 |
| ← Angel47 left | 14:28 |
| → aavrug joined | 14:29 |
| ← mizu_no_oto left | 14:29 |
| ← Viewtiful left | 14:31 |
| → mizu_no_oto joined | 14:31 |
| → bronson joined | 14:32 |
| → gozo joined | 14:32 |
| ← Gsham left | 14:33 |
| ← ShekharReddy left | 14:34 |
| ← mizu_no_oto left | 14:36 |
| ← bronson left | 14:37 |
| → sdothum joined | 14:38 |
| → shinnya joined | 14:43 |
| → ExoUNX joined | 14:43 |
| → satifant joined | 14:43 |
| → mizu_no_oto joined | 14:44 |
| ← shubhnik left | 14:46 |
| → metalraiden34 joined | 14:47 |
| ← pks left | 14:53 |
| → pks joined | 14:54 |
| → BSAlb joined | 14:54 |
| ← YuGiOhJCJ left | 14:55 |
| ← Panacea left | 14:57 |
| → shubhnik joined | 14:58 |
| → efeuska joined | 14:59 |
| ← gozo left | 14:59 |
| ← eizua left | 14:59 |
| ← masuberu left | 15:00 |
| → guampa joined | 15:02 |
| ← systemovich left | 15:03 |
| ← vuoto left | 15:04 |
| ← aavrug left | 15:05 |
| → LiMp^ joined | 15:07 |
| → LiMp^_ joined | 15:07 |
| → JamesBaxter joined | 15:07 |
| ← LiMp^ left | 15:07 |
| ← LiMp^_ left | 15:07 |
| → LiMp^ joined | 15:08 |
| ← pothepanda left | 15:14 |
| → pothepanda joined | 15:14 |
| → ToBeCloud joined | 15:17 |
| gitinfo set mode: +v | 15:17 |
| → ok91 joined | 15:19 |
| ← pothepanda left | 15:20 |
| ← miczac left | 15:23 |
| → Khisanth joined | 15:26 |
| → cyan__ joined | 15:26 |
| → aavrug joined | 15:26 |
| ← aavrug left | 15:27 |
| → aavrug joined | 15:27 |
| → miczac joined | 15:27 |
| gitinfo set mode: +v | 15:27 |
| → dave0x6d joined | 15:28 |
| ← jnavila left | 15:29 |
| → overlord_tm joined | 15:31 |
| → jnavila joined | 15:31 |
| → bronson joined | 15:32 |
| → plexigras joined | 15:33 |
| → Singmyr joined | 15:33 |
| ← mizu_no_oto left | 15:34 |
|
plexigras
| how can i hide all files that were not changed in a specific commit? | 15:34 |
| → hlysig joined | 15:35 |
|
selckin
| hide from what | 15:35 |
| → snowkidind joined | 15:37 |
|
plexigras
| selckin, the directory structure | 15:37 |
|
selckin
| work dir? | 15:37 |
| ← bronson left | 15:37 |
|
selckin
| odd question/problem | 15:39 |
| → Balliad joined | 15:41 |
| ← shubhnik left | 15:44 |
| ← shinnya left | 15:45 |
| ← finalbeta left | 15:49 |
| → finalbeta joined | 15:50 |
| ← hlysig left | 15:51 |
| → robotroll joined | 15:53 |
| → d0nn1e joined | 15:54 |
| ← GavinMagnus left | 15:54 |
| ← metalraiden34 left | 15:56 |
| → synthroid joined | 15:56 |
| → altendky joined | 15:57 |
| → Gsham joined | 15:59 |
| ← Macaveli left | 16:07 |
| → dreiss joined | 16:07 |
| → rtm1046 joined | 16:10 |
| → joki joined | 16:10 |
| → MutantMahesh joined | 16:11 |
| ← MutantMahesh left | 16:11 |
|
nedbat
| plexigras: i bet if you provided more context, people would be able to help better. It does sound very odd. | 16:13 |
| ← mmlb left | 16:13 |
|
plexigras
| nedbat, i kinda gave up on it. im just gonna use gitk | 16:14 |
| ← efeuska left | 16:16 |
| → sea-gull joined | 16:16 |
| → m0viefreak joined | 16:18 |
| → shubhnik joined | 16:19 |
| ← xaviergmail left | 16:21 |
| → narendraj9 joined | 16:23 |
| ← nidr0x left | 16:29 |
| → Padawan joined | 16:32 |
| → macivy joined | 16:33 |
| → bronson joined | 16:33 |
|
Padawan
| I am getting this error [fatal: No url found for submodule path /path in .gitmodules] when i git submodule init, but there should not be this entry in my .gitmodule | 16:34 |
| → looper joined | 16:35 |
| ← narendraj9 left | 16:37 |
| → ben_____ joined | 16:38 |
| ← ben_____ left | 16:38 |
| ← bronson left | 16:39 |
| → ok92 joined | 16:40 |
| ← ok91 left | 16:43 |
| ok92 → ok91 | 16:43 |
| → Jymmm joined | 16:43 |
| ← plexigras left | 16:43 |
| → GNUtoo joined | 16:44 |
| ← Jymmm left | 16:45 |
| ← looper left | 16:45 |
|
GNUtoo
| Hi, as I use and contribute to some hardware related free software projects, I have on my development laptop, many git repositories | 16:46 |
| ← Silox| left | 16:46 |
|
GNUtoo
| For instance I have one clone of linux per device I need to compile it for or work on, so to make that fast and to handle updates better, I keep the linux bare repository in bare/src/other/linux.git | 16:47 |
|
| and for each device, I clone --reference --shared it | 16:47 |
|
| In order to save me time and backup this setup, I wrote Makefiles to fetch the repositories (bare/src/<project-group>/<project>) but while they are very flexible, Makefiles aren't ideal: There is a huge duplication of information there | 16:49 |
|
| So I looked at repo and it seem to mostly fit, but either I didn't succeed at using it correctly for that use case, or it might not be the right tool, or I might need to improve the tool | 16:50 |
| → looper joined | 16:50 |
|
GNUtoo
| (1a) repo init --mirror and force-path="true" in the project xml definition ends up creating <project> and src/<project-group>/<project> | 16:51 |
|
| I'd prefer only src/<project-group>/<project> as bare | 16:51 |
| ← zefferno left | 16:51 |
| → Hawk3ye joined | 16:52 |
| ← synthroid left | 16:52 |
|
GNUtoo
| (1b) I didn't find how to make --mirror --shared clones when I have linux linux-stable linux-<mydevice> | 16:52 |
|
| so: (2a) Am I using the right tool? (2b) Am I using repo correctly? (2c) Do I need to improve repo instead? | 16:56 |
| → j416 joined | 16:56 |
| ← Juzzika left | 16:57 |
| → svm_invictvs joined | 16:58 |
| ← aavrug left | 16:58 |
| ← howitdo left | 17:04 |
| → xall joined | 17:05 |
| ← cdown left | 17:07 |
| → ratdeptrai joined | 17:07 |
| → xaviergmail joined | 17:07 |
| → WaReZ joined | 17:09 |
| → howitdo joined | 17:10 |
| ← nettoweb1 left | 17:11 |
| → M-ou-se joined | 17:12 |
| → MrLawrence joined | 17:13 |
|
MrLawrence
| Hello, how does one change the author of a commit? | 17:13 |
|
| This commit has been pushed to the repository. | 17:13 |
| ← ratdeptrai left | 17:13 |
|
grawity
| one uses history rewriting tools such as `git commit amend --author=...` or `git filter-branch --env-filter=...` with the usual caveats of !rewriting | 17:14 |
|
gitinfo
| [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum | 17:14 |
| → mmlb joined | 17:14 |
| → Vortex35 joined | 17:14 |
|
osse
| GNUtoo: Wouldn't it be better to use just about any language other than Make? | 17:15 |
| ← howitdo left | 17:15 |
| → tsdev joined | 17:16 |
| → jw4242 joined | 17:16 |
| → howitdo joined | 17:16 |
|
osse
| From what I can tell repo sounds very android specific | 17:17 |
| ← LiMp^ left | 17:18 |
| ← Vortex34 left | 17:18 |
| → subhojit777 joined | 17:19 |
| → synthroid joined | 17:19 |
|
GNUtoo
| osse: I saw it used in other uses cases like with the angstrom distribution and various other yocto distributions | 17:21 |
|
MrLawrence
| How can I reference commits without using the full hash? | 17:22 |
|
GNUtoo
| I also asked a friend that have similar workflows and that person is using git without bare or mirrors or whaever but builds source out-of-tree, I'll also investigate whether it, practically speaking, will rebuild projects from scratch when switching branches and so on with git checkout | 17:22 |
|
j416
| MrLawrence: use a partial hash, or use one of the many ways described in man gitrevisions | 17:23 |
|
gitinfo
| MrLawrence: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html | 17:23 |
| → ratdeptrai joined | 17:23 |
|
GNUtoo
| MrLawrence: git log --oneline | 17:23 |
| → Eote joined | 17:23 |
|
MrLawrence
| GNUtoo, wow my life is now 100 times easier, thanks | 17:23 |
|
GNUtoo
| MrLawrence: tags can also refer to commits, you can find them with git log --decorate | 17:24 |
|
osse
| GNUtoo: Git now supports more than one worktree. That sounds like a potential good fit | 17:26 |
| → somaReverse joined | 17:26 |
|
GNUtoo
| osse: do you have a reference to the corresponding documentation? | 17:26 |
| → ResidentBiscuit joined | 17:27 |
| → algun joined | 17:27 |
| → Peuc joined | 17:27 |
|
GNUtoo
| I guess I should look at that: https://git-scm.com/docs/git-worktree | 17:28 |
| → cdown joined | 17:28 |
| ← [0xAA] left | 17:29 |
| ← Padawan left | 17:29 |
| ← sdothum left | 17:29 |
| ← Hawk3ye left | 17:30 |
|
MrLawrence
| So I just did a rebase and changed the commits, however when I push, it says that my branch has diverged, and the push gets rejected. What can I do now? I want my local branch to be master. | 17:30 |
| → ertes joined | 17:30 |
| → aavrug joined | 17:31 |
| → zeroed joined | 17:32 |
|
MrLawrence
| I assume I would have to force the push to override the diversion, but I am not sure. | 17:33 |
| → LiMp^ joined | 17:33 |
|
ertes
| hi… magit question: i'd like magit to kill buffers instead of burying them, but there is no predefined option for the magit-bury-buffer-function variable… do i have to write my own wrapper function around magit-restore-window-configuration that supplies the optional KILL-BUFFER argument, or is there a simpler way? | 17:34 |
| → bronson joined | 17:34 |
|
j416
| ertes: I don't think many people here know "magit". | 17:35 |
|
MrLawrence
| ertes, try #emacs | 17:35 |
|
ertes
| j416: a few weeks ago i asked whether magit questions are ok here and was told "yes", so i'm just trying =) | 17:35 |
|
| but yeah, i'll ask in #emacs, too | 17:35 |
|
j416
| ertes: I'm just trying to point you in the right direction | 17:35 |
|
ertes
| thanks =) | 17:36 |
| ← ToBeCloud left | 17:36 |
|
j416
| or rather, steer you away from the wrong direction.. ;) | 17:36 |
| ← Oatmeal left | 17:36 |
|
rizonz
| guys commit = push ? | 17:37 |
|
ertes
| i'm kinda used to that as every other git question i ask here makes people go ".xy" =) | 17:37 |
|
MrLawrence
| rizonz, nope | 17:37 |
|
rizonz
| ok | 17:37 |
|
| then I need to figure it out | 17:38 |
|
| normally I did on SVN a commit which trigger a post-commit hook and did a remote update on a machine who needed the new commit | 17:38 |
|
| mhh netbeans shows me as well as push as wel as commit | 17:39 |
| ← bronson left | 17:39 |
| → cdg joined | 17:39 |
|
rizonz
| I thought coomit was one on the git server itself after a PR was made | 17:39 |
|
j416
| rizonz: forget what you know about svn, then learn git from scratch. Fastest way. | 17:40 |
|
rizonz
| j416: ok, so commit doesn't exist anymore ? | 17:40 |
|
j416
| rizonz: both svn and git have "commit", but they mean different things | 17:40 |
|
BlessJah
| rizonz: http://ndpsoftware.com/git-cheatsheet.html http://learngitbranching.js.org/ (check out remotes) | 17:41 |
|
rizonz
| BlessJah: thanks, I just need to know the compares for what existed in svn | 17:41 |
|
BlessJah
| svn commit rougly equals to git commit and git push | 17:41 |
| ← MrLawrence left | 17:42 |
|
rizonz
| ok | 17:42 |
| ← robotroll left | 17:42 |
| ← Eote left | 17:42 |
|
rizonz
| this is fairly simple, I have a puppet environment which I cange and commit which was post-hooked to the puppet server when I used svn | 17:42 |
|
BlessJah
| this one as well http://think-like-a-git.net/ | 17:42 |
|
rizonz
| ok | 17:43 |
| ← dave0x6d left | 17:43 |
| ← svm_invictvs left | 17:43 |
|
BlessJah
| unfortunately you need to learn some git to use git (as opposed to svn), https://xkcd.com/1597/ | 17:44 |
| ← cdown left | 17:44 |
|
rizonz
| yeah it's quite clear at the basics but this was weird | 17:45 |
|
| I sometimes you need to put it there roughly | 17:45 |
|
| BlessJah: i have my git already running and such and already pushed my SVN exports | 17:47 |
| → perrier-jouet joined | 17:47 |
| ← Balliad left | 17:48 |
| ← ResidentBiscuit left | 17:48 |
|
rizonz
| so I'm on the way | 17:48 |
| ← shubhnik left | 17:48 |
| ← tsdev left | 17:48 |
| ← xall left | 17:48 |
| → dave0x6d joined | 17:49 |
| → Hawk3ye joined | 17:50 |
| ← dreiss left | 17:52 |
| ← xaviergmail left | 17:52 |
| → xall joined | 17:53 |
| → xaviergmail joined | 17:53 |
| → khagler joined | 17:56 |
| ← theoceaniscool left | 17:57 |
| → Balliad joined | 17:57 |
| → nidr0x joined | 17:58 |
| → NeverDie joined | 18:02 |
| → theoceaniscool joined | 18:03 |
| ← satifant left | 18:09 |
| → cdg_ joined | 18:10 |
| ← cdg left | 18:10 |
| ← byte512 left | 18:10 |
| ← synthroid left | 18:11 |
| ← nidr0x left | 18:14 |
| ← macivy left | 18:14 |
| → nidr0x joined | 18:15 |
| ← cdg_ left | 18:15 |
| → cdg joined | 18:16 |
| → rhalff joined | 18:17 |
|
osse
| GNUtoo: that's exactly it | 18:20 |
| → synthroid joined | 18:20 |
| ← zeroed left | 18:21 |
| ← subhojit777 left | 18:21 |
| → svm_invictvs joined | 18:23 |
| ← perrier-jouet left | 18:23 |
| → mrnuke joined | 18:28 |
| ← Hawk3ye left | 18:29 |
| → youser joined | 18:30 |
| ← LiMp^ left | 18:31 |
| → LiMp^ joined | 18:31 |
| → jimi_ joined | 18:32 |
| ← GNUtoo left | 18:33 |
| → GNUtoo joined | 18:34 |
| ← LiMp^ left | 18:35 |
| → bronson joined | 18:35 |
| → LiMp^ joined | 18:35 |
| ← WaReZ left | 18:36 |
| ← bronson left | 18:40 |
| → sdothum joined | 18:40 |
| → cagedwisdom joined | 18:41 |
| → Shentino joined | 18:41 |
| ← theoceaniscool left | 18:42 |
| → theoceaniscool joined | 18:42 |
| → shgysk8zer0 joined | 18:43 |
| → watabou_ joined | 18:45 |
| → netj joined | 18:46 |
| ← _ng left | 18:46 |
| → fling joined | 18:46 |
| ← sdothum left | 18:46 |
| ← aavrug left | 18:46 |
| → sdothum joined | 18:47 |
| → AlineGomes joined | 18:47 |
| ← Singmyr left | 18:49 |
| → Singmyr joined | 18:51 |
| → Oatmeal joined | 18:53 |
| ← xall left | 18:54 |
| → Panacea joined | 18:55 |
| ← rhalff left | 19:01 |
| → dviola joined | 19:02 |
| → diogenese joined | 19:03 |
| ← shgysk8zer0 left | 19:04 |
| → MrLawrence joined | 19:10 |
| → rominronin joined | 19:11 |
| rnsanchez_ → rnsanchez | 19:12 |
|
rizonz
| so I wonder if it's doabnnle/normal/possible to commit directly to a git master repo | 19:13 |
|
| if needed | 19:13 |
| ← synthroid left | 19:13 |
|
rizonz
| so the online one | 19:13 |
| → DolphinDream joined | 19:14 |
| → cdown joined | 19:15 |
| → anli_ joined | 19:16 |
|
anli_
| I want a git client in linux that gives me checkboxes, one for each changed file and the posibility to view the diff and "restore after commit", is that available? | 19:17 |
|
| And also to edit in the diff viewer | 19:17 |
| ← cyan__ left | 19:17 |
| ← Juanito[m] left | 19:17 |
|
rizonz
| anli_: like tortoise has for SVN > | 19:20 |
|
| ? | 19:20 |
|
rawtaz
| SourceTree perhaps? | 19:20 |
|
| or is that not for linux | 19:20 |
|
anli_
| rizonz: yes | 19:20 |
|
| rawtaz: nope | 19:21 |
| ← cdown left | 19:22 |
|
anli_
| maybe smartgit is the tool | 19:22 |
|
rizonz
| mhh should search for you | 19:23 |
| ← rahtgaz left | 19:25 |
| ← sea-gull left | 19:26 |
| ← BSAlb left | 19:26 |
|
rizonz
| can you work witouth a local repo ? | 19:27 |
| → BSaboia joined | 19:27 |
|
rizonz
| so don't commit locally at all ? | 19:27 |
| → Lunatrius joined | 19:27 |
| ← cdg left | 19:28 |
| → zeroed joined | 19:28 |
| ← zeroed left | 19:29 |
| → cdg joined | 19:29 |
| → daynaskully joined | 19:30 |
| → cdown joined | 19:31 |
| ← cdg left | 19:33 |
| ← rtm1046 left | 19:33 |
| → synthroid joined | 19:35 |
| ← cdown left | 19:36 |
| ← watabou_ left | 19:36 |
| → bronson joined | 19:36 |
| → watabou_ joined | 19:39 |
| ← bronson left | 19:41 |
| → clemf joined | 19:43 |
| → a3Dman joined | 19:45 |
| → weckstrom joined | 19:46 |
| → ResidentBiscuit joined | 19:48 |
| → davimore joined | 19:50 |
| Panacea → mudkipper | 19:51 |
| → Lyqyd joined | 19:51 |
| mudkipper → Panacea | 19:51 |
| ← anli_ left | 19:51 |
| ← ResidentBiscuit left | 19:52 |
| → WaReZ joined | 19:52 |
| ← GNUtoo left | 19:53 |
| ← xaviergmail left | 19:54 |
| → buzzLightBeer joined | 19:54 |
| → Spec-Chum joined | 19:55 |
| → GNUtoo joined | 19:55 |
| → YuGiOhJCJ joined | 19:55 |
| → lacour joined | 19:56 |
| → NwS joined | 19:57 |
|
GodEater
| exit | 19:57 |
| ← theoceaniscool left | 19:58 |
|
osse
| final exit | 20:00 |
| ← clemf left | 20:01 |
| ← GNUtoo left | 20:02 |
| → TomyLobo joined | 20:05 |
| → GNUtoo joined | 20:07 |
| ← arnoldoree left | 20:07 |
| ← t0by left | 20:08 |
| → darkmist joined | 20:09 |
| ← dviola left | 20:09 |
| → xaviergmail joined | 20:09 |
| → diego1 joined | 20:09 |
| ← diego1 left | 20:10 |
| → diego1 joined | 20:10 |
| diego1 → dviola | 20:10 |
| ← Cavallari left | 20:10 |
| ← GNUtoo left | 20:12 |
| ← watabou_ left | 20:12 |
| → GodEater joined | 20:13 |
| ← GodEater left | 20:13 |
| → GodEater joined | 20:13 |
| → shams joined | 20:14 |
| ← WaReZ left | 20:17 |
| → GNUtoo joined | 20:17 |
| → Andselisk joined | 20:17 |
| → dreiss joined | 20:20 |
| ← dave0x6d left | 20:23 |
| ← rnsanchez left | 20:24 |
| → tojo joined | 20:24 |
| → rnsanchez joined | 20:26 |
| ← GNUtoo left | 20:27 |
| ← Gsham left | 20:27 |
| ← Balliad left | 20:28 |
| → pbrewczynski joined | 20:28 |
| → cdown joined | 20:28 |
| → ShoaibJahejo joined | 20:29 |
| ← xaviergmail left | 20:29 |
| ← Panacea left | 20:29 |
| ← youser left | 20:29 |
| → xaviergmail joined | 20:30 |
| ← tojo left | 20:31 |
| → tojo joined | 20:31 |
| ← tojo left | 20:33 |
| → tojo joined | 20:33 |
| → GNUtoo joined | 20:34 |
| → fragMental joined | 20:34 |
| ← buzzLightBeer left | 20:35 |
| → Jonno_FTW joined | 20:36 |
| → urda joined | 20:36 |
| ← Oatmeal left | 20:37 |
| → bronson joined | 20:37 |
| → prg3 joined | 20:39 |
| ← bronson left | 20:42 |
| ← urda left | 20:44 |
| ← YuGiOhJCJ left | 20:45 |
| ← tojo left | 20:45 |
| ← Darcidride left | 20:47 |
| ← xaviergmail left | 20:47 |
| → kulelu88 joined | 20:47 |
| → xaviergmail joined | 20:48 |
| ← cdown left | 20:49 |
| ← ShoaibJahejo left | 20:51 |
| ← sdothum left | 20:51 |
| → miklcct joined | 20:52 |
| → sdothum joined | 20:52 |
| → todder joined | 20:54 |
| ← sdothum left | 20:54 |
| → sdothum joined | 20:57 |
| → Atm0spher1c joined | 20:59 |
| ← MrLawrence left | 20:59 |
| → watabou_ joined | 21:00 |
| → WaReZ joined | 21:03 |
| ← howitdo left | 21:04 |
| ← todder left | 21:04 |
| → sea-gull joined | 21:06 |
| ← daynaskully left | 21:07 |
| → nowhere_man joined | 21:09 |
| → dodobrain joined | 21:10 |
| → todder joined | 21:11 |
| → howitdo joined | 21:12 |
| ← rnsanchez left | 21:13 |
| → tojo joined | 21:13 |
| → whatitdo joined | 21:16 |
| → jason237 joined | 21:17 |
| → ejb joined | 21:18 |
| ← dreiss left | 21:19 |
| ← howitdo left | 21:19 |
| ← a3Dman left | 21:24 |
| ← overlord_tm left | 21:24 |
| → jon-mac joined | 21:25 |
| → rwb joined | 21:26 |
| → daynaskully joined | 21:30 |
| ← nowhere_man left | 21:30 |
| → theskillwithin joined | 21:32 |
| → nowhere_man joined | 21:32 |
| → cdg joined | 21:33 |
| ← cdg left | 21:33 |
| → cdg joined | 21:33 |
| ← Jackneill left | 21:34 |
| → Ozymandy joined | 21:34 |
| → a3Dman joined | 21:34 |
| → armyriad joined | 21:36 |
| → bronson joined | 21:38 |
| ← Groscheri left | 21:39 |
| ← aw1 left | 21:40 |
| ← bronson left | 21:43 |
| ← Ozymandy left | 21:44 |
| → glebihan joined | 21:45 |
| ← shams left | 21:45 |
| ← cdg left | 21:47 |
| → satifant joined | 21:49 |
| ← freimatz left | 21:49 |
| ← synthroid left | 21:49 |
| → fatalhalt joined | 21:52 |
| ← fatalhalt left | 21:52 |
| ← xaviergmail left | 21:52 |
| ← tojo left | 21:52 |
| → aw1 joined | 21:53 |
| → xaviergmail joined | 21:53 |
| → newbie1 joined | 21:54 |
| → dikiaap joined | 21:55 |
| dikiaap → Guest49808 | 21:56 |
| ← cagedwisdom left | 21:56 |
| → Rodya_ joined | 21:56 |
| → beatdown joined | 21:57 |
| → ShoaibJahejo joined | 21:57 |
| ← ejb left | 21:58 |
| ← nowhere_man left | 21:58 |
| ← ExoUNX left | 22:00 |
| ← a3Dman left | 22:01 |
| → cdown joined | 22:02 |
| → kexmex joined | 22:03 |
| → nowhere_man joined | 22:04 |
| ← dodobrain left | 22:06 |
| ← jimi_ left | 22:08 |
| → cagedwisdom joined | 22:09 |
| → jimi_ joined | 22:10 |
| → boombatower joined | 22:11 |
| → JanC_ joined | 22:11 |
| ← jimi_ left | 22:12 |
| JanC_ → JanC | 22:13 |
| → a3Dman joined | 22:14 |
| ← ok91 left | 22:14 |
| ← cdown left | 22:14 |
| ← rwb left | 22:15 |
| → re1 joined | 22:15 |
| ← re1_ left | 22:16 |
| ← sea-gull left | 22:17 |
| → denimsoft joined | 22:19 |
| ← a3Dman left | 22:22 |
| → Gsham joined | 22:22 |
| → ejb joined | 22:23 |
| → Schrostfutz joined | 22:23 |
| ← xaviergmail left | 22:25 |
| ← denimsoft left | 22:25 |
| ← Rodya_ left | 22:26 |
| → TSS_ joined | 22:27 |
| → derk0pf joined | 22:28 |
| ← jnavila left | 22:28 |
| ← Gsham left | 22:29 |
| → madewokherd joined | 22:30 |
| ← mrnuke left | 22:30 |
| → Gsham joined | 22:30 |
| → mrnuke joined | 22:30 |
| → denimsoft joined | 22:31 |
| → blahdodo joined | 22:35 |
| → xaviergmail joined | 22:36 |
| → Zialus joined | 22:36 |
| → dirtyroshi joined | 22:36 |
| → a3Dman joined | 22:37 |
| → bronson joined | 22:39 |
| → leprechau joined | 22:39 |
| ← pbrewczynski left | 22:40 |
| → Rodya_ joined | 22:43 |
| ← vrlx left | 22:43 |
| ← bronson left | 22:44 |
| ← Rodya_ left | 22:44 |
| → Rodya_ joined | 22:45 |
| ← xaviergmail left | 22:45 |
| ← glebihan left | 22:47 |
| → sonOfRa joined | 22:53 |
| → rwb joined | 22:53 |
| ← cagedwisdom left | 22:55 |
| → xaviergmail joined | 22:55 |
| → fmeerkoetter joined | 23:01 |
| ← navidr left | 23:01 |
| → Guest55 joined | 23:04 |
| → dave0x6d joined | 23:08 |
| ← finalbeta left | 23:13 |
| → mda1 joined | 23:13 |
| → finalbeta joined | 23:13 |
| ← Gsham left | 23:16 |
| → sea-gull joined | 23:16 |
| ← mrnuke left | 23:17 |
| ← kexmex left | 23:17 |
| ← JamesBaxter left | 23:21 |
| ← CheckDavid left | 23:32 |
| ← Schrostfutz left | 23:36 |
| → cdown joined | 23:36 |
| ← sea-gull left | 23:38 |
| → cdown_ joined | 23:39 |
|
rizonz
| when I want to have all my repodata in . and not in my-repo/. should I move .git from my-repo/ to . and fetch ? | 23:39 |
| → bronson joined | 23:40 |
|
osse
| rizonz: do you want to move all files one level? | 23:40 |
|
rizonz
| osse: yap | 23:41 |
| ← cdown left | 23:41 |
| cdown_ → cdown | 23:41 |
|
osse
| rizonz: move .git then git add -A && git commit | 23:41 |
| → nckpz joined | 23:41 |
|
rizonz
| osse: ok great anmd can I update without adding my username/password every time ? | 23:41 |
|
| I will "kick" that with a post-hook | 23:41 |
| ← diogenese left | 23:42 |
|
osse
| yes | 23:42 |
|
rizonz
| post-commit | 23:42 |
|
osse
| man gitcredentials | 23:42 |
|
gitinfo
| the gitcredentials manpage is available at http://jk.gs/gitcredentials.html | 23:42 |
|
rizonz
| ok | 23:42 |
|
| merci | 23:42 |
|
| osse: tahn I can do that the SVN way I did | 23:42 |
|
| :) | 23:42 |
| ← cdown left | 23:43 |
|
rizonz
| osse: but you cannot checkout directly without moving that git file ? | 23:43 |
|
osse
| rizonz: the .git dir determines what the top level is. If you move it then Git thinks all the files have moved. | 23:44 |
|
| if you want to keep it that way you want to commit it | 23:44 |
|
rizonz
| osse: it doed indeed | 23:44 |
|
osse
| i have not used svn so I cannot compare | 23:44 |
|
rizonz
| osse: no it only needs to grab/pull from the gitserver | 23:44 |
|
| will never push | 23:44 |
| → cdown joined | 23:45 |
| ← bronson left | 23:45 |
| ← satifant left | 23:45 |
| → satbyy joined | 23:45 |
| → diogenese joined | 23:46 |
| ← ejb left | 23:48 |
|
satbyy
| Hi, when I do git checkout master, it complains "error: pathspec 'origin/master' did not match any file(s) known to git." | 23:48 |
|
| I mean "git checkout origin/master" ^ | 23:48 |
|
| git push / pull seem to work though. | 23:49 |
| ← WaReZ left | 23:49 |
|
satbyy
| But, git show-ref doesn't show origin/master at all | 23:50 |
| → thiago joined | 23:50 |
| ← cdown left | 23:51 |
|
rizonz
| osse: mhh doesn't work :( | 23:52 |
|
| oh | 23:52 |
| → Nilesh_ joined | 23:54 |
| → robotroll joined | 23:55 |
| → clemf joined | 23:56 |
| → JamesBaxter joined | 23:58 |