| 2016-08-17 |
| ← abyx left | 00:00 |
| ← cyan__ left | 00:00 |
| → Neico joined | 00:01 |
| ← yoan left | 00:01 |
| ← oich left | 00:06 |
| → arescorpio joined | 00:06 |
| ← qpdb left | 00:07 |
| → qpdb joined | 00:07 |
| ← jimi_ left | 00:07 |
| ← grant-h left | 00:09 |
| ← weckl left | 00:10 |
| → rkazak joined | 00:11 |
| ← crayon left | 00:13 |
| → vassagus joined | 00:14 |
| ← p4trix left | 00:14 |
| → shgysk8zer0 joined | 00:15 |
| ← dreiss left | 00:16 |
| ← vassagus left | 00:18 |
| ← spudowiar left | 00:20 |
| → eka joined | 00:21 |
| ← cyphase left | 00:21 |
| → fstd_ joined | 00:22 |
| → stux joined | 00:23 |
| ← fstd left | 00:23 |
| fstd_ → fstd | 00:23 |
| → cyphase joined | 00:26 |
| → Lipp joined | 00:26 |
| → JamesBaxter joined | 00:27 |
| ← nitric left | 00:27 |
| ← xall left | 00:28 |
| ← JamesBaxter left | 00:32 |
| → nullp0inter joined | 00:33 |
| ← rkazak left | 00:33 |
| ← weox left | 00:34 |
| ← foist left | 00:34 |
| ← tgunr left | 00:38 |
|
RustyShackleford
| So i'm working on my own feature branch. All developers are in one repository, no forks | 00:39 |
|
| this is a rewrite, so lots of initial development. I would like to keep my branch up to date with master, daily perhaps | 00:39 |
| ← durham left | 00:39 |
|
RustyShackleford
| I also back up my work remotely often since I work from another computer | 00:40 |
| → durham joined | 00:40 |
|
RustyShackleford
| is there a way to do this without needed to force push? | 00:40 |
| ← al-damiri left | 00:40 |
|
nedbat
| RustyShackleford: without a force push to where? | 00:41 |
|
RustyShackleford
| my own feature branch | 00:41 |
| ← clemf left | 00:41 |
|
kadoban
| RustyShackleford: You can merge master into your branch occasionally. | 00:41 |
|
nedbat
| RustyShackleford: you could merge master into your branch. why don't you want to force push? | 00:41 |
|
RustyShackleford
| it makes coworkers uncomfortable | 00:41 |
|
kadoban
| Without needing to force push, I think that's really the old way. | 00:41 |
| ← harish_ left | 00:42 |
|
kadoban
| s/old/only/ | 00:42 |
| → JamesBaxter joined | 00:42 |
|
RustyShackleford
| I don't think its risky. Nobody else is using my branch | 00:42 |
| ← ahr3n left | 00:42 |
|
RustyShackleford
| but I'm not sure how common the rebase and force push tactic is | 00:42 |
| ← m0viefreak left | 00:42 |
|
kadoban
| Quite common | 00:43 |
|
nedbat
| RustyShackleford: i do it all the time. | 00:44 |
|
| RustyShackleford: but you do want to be careful that you are the only one using the branch. | 00:45 |
| ← xaa left | 00:47 |
| ← Sample left | 00:47 |
| ← Lipp left | 00:49 |
| ← bobdobbs left | 00:49 |
| ← nettoweb left | 00:51 |
| → crayon joined | 00:51 |
| ← Bizkit left | 00:54 |
| → durham_ joined | 00:54 |
| → tesuji_ joined | 00:54 |
| → danimal2 joined | 00:55 |
| → kulyzu joined | 00:55 |
| ← kulyzu left | 00:55 |
| → ytl joined | 00:55 |
| → ShekharReddy joined | 00:55 |
| → kulyzu joined | 00:55 |
| ← tesuji left | 00:55 |
| → xall joined | 00:56 |
| ← durham left | 00:56 |
| ← b1tchcakes left | 00:57 |
| → b1tchcak_ joined | 00:57 |
|
rewt
| RustyShackleford, why do you need to force push? | 00:58 |
| → Anderson69s_Pi joined | 01:01 |
| ← cdg left | 01:01 |
| ← pi__ left | 01:03 |
| ← eka left | 01:04 |
| → eka joined | 01:05 |
| ← xall left | 01:06 |
| → fractalizator_ joined | 01:06 |
| → rossome joined | 01:07 |
| → abyx joined | 01:07 |
| ← nunchuck left | 01:07 |
| → ahr3n joined | 01:08 |
| ← shgysk8zer0 left | 01:08 |
| ← kulyzu left | 01:09 |
| ← pks left | 01:09 |
| ← fractalizator left | 01:09 |
| → rj11 joined | 01:10 |
| rj11 → Guest97013 | 01:10 |
| ← d^sh left | 01:10 |
| → pks joined | 01:10 |
| → clemf joined | 01:11 |
| → d^sh joined | 01:11 |
|
nedbat
| rewt: if you rebase your branch, you need to force push | 01:11 |
| → zivester joined | 01:12 |
| ← rj1 left | 01:12 |
|
rewt
| could just merge instead | 01:13 |
|
nullp0inter
| i have a master and a beta branch, i work out of my home dir, but i want to be able to look at both beta and master on the web...i have two dirs /var/www/html/webapp and /var/www/html/beta how do you set these up to pull from the repo? im going to explore automatic deployment soon, just want to get some previews going | 01:14 |
|
| do i clone in there? | 01:14 |
| → vassagus joined | 01:15 |
|
rewt
| make a script to pull one branch and copy the files over, then pull the other branch and copy the files to the other dir | 01:15 |
| ← Guest97013 left | 01:16 |
| ← abyx left | 01:16 |
| → rj1 joined | 01:16 |
|
nullp0inter
| rewt, do i do a git init in those dirs? | 01:17 |
| ← RustyShackleford left | 01:17 |
|
rewt
| no git in those dirs | 01:17 |
|
| copy from your git dir to those dirs with cp/scp | 01:17 |
| → abyx joined | 01:18 |
| → RustyShackleford joined | 01:19 |
| ← a3Dman left | 01:20 |
| → mingrammer joined | 01:20 |
| ← vassagus left | 01:20 |
| ← shinnya left | 01:20 |
| ← EvilPeng1 left | 01:20 |
| → Orville joined | 01:22 |
| → a3Dman joined | 01:22 |
| → l4v2 joined | 01:24 |
| ← mingrammer left | 01:24 |
| ← theskillwithin left | 01:33 |
| → clarens0000 joined | 01:34 |
| → theskillwithin joined | 01:35 |
| ← clarens0000 left | 01:35 |
| ← mellernoia left | 01:38 |
| → rchavik joined | 01:43 |
| ← dsantiago left | 01:45 |
| ← abyx left | 01:45 |
| b1tchcak_ → b1tchcakes | 01:45 |
| ← ilbot3 left | 01:46 |
| → Lipp joined | 01:46 |
| ← theskillwithin left | 01:47 |
| → ilbot3 joined | 01:48 |
| → hahuang61 joined | 01:50 |
| ← Darren_ left | 01:51 |
| ← Lipp left | 01:52 |
| ← crayon left | 01:52 |
| → Vampire0 joined | 01:53 |
|
RustyShackleford
| so you guys are not against frequent rebase-and-force-pushing? | 01:54 |
|
| seems to be a controversial topic | 01:54 |
| ← paws_ left | 01:54 |
| → xall joined | 01:55 |
| ← hahuang61 left | 01:55 |
| ← Vampire0_ left | 01:56 |
| → shaggycat joined | 01:56 |
|
SporkWitch
| didn't we cover this rather thoroughly last night? | 01:57 |
| → settermjd joined | 01:57 |
|
RustyShackleford
| SporkWitch, sure. I got different answers when I asked again though | 01:58 |
|
| not that I'm saying you're wrong | 01:58 |
|
SporkWitch
| not a problem, was just wondering why i fell through a time warp | 01:58 |
|
RustyShackleford
| IIRC you suggest working in my own fork and then rebasing as I please | 01:58 |
|
SporkWitch
| when i time warp, i like there to be tim curry around | 01:59 |
|
| yup! | 01:59 |
|
| the history that matters is the history others could potentially see BEFORE the rebase | 01:59 |
| ← cyphase left | 01:59 |
| → theskillwithin joined | 02:00 |
|
SporkWitch
| if it's in a private repo, there's no harm done, the worst case is they see terrible commit comments and you potentially introduce some reversions. It's when others see it before the rebase and again after that problems can crop up, because now we have conflicting history between repos | 02:00 |
|
| s/reversions/regressions/ | 02:00 |
| ← xall left | 02:01 |
|
RustyShackleford
| but if each developer works in his own branch, all of which branch from master | 02:01 |
| → Shakeel__ joined | 02:01 |
|
RustyShackleford
| rewriting history shouldn't affect anyone but me | 02:02 |
| ← settermjd left | 02:02 |
|
SporkWitch
| RustyShackleford: fetch grabs 'em all | 02:02 |
| ← pothepanda left | 02:03 |
| ← Literphor left | 02:03 |
|
RustyShackleford
| okay good point. So they would potentially run into issues if they check out my branch? | 02:03 |
|
SporkWitch
| RustyShackleford: more than that | 02:03 |
|
| RustyShackleford: check the manpage: man git fetch | 02:04 |
|
gitinfo
| RustyShackleford: the git-fetch manpage is available at http://jk.gs/git-fetch.html | 02:04 |
| ← nullp0inter left | 02:04 |
| → cyphase joined | 02:04 |
|
| SporkWitch loves this bot | 02:04 |
|
RustyShackleford
| nobodies complained about a broken git repo yet | 02:06 |
| → mingrammer joined | 02:06 |
|
RustyShackleford
| read the manpage. What am I supposed to conclude? | 02:06 |
| ← clemf left | 02:06 |
|
SporkWitch
| and now the reason you've asked three times is clear: you didn't LIKE the answer lol | 02:08 |
|
| if you're just looking for the answer you wanted from the start, go into your bathroom, you've got a mirror in there most likely. | 02:08 |
|
| the manpage is fairly self explanatory, and explains all of what it pulls. When you rebase and force-push, you're changing that history. Now the history in the repo you pushed to doesn't match the history in anyone else's. | 02:09 |
| ← mingrammer left | 02:09 |
| → Rodya_ joined | 02:09 |
| ← _sjs left | 02:10 |
|
RustyShackleford
| SporkWitch, got me there :p | 02:14 |
|
| doesn't the next git fetch fix their history issue? | 02:14 |
| → mingrammer joined | 02:14 |
| → Literphor joined | 02:15 |
| ← _Cyclone_ left | 02:15 |
| → vassagus joined | 02:16 |
|
SporkWitch
| RustyShackleford: potentially, or maybe they take something you did to some file because it helps them | 02:16 |
| ← shaggycat left | 02:16 |
|
SporkWitch
| RustyShackleford: end of the day, you're rewriting history in a shared repository, and that is BAD™ | 02:16 |
|
RustyShackleford
| I think I'll get this branch merged in and then start working in a fork just to be safe | 02:17 |
|
SporkWitch
| that would typically be the best way. storage is cheap. | 02:17 |
| → shaggycat joined | 02:19 |
|
RustyShackleford
| welp, gonna consult with myself in the bathroom mirror real quick | 02:19 |
| → watabou joined | 02:19 |
| ← vassagus left | 02:20 |
|
RustyShackleford
| managing a fork is a pain in the butt. Not that difficult, but an extra step | 02:20 |
|
SporkWitch
| it really isn't lol | 02:21 |
| ← rwswitch left | 02:21 |
| → rwswitch joined | 02:22 |
| ← chachasmooth left | 02:22 |
|
SporkWitch
| done right it's a grand total of ONE extra step: forking the repository in the first place. After that, your workflow wouldn't actually change or add any steps, but you WOULD be removing the risk of buggering up the history on the shared repo | 02:23 |
| → chachasmooth joined | 02:24 |
|
RustyShackleford
| i've screwed up by confusing the two repos. Granted, it was my fault for having them both on my computer | 02:25 |
|
| both open in a terminal window | 02:25 |
| → nettoweb joined | 02:26 |
|
SporkWitch
| well, that's a problem with the main repo; it shouldn't even be ALLOWING you to force-push to it, in a sane configuration | 02:26 |
|
RustyShackleford
| nothing is sane where I work hah | 02:27 |
|
| we're all pretty new to git, recent migration. I've used it before, but on my own projects not in a team | 02:27 |
|
SporkWitch
| but that's about the only thing that would change: you push to origin (which should be your repo, not the one you forked FROM), and you submit pull requests to upstream (the one you forked from) | 02:27 |
|
| you don't push upstream, you ask upstream to pull from you; end result is the same, but the agency is different, and that difference is essential for maintaining integrity and preventing issues (like accidentally damaging the upstream because you pushed to the wrong place) | 02:28 |
| ← nettoweb left | 02:29 |
| ← rwswitch left | 02:29 |
| → rwswitch joined | 02:29 |
|
RustyShackleford
| do pretty much all git servers allow for pull requests and forks? | 02:30 |
|
| github and bitbucket do | 02:31 |
|
SporkWitch
| RustyShackleford: entirely dependent on the settings of the system | 02:32 |
|
| RustyShackleford: github private repos require auth to clone (which is all a fork is, initially; formal "forking" in things like github and bitbucket is merely a tracking tool to maintain the relations and allow for easy visibility and collaboration, within those that are authorized to view it) | 02:34 |
| → nullp0inter joined | 02:34 |
| ← hexagoxel left | 02:35 |
| → cdown joined | 02:35 |
| → lagothrix joined | 02:36 |
| → durham joined | 02:37 |
| ← lagothri1 left | 02:39 |
| → rads joined | 02:40 |
| → hexagoxel joined | 02:40 |
| ← rads left | 02:41 |
| ← ahmedelgabri left | 02:41 |
| ← durham_ left | 02:41 |
| → tgunr joined | 02:41 |
| ← durham left | 02:41 |
| ← rwswitch left | 02:42 |
| → atomicb0mb joined | 02:43 |
| ← HoierM left | 02:45 |
| → Goplat joined | 02:46 |
| → darkbit joined | 02:46 |
| ← moei left | 02:46 |
| → dodobrain joined | 02:48 |
| → moei joined | 02:48 |
| → snowkidind joined | 02:49 |
| ← Rodya_ left | 02:50 |
| ← skylite left | 02:50 |
| → skylite joined | 02:51 |
| → crayon joined | 02:53 |
| ← shaggycat left | 02:55 |
| ← NeverDie left | 02:55 |
| ← thiago left | 02:57 |
| ← dodobrain left | 02:58 |
| ← cdown left | 02:59 |
| ← Dougie187 left | 02:59 |
| ← atomicb0mb left | 03:00 |
| → rwswitch joined | 03:00 |
| → aavrug joined | 03:00 |
| ← aavrug left | 03:01 |
| → aavrug joined | 03:01 |
| ← aavrug left | 03:02 |
| → dodobrain joined | 03:02 |
| → aavrug joined | 03:03 |
| ← madewokherd left | 03:03 |
| → fstd_ joined | 03:04 |
| ← NeonSynth left | 03:06 |
| → boombatower joined | 03:07 |
| ← cyphase left | 03:07 |
| → dhollinger joined | 03:07 |
| ← nullp0inter left | 03:07 |
| ← fstd left | 03:08 |
| fstd_ → fstd | 03:08 |
| ← rossome left | 03:09 |
| → nunchuck joined | 03:10 |
| ← kulelu88 left | 03:12 |
| → cyphase joined | 03:12 |
| ← JamesBaxter left | 03:13 |
| → b1tchcak_ joined | 03:14 |
| → clemf joined | 03:14 |
| ← johnny56 left | 03:15 |
| → vassagus joined | 03:16 |
| ← b1tchcakes left | 03:17 |
| → OrvilleWright joined | 03:20 |
| ← vassagus left | 03:21 |
| → rossome joined | 03:21 |
| ← Orville left | 03:22 |
| → hahuang61 joined | 03:22 |
| → annoymouse joined | 03:23 |
| ← Literphor left | 03:24 |
| → mehola joined | 03:26 |
| → Pinkamena_D joined | 03:26 |
| ← hahuang61 left | 03:27 |
| ← mostlybadfly left | 03:27 |
| ← rwswitch left | 03:28 |
| → b1tchcakes joined | 03:28 |
| ← b1tchcak_ left | 03:28 |
| Maple__ → France | 03:29 |
| France → Maple__ | 03:30 |
| → b1tchcak_ joined | 03:31 |
| ← b1tchcakes left | 03:32 |
| ← b1tchcak_ left | 03:32 |
| ← mehola left | 03:35 |
| → Literphor joined | 03:36 |
| → xall joined | 03:38 |
| ← rgrinberg left | 03:38 |
| ← BSaboia left | 03:40 |
| → texinwien_ joined | 03:41 |
| ← snowkidind left | 03:41 |
| → JanC_ joined | 03:42 |
| JanC → Guest33791 | 03:43 |
| ← Guest33791 left | 03:43 |
| JanC_ → JanC | 03:43 |
| ← danimal2 left | 03:44 |
| → robogoat joined | 03:44 |
| ← Maple__ left | 03:45 |
| → rwswitch joined | 03:45 |
| → mehola_ joined | 03:46 |
| → The_Phoenix joined | 03:47 |
| ← The_Phoenix left | 03:47 |
| → The_Phoenix joined | 03:48 |
| ← The_Phoenix left | 03:48 |
| → Lipp joined | 03:48 |
| ← afuentes left | 03:49 |
| → The_Phoenix joined | 03:49 |
| ← The_Phoenix left | 03:50 |
| → The_Phoenix joined | 03:51 |
| ← diegoviola left | 03:52 |
| ← Lipp left | 03:53 |
| ← Derperperd left | 03:54 |
| ← rwswitch left | 03:54 |
| ← tgunr left | 03:54 |
| → rwswitch joined | 03:55 |
| → Derperperd joined | 03:55 |
| → chandu20 joined | 03:56 |
| → scott_sd joined | 03:56 |
| ← rwswitch left | 03:57 |
| ← clemf left | 03:57 |
| → bayman joined | 03:58 |
| → GT4066 joined | 03:59 |
| ← thecomedian left | 04:00 |
| → thecomedian joined | 04:00 |
| ← cfxd left | 04:02 |
| → clemf joined | 04:03 |
| ← blackwind_123 left | 04:04 |
| → johnny56 joined | 04:07 |
| → Andrew_K joined | 04:07 |
| ← netj left | 04:10 |
| → netj joined | 04:11 |
| ← dhollinger left | 04:11 |
| → rkazak joined | 04:14 |
| → dsantiago joined | 04:14 |
| ← arescorpio left | 04:15 |
| → vassagus joined | 04:17 |
| → _sjs joined | 04:18 |
| ← Cabanossi left | 04:19 |
| ← jas4711 left | 04:20 |
| → Cabanossi joined | 04:22 |
| linuxmodder- → linuxmodder | 04:22 |
| ← _sjs left | 04:22 |
| ← vassagus left | 04:22 |
| → snowkidind joined | 04:24 |
| → nettoweb joined | 04:24 |
| ← daynaskully left | 04:26 |
| → ljc joined | 04:27 |
| ← realz left | 04:27 |
| ← Pinkamena_D left | 04:27 |
| → Pinkamena_D joined | 04:27 |
| → realz joined | 04:30 |
| ← InfoTest left | 04:31 |
| ← xall left | 04:37 |
| → MrWoohoo joined | 04:38 |
| ← bayman left | 04:41 |
| ← kadoban left | 04:43 |
| ← chandu20 left | 04:44 |
| ← ljc left | 04:46 |
| ← sdothum left | 04:47 |
| → ljc joined | 04:48 |
| ← _W_ left | 04:49 |
| ← ljc left | 04:50 |
| ← kutsuya left | 04:52 |
| ← CheckDavid left | 04:53 |
| → dr_lepper joined | 04:55 |
| ← Gamecubic left | 04:55 |
| → subhojit777 joined | 04:57 |
| ← snowkidind left | 04:58 |
| → xall joined | 04:59 |
| → YourTheBombNow23 joined | 04:59 |
| → cqi joined | 05:00 |
| → eivarv joined | 05:04 |
| → kutsuya joined | 05:06 |
| → tjayanth joined | 05:07 |
| ← Kaisyu left | 05:07 |
| → Lipp joined | 05:10 |
| ← eivarv left | 05:13 |
| ← nunchuck left | 05:16 |
| ← Lipp left | 05:16 |
| ← diogenese left | 05:18 |
| ← ShekharReddy left | 05:19 |
| → vassagus joined | 05:20 |
| → chandu20 joined | 05:21 |
| ← Khisanth left | 05:22 |
| ← aidalgol left | 05:23 |
| → hahuang61 joined | 05:23 |
| ← chachasmooth left | 05:24 |
| ← vassagus left | 05:25 |
| → nunchuck joined | 05:25 |
| → leeN joined | 05:26 |
| ← dr_lepper left | 05:27 |
| ← hahuang61 left | 05:28 |
| → jrobeson joined | 05:28 |
| → Kaisyu joined | 05:28 |
| → chachasmooth joined | 05:30 |
| ← zivester left | 05:31 |
| ← OrvilleWright left | 05:33 |
| → diogenese joined | 05:33 |
| → Khisanth joined | 05:34 |
| ← jrobeson left | 05:35 |
| → thiago joined | 05:36 |
| ← nunchuck left | 05:36 |
| ← chandu20 left | 05:37 |
| → nidr0x joined | 05:38 |
| ← nettoweb left | 05:38 |
| → zeroed joined | 05:39 |
| → circ-user-RNfpp joined | 05:40 |
| ← GT4066 left | 05:44 |
| ← tyreld left | 05:45 |
| ← govg left | 05:45 |
| ← clemf left | 05:47 |
| → mariuscc joined | 05:49 |
| → eivarv joined | 05:49 |
| ← eivarv left | 05:51 |
| → Raging_Hog joined | 05:52 |
| ← Manuel15 left | 05:54 |
| → nunchuck joined | 05:54 |
| → _sjs joined | 05:56 |
| → bocaneri joined | 05:56 |
| → settermjd joined | 05:57 |
| ← mehola_ left | 05:58 |
| → Manuel15 joined | 05:58 |
| ← Manuel15 left | 05:58 |
| → Manuel15 joined | 05:58 |
| → rscata joined | 05:59 |
| → kappy joined | 06:00 |
| → LucaTM joined | 06:03 |
| → satya4ever joined | 06:03 |
| ← dodobrain left | 06:03 |
| ← Pinkamena_D left | 06:03 |
| ← YourTheBombNow23 left | 06:04 |
| → dodobrain joined | 06:05 |
| → TomyLobo joined | 06:07 |
| → tgunr joined | 06:09 |
| ← tgunr left | 06:09 |
| → jceb joined | 06:10 |
| → tgunr joined | 06:12 |
| → roelmonnens joined | 06:13 |
| ← rkazak left | 06:14 |
| → mehola joined | 06:16 |
| ← tgunr left | 06:17 |
| → tgunr joined | 06:19 |
| ← ahr3n left | 06:20 |
| → govg joined | 06:20 |
| → vassagus joined | 06:21 |
| ← tgunr left | 06:25 |
| → tgunr joined | 06:25 |
| ← vassagus left | 06:26 |
| → alansaul joined | 06:26 |
| kugel_ → kugel | 06:27 |
| ← l4v2 left | 06:28 |
| → qt-x joined | 06:28 |
| → Lipp joined | 06:34 |
| → jknetl joined | 06:34 |
| ← tgunr left | 06:36 |
| ← TomyLobo left | 06:37 |
| → th3Dotor joined | 06:37 |
| → freimatz joined | 06:38 |
| ← Lipp left | 06:38 |
| → Jibz joined | 06:38 |
| → inflames joined | 06:41 |
| ← sin3t left | 06:43 |
|
Jibz
| I'm on Windows, and I've converted a mercurial repo to git (hg-fast-export), and did a rebase to reword most of the commit messages. Now I wish to set the commit date back to the author date, but `git rebase --committer-date-is-author-date --root` appears to set the commit date to now. Anything I am doing wrong? | 06:43 |
| → Sceorem joined | 06:46 |
| ← _sjs left | 06:47 |
| ← inflames left | 06:47 |
|
Jibz
| hmm looks like --root implies -i (for no apparent reason), so --committer-date-is-author-date silently does nothing .. sigh | 06:49 |
| → tgunr joined | 06:50 |
| ← mingrammer left | 06:51 |
| ← thiago left | 06:53 |
| ← fractalizator_ left | 06:53 |
| → freddymungo joined | 06:56 |
| → jstein_ joined | 06:57 |
| → submitnine joined | 06:57 |
| → rkazak joined | 06:58 |
| ← niranjan left | 06:59 |
| jstein_ → jstein | 06:59 |
| → jeffreylevesque_ joined | 06:59 |
| ← jeffreylevesque left | 07:00 |
| ← RustyShackleford left | 07:02 |
| → niranjan joined | 07:04 |
| ← alansaul left | 07:08 |
| ← peepsalot left | 07:08 |
| ← settermjd left | 07:08 |
| → MainB joined | 07:09 |
| ← watabou left | 07:09 |
| → jguillen joined | 07:13 |
| ← fahadash left | 07:13 |
| ← freimatz left | 07:13 |
| → alansaul joined | 07:14 |
| → chigang_ joined | 07:15 |
| ← freddymungo left | 07:16 |
| → freddymungo joined | 07:16 |
| ← freddymungo left | 07:16 |
| ← nunchuck left | 07:17 |
| → t0by joined | 07:18 |
| → styler2go joined | 07:18 |
| → ome joined | 07:22 |
| → vassagus joined | 07:22 |
| → xaa joined | 07:22 |
| → hahuang61 joined | 07:24 |
| → saedelaere joined | 07:24 |
| ← Freeze16 left | 07:25 |
| ← th3Dotor left | 07:26 |
| → Balliad joined | 07:26 |
| ← vassagus left | 07:26 |
| ← ytl left | 07:27 |
| ← tgunr left | 07:27 |
| ← rkazak left | 07:28 |
| ← hahuang61 left | 07:28 |
| ← venmx left | 07:30 |
| → vuoto joined | 07:30 |
| → Lomex joined | 07:30 |
| → sddwdw joined | 07:30 |
| ← Pulp left | 07:31 |
|
sddwdw
| How do I remove the latest commit from master? | 07:31 |
| → mingrammer joined | 07:32 |
|
selckin
| rewrite history so it never happened remove, or revert by commiting the inverse? | 07:33 |
| ← Impaloo left | 07:33 |
| → Impaloo joined | 07:33 |
| ← mingrammer left | 07:33 |
| → mingrammer joined | 07:33 |
| ← Guest93616 left | 07:36 |
| → WAA1H2P joined | 07:36 |
| → Guest93616 joined | 07:36 |
| ← ki0_ left | 07:36 |
| → ki0 joined | 07:37 |
| → spudowiar joined | 07:39 |
| gitinfo set mode: +v | 07:39 |
| ← alansaul left | 07:40 |
| ← Goplat left | 07:40 |
| → Xin joined | 07:41 |
|
Xin
| hey all im just getting used to git command line lol | 07:41 |
|
| we want to track everyones stuff so we can see who is doing what using git remotes | 07:41 |
|
| so we want to do something like a dev comes in to program for the day | 07:41 |
| → ahmedelgabri joined | 07:42 |
|
Xin
| they clone/fork the current dev branch from a public project | 07:42 |
| → ljc joined | 07:42 |
|
Xin
| now I have say 10 users with clones/forks... | 07:42 |
|
| how do I get all their individual changes into the public dev branch | 07:43 |
| → th3Dotor joined | 07:43 |
|
Xin
| like what do they do at the end of their sessions? | 07:43 |
| ← th3Dotor left | 07:43 |
| → alansaul joined | 07:43 |
|
selckin
| they go home | 07:44 |
|
Xin
| lol but how do they merge it in? | 07:44 |
|
| and how do I allow them access to do so? | 07:45 |
|
selckin
| they work on features/changes and create logical commits for those, and when they are ready to get usually get pushed/merged into the central repo | 07:45 |
| ← jaafar left | 07:45 |
|
Xin
| so how do they push that to a public git though without say github | 07:46 |
|
selckin
| by typing git push | 07:46 |
|
Xin
| or can I allow them to push to github somehow? | 07:46 |
| ← sddwdw left | 07:46 |
|
selckin
| !github | 07:46 |
|
gitinfo
| Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees) | 07:46 |
| ← marcm left | 07:46 |
|
Xin
| right im asking how to do it without github | 07:46 |
|
| -_- | 07:46 |
|
selckin
| standard feature | 07:46 |
|
| notting special | 07:46 |
|
Impaloo
| !man git-push | 07:46 |
|
gitinfo
| The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ? | 07:46 |
|
| the git-push manpage is available at http://jk.gs/git-push.html | 07:46 |
|
Xin
| they do something like git push git:git@originhost | 07:47 |
|
| right? | 07:47 |
|
selckin
| !man git-remote | 07:48 |
|
gitinfo
| The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ? | 07:48 |
|
| the git-remote manpage is available at http://jk.gs/git-remote.html | 07:48 |
| → Lipp joined | 07:51 |
|
Xin
| yep so I add the correct remote origin and branch details | 07:53 |
|
| and if they push over ssh then they just need a user account on the server eh? | 07:53 |
|
selckin
| !gitolite | 07:54 |
|
gitinfo
| Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/ | 07:54 |
|
selckin
| but yes | 07:54 |
|
Xin
| yeah im not sure I need anything like that, this is great | 07:55 |
|
| thanks for your advice | 07:55 |
| → nikivi joined | 07:57 |
| → kurkale6ka joined | 07:57 |
| → rchavik_ joined | 07:57 |
|
armin
| i'm just writing a script to create/delete/list repositories on a remote server accessible via ssh because i got too annyoed by gitolite actually. | 07:57 |
|
| shoot me. | 07:57 |
|
selckin
| gitolite is awesome, you're the problem | 07:58 |
| ← KeelOfSteel left | 07:58 |
| ← darkbit left | 07:58 |
|
armin
| selckin: i've actually used it for a long time. | 07:58 |
| → mehola_ joined | 07:58 |
| ← jceb left | 07:58 |
|
selckin
| maybe it doesn't match your usecase, but its still awesome | 07:58 |
| ← mehola left | 07:58 |
| → KeelOfSteel joined | 07:59 |
| → sin3t joined | 07:59 |
| ← Xin left | 07:59 |
| → EduardoMartins joined | 07:59 |
|
armin
| selckin: it surely is awesome. that doesn't mean i could implement something like that on my own, though, so let's try. i'm not even saying i won't fail at trying to do so. :) | 08:00 |
|
| selckin: i used it. for a long time. probably what annoyed me most was debian's default, but i don't have other distributions or operating systems to compare with. | 08:01 |
| ← rchavik_ left | 08:01 |
| → mohabaks joined | 08:02 |
| → dreiss joined | 08:04 |
| ← ljc left | 08:05 |
| ← alansaul left | 08:07 |
| → TomyWork joined | 08:07 |
| → Oebele joined | 08:08 |
| → ki0_ joined | 08:11 |
| ← ki0_ left | 08:11 |
| → ki0_ joined | 08:11 |
| → bongjovi joined | 08:12 |
| ← dreiss left | 08:13 |
| → tomog999 joined | 08:13 |
| ← ki0 left | 08:14 |
|
sitaram
| armin: https://paste.fedoraproject.org/409478/14714216 is some ~/.gitconfig aliases I use when even I feel gitolite is too heavy :-) | 08:14 |
| ← tomog999_ left | 08:15 |
| ← nikivi left | 08:15 |
|
sitaram
| but honestly, gitolite with a simple wild card rule would be the same end-result, but more flexible if things change later | 08:15 |
| → slugmandrew joined | 08:16 |
| → nikivi joined | 08:17 |
| ← Phlogistique left | 08:17 |
|
sitaram
| armin: what was the "debian default" issue? I'm interested in details (even if I don't use debian) | 08:17 |
| → WayToDoor joined | 08:17 |
| → hjubal joined | 08:18 |
| ← crayon left | 08:20 |
| → jceb joined | 08:21 |
| → robotroll joined | 08:22 |
| → infra-red joined | 08:22 |
| → vassagus joined | 08:23 |
| → lynkd joined | 08:23 |
| ← Guest93616 left | 08:25 |
| → Guest93616 joined | 08:25 |
| ← vassagus left | 08:27 |
| → Virox joined | 08:29 |
| → chll_ joined | 08:32 |
| → fakenerd joined | 08:34 |
| ← cqi left | 08:34 |
| → ahmed_elgabri joined | 08:34 |
| → maaarghk joined | 08:34 |
| ← jason237 left | 08:35 |
|
maaarghk
| Hi, quick question - I want to do a sparse checkout of a single folder. Is it possible to effectively chroot the working copy to that single folder? | 08:36 |
| → venmx joined | 08:36 |
| → ams__ joined | 08:37 |
|
maaarghk
| It would be as if the following were possible; `git checkout https://github.com/git/git/Documentation` | 08:37 |
| → slixpk joined | 08:37 |
|
selckin
| no | 08:37 |
| ← ahmedelgabri left | 08:37 |
|
lb
| maaarghk sparse checkout? you could play with die env variable GIT_DIR and then do the normal git checkout -- /path/to/folder | 08:37 |
|
selckin
| checkout or clone? | 08:38 |
| → alansaul joined | 08:38 |
|
lb
| ahh right, selckin spotted the key question. checkout works only with local clones... | 08:38 |
|
maaarghk
| sorry | 08:39 |
|
| my brain is back to front | 08:39 |
|
| i meant as if `git clone https...` were possible | 08:39 |
|
selckin
| not possible | 08:40 |
|
maaarghk
| alright | 08:40 |
|
| guess ill use symlinks as a workaround | 08:41 |
|
lb
| maaarghk no that's not possible. you can only clone with the --depth parameter used, to limit the cloned amount of data | 08:41 |
|
| man git clone | 08:41 |
|
gitinfo
| the git-clone manpage is available at http://jk.gs/git-clone.html | 08:41 |
|
maaarghk
| yeah that's as in depth of history right? | 08:41 |
| → fate_ joined | 08:41 |
|
lb
| yes | 08:41 |
|
| i don't recommend that though ^^ | 08:41 |
| ← vuoto left | 08:41 |
|
maaarghk
| yeah it's not what i'm after anyway | 08:42 |
|
lb
| but that's more my guts feeling. i don't have a technical reason for it | 08:42 |
|
| great \o/ | 08:42 |
|
| !botsnack | 08:42 |
|
gitinfo
| Om nom nom | 08:42 |
| ← Shentino left | 08:43 |
| ← roelmonnens left | 08:44 |
|
maaarghk
| i think i was probably looking for a --relative paramete ron git read-tree | 08:44 |
|
armin
| sitaram: hi. i found "gitolite3" to be not the user name i would want on a git server as i like simple user- and host-names, so i ended up changing a lot of those defaults for the user-name to be "git". also what's actually happening is just a wrapper that is being called from authorized_keys as command= which reads $SSH_ORIGINAL_COMMAND so i considered i could roll my own. | 08:45 |
|
lb
| armin there is #gitolite for gitolite specific questions | 08:48 |
|
armin
| lb: that's quite awesome. i don't have one, though. | 08:49 |
| → cyan__ joined | 08:49 |
| ← annoymouse left | 08:50 |
| → roelmonnens joined | 08:51 |
| ← WayToDoor left | 08:53 |
| ← Guest93616 left | 08:53 |
| → Guest93616 joined | 08:54 |
| → davisonio joined | 08:54 |
| → _sjs joined | 08:55 |
| → Shentino joined | 08:56 |
|
sitaram
| armin: yeah that maybe a debian default. But I suspect, after you install it, you can simply ignore "gitolite3" and start *using* gitolite on some other userid (most people prefer "git"). Gitolite is designed to allow any Unix user to be used as a "hosting user" | 08:57 |
| ← mehola_ left | 08:57 |
|
sitaram
| (and "designed to allow" sounds grand but it's actually ssh that's doing it so, no credit to me!) | 08:57 |
| → WayToDoor joined | 08:57 |
| ← spudowiar left | 08:58 |
| ← chll_ left | 08:58 |
| ← _sjs left | 08:59 |
| ← Lipp left | 09:03 |
| → notebox joined | 09:05 |
| → chll_ joined | 09:06 |
| → eijk_ joined | 09:06 |
| → eijk joined | 09:06 |
| → Anticom joined | 09:09 |
| ← eijk_ left | 09:11 |
| → mahendra_ joined | 09:11 |
| ← ki0_ left | 09:11 |
| → ki0 joined | 09:12 |
| ← ki0 left | 09:12 |
| → ki0 joined | 09:12 |
| ← ki0 left | 09:12 |
| → ki0 joined | 09:13 |
| ← djb-irc left | 09:13 |
| ← fakenerd left | 09:14 |
| → fakenerd joined | 09:14 |
| ← fakenerd left | 09:15 |
| ← Oebele left | 09:15 |
| → fakenerd joined | 09:15 |
| → Lipp joined | 09:16 |
| ← Thorn__ left | 09:18 |
| → Silenced joined | 09:19 |
| → darkbit joined | 09:19 |
| ← Silenced left | 09:21 |
| → Silenced joined | 09:21 |
| → Thorn joined | 09:21 |
| ← Lipp left | 09:22 |
| ← Guest93616 left | 09:23 |
| → Guest93616 joined | 09:23 |
| → vassagus joined | 09:23 |
| → hahuang61 joined | 09:24 |
| → GenZai joined | 09:25 |
| → _W_ joined | 09:25 |
| → sylario joined | 09:26 |
| ← jeffreylevesque_ left | 09:27 |
| ← vassagus left | 09:28 |
| ← Silenced left | 09:28 |
| → bouncy joined | 09:28 |
| → dmpeters63 joined | 09:29 |
| ← hahuang61 left | 09:29 |
| ← fakenerd left | 09:30 |
| → fakenerd joined | 09:31 |
| → eijk_ joined | 09:39 |
| ← dmpeters63 left | 09:39 |
| → mSSM joined | 09:39 |
|
mSSM
| I have a branch “bar” off of “master” with commits a, b, c; is it possible to move a, b to a new branch “foo”, and have bar now branch off of foo? | 09:41 |
|
| Or is that too insane? | 09:41 |
| ← eijk left | 09:43 |
|
mSSM
| (reason: I want to keep c in bar, because I want to keep a PR on github associated with it...) | 09:44 |
| → Rish joined | 09:45 |
| ← Rish left | 09:47 |
| ← fate_ left | 09:50 |
| → fuchstronaut joined | 09:55 |
| ← Guest93616 left | 09:55 |
| → Guest93616 joined | 09:56 |
|
_ikke_
| mSSM: rebasing can help with that | 09:56 |
|
| !fixup | 09:56 |
|
gitinfo
| So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 09:56 |
|
jast
| mSSM: you don't actually need to do any moving, because 'branching off' isn't recorded in git | 09:56 |
|
| if you create 'foo' and have it point at b, the overall outcome is the same as though you'd created 'bar' based on 'foo' at b | 09:56 |
| ← Guest93616 left | 09:57 |
|
jast
| so basically all you need to do is this: git branch foo b | 09:58 |
| ← omegak left | 09:58 |
|
jast
| all that assumes that you committed in this chronological order: a first, then b, then c | 09:58 |
|
mSSM
| jast: Ah, that makes sense. | 09:59 |
| ← _Patrick_ left | 10:01 |
| ← jceb left | 10:02 |
| → rezrov joined | 10:02 |
| → djb-irc joined | 10:02 |
| ← djb-irc left | 10:03 |
| → phanimahesh joined | 10:03 |
| ← davisonio left | 10:05 |
| → Silenced_v2 joined | 10:05 |
| ← Silenced_v2 left | 10:05 |
| → Silenced_v2 joined | 10:05 |
| → ix007 joined | 10:06 |
| → _Patrick_ joined | 10:07 |
| ← Manuel15 left | 10:07 |
| → fozniku joined | 10:08 |
| ← saedelaere left | 10:09 |
| ← xall left | 10:09 |
| ← ome left | 10:10 |
| → stamina joined | 10:12 |
| → inflames joined | 10:13 |
| → gechr joined | 10:14 |
| ← gechr left | 10:14 |
| → Manuel15 joined | 10:15 |
| ← Manuel15 left | 10:15 |
| → Manuel15 joined | 10:15 |
| ← mingrammer left | 10:15 |
| → mingrammer joined | 10:17 |
| → ASOLAr joined | 10:17 |
| ← boombatower left | 10:18 |
| → aguimaraes1986 joined | 10:18 |
| → jceb joined | 10:21 |
| ← cd-rum left | 10:21 |
| ← Silenced_v2 left | 10:21 |
| ← ASOLAr left | 10:22 |
| ← Peuc left | 10:23 |
|
sitaram
| armin: sorry was called away... to continue... "just a wrapper [that] reads $SSH_ORIGINAL_COMMAND" is kinda missing the point. *Any* access control system can be (modulo how the OS/app/whatever actually wants to see it) thought of as a wrapper that just reads the **request** being made (which is what the SSH_ORIGINAL_COMMAND has) | 10:23 |
| → weckl joined | 10:23 |
| → vassagus joined | 10:24 |
| ← phanimahesh left | 10:25 |
| ← eijk_ left | 10:26 |
| → Silenced joined | 10:27 |
| ← Silenced left | 10:27 |
| → Silenced joined | 10:27 |
| → ifra201 joined | 10:28 |
| ← vassagus left | 10:28 |
| ← mSSM left | 10:30 |
| ← Silenced left | 10:31 |
| → dmpeters63 joined | 10:32 |
| ← dmpeters63 left | 10:33 |
| ← mingrammer left | 10:35 |
| → ToBeCloud joined | 10:37 |
| gitinfo set mode: +v | 10:37 |
| ← chid left | 10:39 |
| → chid joined | 10:41 |
| ← a3Dman left | 10:45 |
| ← inflames left | 10:46 |
| ← eka left | 10:47 |
| → a3Dman joined | 10:48 |
| ← a3Dman left | 10:49 |
| → lizzin joined | 10:50 |
| → eka joined | 10:50 |
|
lizzin
| ive installed git-lfs and i've tracked the large file, but i still get the large file detected error when i try to push. what might i be missing here? | 10:51 |
| ← skylite left | 10:51 |
|
armin
| sitaram: and the point is? | 10:52 |
|
| sitaram: don't get me wrong, i love gitolite. i just consider it way too complex for most my use cases already. | 10:52 |
| ← EduardoMartins left | 10:53 |
|
armin
| sitaram: also i love writing shellscripts. | 10:53 |
| ← diogenese left | 10:54 |
| Andrew_K → adfadf | 10:54 |
| → a3Dman joined | 10:54 |
| ← scott_sd left | 10:54 |
| → Thorn__ joined | 10:55 |
| ← adfadf left | 10:55 |
| → xall joined | 10:56 |
| → Hounddog joined | 10:56 |
|
Hounddog
| Good Morning, i need to ignore all files with in a directory but need to have certain directories added... how would i accomplish this? I could show what i require | 10:57 |
| ← Thorn left | 10:57 |
| → Lipp joined | 10:58 |
| → ronny joined | 10:58 |
|
ronny
| hi | 10:58 |
|
| i have a branch i want ro resuffle with interactive merge without moving it to the head its relative to at the same time | 10:58 |
|
| how would i do that | 10:58 |
|
selckin
| Hounddog: you can 'include' with '!some/path' | 10:59 |
| → mostlybadfly joined | 10:59 |
|
armin
| sitaram: actually i'm hacking on this since 2 hours now and got a fully working way to create/delete/list repositories from remote already, 100% customizable because i know 100% of the code that i wrote. i think that's fairly great and hope you won't consider this offending or as criticism against gitolite. | 11:00 |
| → shams joined | 11:00 |
| ← xall left | 11:00 |
| → diogenese joined | 11:00 |
| ← WayToDoor left | 11:00 |
|
Hounddog
| selckin: ahh that might be something http://pastebin.com/F5WWn8t0 this was what i need but without any files in it | 11:01 |
| → cory_ joined | 11:01 |
| → felowe joined | 11:01 |
| → joseph_arnstein joined | 11:01 |
|
selckin
| Hounddog: git doesn't track directories | 11:02 |
| ← Lipp left | 11:03 |
|
Hounddog
| selckin: i know but i can add a gitignore in there | 11:04 |
|
selckin
| i have no idea what you mean anymore | 11:04 |
|
Hounddog
| inside the directory add .gitignore but ignore everything else | 11:04 |
| → Lipp joined | 11:04 |
| ← Lipp left | 11:04 |
|
Hounddog
| that way i can track the directory | 11:04 |
| → Lipp joined | 11:05 |
|
selckin
| sure | 11:05 |
|
| or you can fix your shit the create the directories it needs on startup | 11:05 |
|
| you can force add files that are ignored, so can have any random file in there | 11:05 |
|
Hounddog
| Well to answer in your rude language, That shit is already setup and i am fixing this shit so people who have not a real clue of git can also use this as easily as possible | 11:06 |
|
j416
| there there, calm down children | 11:06 |
| → _sjs joined | 11:06 |
| → ljc joined | 11:07 |
|
j416
| ronny: I don't quite understand what you mean | 11:08 |
|
sitaram
| armin: "and the point is"? Reading the *request* is not even half the deal | 11:08 |
|
j416
| ronny: you want to change the ordering of commits, yes? | 11:08 |
|
sitaram
| armin: are you doing this for a single user? It sounds like it if you've got it done with a few shell scripts in 2 hours. (Or I bow my head in reverence at your superior hacking skills) | 11:10 |
| → peib joined | 11:10 |
|
ronny
| j416: i havea branch i cant rebase to master without conflict that i need to reorder first | 11:11 |
|
sitaram
| armin: hmm wait I just noticed "way too complex for my use cases"; never mind | 11:11 |
|
j416
| ronny: alright. | 11:11 |
|
ronny
| also - is there a easy way to split the commits in one branch into 2 distinct branches? | 11:11 |
|
j416
| ronny: one question at a time, please | 11:11 |
|
ronny
| ok, lets go for reorder first | 11:11 |
|
j416
| ronny: I have not even understood your first question yet. | 11:11 |
| ← przemoc left | 11:12 |
| ← _sjs left | 11:12 |
|
armin
| sitaram: actually, yes. for a single user. exactly. my use case is: i have ssh access to some host. i want to host git repositories on that host easily. i'm eventually not root there. just store my damn git repos. | 11:12 |
| → boombatower joined | 11:12 |
|
sitaram
| armin: for that, I use 3 "~/.gitconfig" aliases. I pasted a link to a pastebin sometime ago. I'm pretty sure they do most of what you want :) | 11:13 |
|
armin
| sitaram: would you mind grabbing me a link to it? | 11:14 |
|
sitaram
| armin: https://paste.fedoraproject.org/409512/47143243 | 11:14 |
|
| (just fpaste-d again; not the same link as before but same content) | 11:14 |
|
armin
| sitaram: almost what i came up with... | 11:14 |
|
sitaram
| I kinda guessed :) | 11:15 |
|
ronny
| j416: i have a branch, that has not been rebased to master, and i want to reorder its commits without rebasing over to master | 11:16 |
| → HoierM joined | 11:17 |
| ← cyan__ left | 11:17 |
| ← zeroed left | 11:18 |
|
armin
| sitaram: http://core.m2m.pm/gitctl.txt (beware, work in progress, considered harmful and buggy until proven otherwise) | 11:18 |
| → skylite joined | 11:19 |
|
armin
| sitaram: basically i was just playing around with that but will probably use that on an every day basis soon probably. | 11:19 |
|
selckin
| set -e | 11:20 |
|
j416
| ronny: just interactively rebase the branch onto a commit earlier in the branch. | 11:20 |
| → mingrammer joined | 11:20 |
|
ronny
| j416: whats the canonical way to rebase a branch onto its common ancestor with master? | 11:20 |
|
j416
| ronny: you can say: git rebase $(git merge-base master HEAD) | 11:22 |
|
| (add -i for interactive) | 11:22 |
|
ronny
| thanks :) | 11:22 |
| → omegak joined | 11:22 |
|
j416
| (otherwise this is a no-op) | 11:22 |
| ← d0nn1e left | 11:22 |
|
j416
| might be able to do it with dot syntax, I always forget so I use the above | 11:22 |
| → d0nn1e joined | 11:23 |
| → zeroed joined | 11:23 |
| ← zeroed left | 11:23 |
| → zeroed joined | 11:23 |
| → afuentes joined | 11:25 |
| → vassagus joined | 11:25 |
| → cyan__ joined | 11:25 |
| ← cyan__ left | 11:27 |
|
sitaram
| armin: looks ok on first glance but if it's really meant for yourself it's too verbose. Plus you really need to check/enforce fundamental things like ".git" at the end. And speaking for myself, I never want to delete remotely; it has to be "log on and do it manually" | 11:27 |
|
armin
| sitaram: good points. thank you! | 11:27 |
| ← lizzin left | 11:28 |
| ← stamina left | 11:28 |
|
armin
| sitaram: it's still perfectly valid to do "git init --bare foobar" (without the .git at the end), though. does the ".git" suffix mean something more than "this is a directory that will likely have a .git folder inside"? | 11:29 |
| ← vassagus left | 11:30 |
|
jast
| armin: it means the opposite, actually. convention says that foo.git contains what would normally be inside the '.git' subdir in a normal (non-bare) git repo | 11:31 |
|
sitaram
| armin: ".git" at the end for bare repos is only a convention but a good one to follow; no hard and fast rules enforced by git itself. Sorry if I made it sound like that | 11:32 |
|
| ".git folder inside" means it is NOT a bare repo, then it (again, convention) should NOT have a directory name ending in ".git" | 11:32 |
|
| or... what jast said (I should have read that before I posted!) | 11:33 |
|
| sitaram blames irssi for highlighting messages containing "sitaram" or "gitolite" in red and making me react to them first, in some Pavlovian manner | 11:33 |
|
armin
| sitaram: you didn't - i'm just trying to understand things. all good. :) | 11:33 |
| → mycyber joined | 11:34 |
|
ronny
| hmm | 11:34 |
|
| anyone aware of a tool that would take a style fixup commit and then integrated it to n previous commits that did the actual changes so that hte result is a style fixed history? | 11:34 |
|
selckin
| just curious what do you do that has you creating git repos this often? | 11:34 |
| ← Sceorem left | 11:35 |
|
selckin
| ronny: you can use rebase -i to merge fixup commits into older commits or i don't understand what you mean | 11:36 |
| ← rwb left | 11:38 |
| ← romerocesar left | 11:38 |
| ← dsdeiz left | 11:39 |
|
ronny
| selckin: i have one fixup commit and i want to split it over to 5 older commits since each of the older commits touches different bits that the fixup commit fixes up | 11:40 |
|
selckin
| you wanna create 5 fixup commits then, (git add -p ) is big help | 11:41 |
|
| or manual edit | 11:41 |
|
armin
| selckin: did that question relate to me? | 11:46 |
|
selckin
| yeah | 11:47 |
|
ronny
| selckin: the commit is already done now i want to automatically split it | 11:47 |
| ← peib left | 11:47 |
|
selckin
| ronny: pick edit, unstage, and use git add -p to stage the hunks how you want to split them and commit each part | 11:47 |
|
armin
| selckin: since you consider the problem to be myself, my motivation to answer this in an honest way is quite low, but i'll try: i like to enhance my knowledge and am bored at work and script things just for fun. | 11:48 |
| → G1eb joined | 11:49 |
|
selckin
| armin: i don't consider anything a problem, just can't think of a reason where this would be needed, and you don't need it so i wasn't that wrong, but learning is always a good excuse | 11:49 |
|
G1eb
| heya, I've accidentally removed a file, how do I put it back with git? | 11:49 |
|
| I've tried git reset HEAD <file> but that does not do anything | 11:50 |
|
selckin
| G1eb: git checkout <sha> -- file | 11:50 |
|
G1eb
| ah, yes thats it | 11:50 |
|
| thanks! :) | 11:50 |
| ← G1eb left | 11:50 |
|
selckin
| G1eb: the reset will unstage it, and he left already | 11:51 |
| ← Lipp left | 11:51 |
|
jast
| ronny: I don't think you can do this automatically :( | 11:51 |
|
ronny
| sometimes i wish i could just drag&drop comits/hunks in a ui | 11:51 |
|
selckin
| ronny: git gui | 11:52 |
|
ronny
| selckin: can that drag&drop patch hunks/commits? | 11:52 |
|
jast
| not exactly, from what I recall | 11:52 |
|
selckin
| you can stage hunks in the gui then commit | 11:52 |
|
| then rebase and merge | 11:52 |
|
jast
| actually in this specific case a magic special rebase with -Xours (or something?) might work | 11:53 |
|
armin
| selckin: 09:58:03 selckin gitolite is awesome, you're the problem | 11:53 |
|
jast
| but that would be a rather special way of doing it :) | 11:53 |
|
armin
| well... | 11:53 |
|
selckin
| armin: don't take everything so seriously, you bashed it for a bullshit reason so i countered with that | 11:54 |
| ← fuchstronaut left | 11:54 |
| → sdothum joined | 11:55 |
|
jast
| maybe I missed something, but the annoyance seems to be with debian's defaults for gitolite and not gitolite itself? | 11:55 |
|
selckin
| at taht point he just said he got "too annoyed" by it | 11:56 |
|
jast
| if so, I can empathize with that. I've often been dissatisfied with how git-related packages are handled in debian | 11:56 |
|
subhojit777
| Is there any way to bypass resolve conflict using mergetool for specific files. My case - I usually get merge conflicts for compiled + minified CSS files, without resoolving the conflict I can easily autogenerate the CSS by running compass. | 11:56 |
|
Seveas
| subhojit777: don't commit the generated files. | 11:57 |
|
selckin
| subhojit777: in general you don't commit those files | 11:57 |
| → synthroid joined | 11:57 |
|
jast
| subhojit777: there are attributes you can set on files to customize how merging is handled, see man gitattributes | 11:58 |
|
gitinfo
| subhojit777: the gitattributes manpage is available at http://jk.gs/gitattributes.html | 11:58 |
|
jast
| also, what the other people said :) | 11:58 |
|
subhojit777
| Thanks, I will try to suggest this to my superior. But, is there any other way? Like I will manually mark those files as resolved. | 11:58 |
| → bartosz_ joined | 11:58 |
|
selckin
| what jast said | 11:59 |
|
subhojit777
| jast, "other people"? sorry didn't get you? do you mean Google for the problem? | 12:00 |
|
selckin
| line above that | 12:00 |
|
jast
| no, I meant the responsess from selckin and Seveas :) | 12:01 |
|
subhojit777
| ohkk.. Thanks :) | 12:01 |
|
styler2go
| Hello. I have a problem with git. My git project is on a samba drive and i laways have file permission differences and thus all files are marked as changed. config.fileMode false did not help. any idea? | 12:02 |
| ← johnmilton left | 12:02 |
| ← notebox left | 12:03 |
|
selckin
| samba confnig issue | 12:04 |
| → Sceorem joined | 12:06 |
|
jast
| it's core.fileMode, actually :) | 12:06 |
| → saedelaere joined | 12:06 |
|
Seveas
| styler2go: don't pubt repos on samba drives. | 12:06 |
|
selckin
| you can configure samba not todo that | 12:06 |
| ← MyDuckIsGoingMad left | 12:06 |
|
styler2go
| hmm.. couldn't find any option in samba | 12:06 |
|
| jast: yes, tried that | 12:06 |
|
selckin
| enable unix extensions or disable something or the other, been a few years | 12:07 |
|
| i'm sure google knows | 12:07 |
| → ASOLAr joined | 12:08 |
|
jast
| of course UNIX extensions don't help if the share is accessed by windows clients | 12:09 |
|
selckin
| can do it with that too | 12:10 |
| ← ASOLAr left | 12:10 |
|
selckin
| *without | 12:10 |
|
jast
| you can tell your client to disable +x flags for all files, then you'll only run into trouble for files that are *supposed* to be executable :) | 12:10 |
|
styler2go
| hmm | 12:11 |
| → Maple__ joined | 12:11 |
|
styler2go
| it always says old 0755 and new 0644 | 12:11 |
| → YourTheBombNow23 joined | 12:12 |
|
ronny
| hmm | 12:12 |
|
| got cola seems halfway there | 12:13 |
|
styler2go
| tried a lot of things now... nothign worked sadly | 12:13 |
| ← ljc left | 12:13 |
| ← YourTheBombNow23 left | 12:13 |
| → snowkidind joined | 12:14 |
| → nettoweb joined | 12:14 |
| ← alansaul left | 12:15 |
| → rwb joined | 12:16 |
| → garethdaine joined | 12:16 |
| ← Diabolik left | 12:18 |
| → Diabolik joined | 12:19 |
| ← Diabolik left | 12:19 |
| → Lipp joined | 12:19 |
| → Diabolik joined | 12:19 |
| ← Diabolik left | 12:19 |
| → Diabolik joined | 12:20 |
| ← Diabolik left | 12:20 |
| → Diabolik joined | 12:20 |
| ← shams left | 12:20 |
| → hahuang61 joined | 12:22 |
| → johnmilton joined | 12:22 |
| → dsdeiz joined | 12:22 |
| ← hahuang65 left | 12:23 |
| ← jguillen left | 12:26 |
| → fees joined | 12:26 |
| → vassagus joined | 12:26 |
| ← The_Phoenix left | 12:27 |
| ← johnmilton left | 12:27 |
| → tvw joined | 12:27 |
| → jimi_ joined | 12:28 |
| → The_Phoenix joined | 12:29 |
| → Pinkamena_D joined | 12:29 |
| ← aavrug left | 12:29 |
| ← mycyber left | 12:30 |
| ← vassagus left | 12:31 |
| → kim_bruning joined | 12:32 |
| → shams joined | 12:32 |
| ← johnny56 left | 12:32 |
| → TooLmaN joined | 12:33 |
| → johnny56_ joined | 12:33 |
|
kim_bruning
| Hello, so once upon a time I was clever, and decided to do git init in some of my /etc subdirs (like /etc/asterisk and /etc/samba). Today, I am cleverer, and realize I really would like to just have all of /etc in git ;-) Other than deleting my old git history, what's a smart way to git init in /etc, and include subdirs properly? | 12:33 |
|
tobiasvl
| that sounds like a strange idea | 12:34 |
|
selckin
| !etc | 12:34 |
|
gitinfo
| [!fetch] When you work with remote repositories, Git stores copies of the remote's branches in !tracking_branches (basically mirrors). You can use 'git fetch' to update those. If you want to actually apply changes from the remote to your checked out branch, a second step is needed, usually 'git merge' or 'git rebase'. There's also 'git pull' which combines both steps. | 12:34 |
|
selckin
| wrong one | 12:34 |
|
| !etckeeper | 12:35 |
|
gitinfo
| etckeeper is a collection of tools to let /etc be stored in a git, mercurial, darcs, or bzr repository. It hooks into various package managers. http://etckeeper.branchable.com | 12:35 |
|
tobiasvl
| well there you go | 12:35 |
|
| you learn something every day | 12:35 |
| → zivester joined | 12:35 |
|
selckin
| !subtree | 12:36 |
|
gitinfo
| The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo. | 12:36 |
|
kim_bruning
| tobiasvl: keeping /etc in git is sheer genius I tell you. | 12:36 |
|
tobiasvl
| apparently! | 12:36 |
|
kim_bruning
| selckin : is git going to be confuzzeled because the ostensible subtree is a subdir of the new repo? | 12:37 |
|
| also worried about git add * | 12:38 |
| ← Gianormagantrous left | 12:38 |
| ← tvw left | 12:38 |
|
| kim_bruning scratches head | 12:38 |
| → tvw joined | 12:38 |
|
selckin
| not sure what you mean, can't do much wrong tho | 12:38 |
|
kim_bruning
| well, okay then | 12:39 |
| → Hko joined | 12:39 |
|
kim_bruning
| I should probably practice on something none-etc on none-production first :-P | 12:39 |
| → ShekharReddy joined | 12:39 |
|
kim_bruning
| Oh! And I should really have the main repo for etc on my backup box (so I can git push and have a sort of backup already) | 12:40 |
| ← lynkd left | 12:40 |
| → johnmilton joined | 12:40 |
| → vaibhavsagar joined | 12:41 |
|
selckin
| need a backup for the rest of the system anyway that includes /etc, the git is just nice for history | 12:41 |
| gitinfo set mode: +v | 12:42 |
|
vaibhavsagar
| hi, can anyone explain how to convert an integer into the offset encoded representation? | 12:42 |
|
bremner
| uhm. Connection with git? | 12:42 |
|
kim_bruning
| selckin: ofcourse. this way just means more granular backups for that particular dir | 12:42 |
|
vaibhavsagar
| I can parse it just fine, but I don't understand how to serialize it | 12:42 |
|
| bremner: https://github.com/git/git/blob/master/Documentation/technical/pack-format.txt#L119-L124 | 12:43 |
|
kim_bruning
| selckin: *in addition to* the regular ;-) | 12:43 |
| → mycyber joined | 12:43 |
|
bremner
| vaibhavsagar: oh, ok. | 12:43 |
|
| vaibhavsagar: you might need to try the list for internals questions | 12:43 |
| → f0rblaze joined | 12:43 |
|
vaibhavsagar
| sure, thanks bremner | 12:44 |
| ← ToBeCloud left | 12:45 |
| → JamesBaxter joined | 12:45 |
|
vaibhavsagar
| is that just the git mailing list? | 12:45 |
| → fmcgeough joined | 12:47 |
| ← Pinkamena_D left | 12:47 |
| → notebox joined | 12:48 |
| ← jimi_ left | 12:49 |
| → davisonio joined | 12:50 |
| → sanketdg joined | 12:50 |
| → m0viefreak joined | 12:51 |
| → CuriousMind joined | 12:52 |
|
kim_bruning
| ok so to simulate my fun situation I made a dir test and a dir test/foo.d , I did git init in test/foo.d , then git init in test ... so far so bad ( I now have 2 different logs ;-) ) | 12:52 |
| → rkazak joined | 12:52 |
|
kim_bruning
| let's see if I can do the merge | 12:52 |
| → CheckDavid joined | 12:53 |
|
CuriousMind
| My question is, if I have more than one remote, will git or whatever push my work to both repos? I'm trying to deploy my app on heroku http://xomf.com/cmzlx | 12:53 |
|
| That's a screenie of the remotes I have | 12:54 |
|
kim_bruning
| $ git read-tree --prefix=foo.d/ -u foo fatal: Not a valid object name foo | 12:54 |
| ← rkazak left | 12:54 |
|
kim_bruning
| ok, clearly I actually need to grok what I'm doing ... magical invocations won't work without that ^^;; | 12:54 |
|
SporkWitch
| CuriousMind: you can script it, but no, normally you push to one at a time | 12:55 |
| ← Lipp left | 12:55 |
| ← Shentino left | 12:55 |
|
selckin
| CuriousMind: if ust do 'git push' it will push to the remote tracking branch (not sure if you can have multiple), but you can always push explicitly to both git push origin; git push heroku; | 12:55 |
|
CuriousMind
| ohh that's how I would do that | 12:56 |
| ← kpease left | 12:57 |
|
CuriousMind
| Oh right you push to one at a time, that makes sense | 12:57 |
|
| Ok so I could still push to heroku, I would have to do I don't know "git push heroku master"? | 12:57 |
|
selckin
| sure | 12:57 |
| ← jknetl left | 12:58 |
| ← netj left | 12:58 |
| → netj joined | 12:58 |
| → MadHatter42 joined | 12:58 |
| m1dnight1 → m1dnight | 12:59 |
| → Pinkamena_D joined | 12:59 |
|
kim_bruning
| ok, you know what... I don't think I have too many commits in the /etc subdirs... I'm just gonna cp -a out those subdirs just in case, and then apply etckeeper | 13:00 |
|
SporkWitch
| selckin: you can't (re: tracking multiple). Though some tools will cheat and do it anyway, to show your relative position to your listed remotes | 13:00 |
| ← dodobrain left | 13:00 |
| → chid_ joined | 13:00 |
|
kim_bruning
| selckin: neat that etckeeper is in the debian repo! :-) | 13:00 |
| ← garethdaine left | 13:01 |
| ← m1dnight_ left | 13:01 |
| → m1dnight_ joined | 13:01 |
| ← MadHatter42 left | 13:02 |
| ← bsanford left | 13:02 |
|
CuriousMind
| Thanks SporkWitch selckin | 13:03 |
|
| I'm trying to deploy my app to heroku | 13:03 |
|
armin
| kim_bruning: best thing is that it actually works out of the box, with apt-integration. | 13:03 |
| → MadHatter42 joined | 13:03 |
|
SporkWitch
| etckeeper? | 13:04 |
|
selckin
| yeah commits after upgrades etc | 13:04 |
| ← albel727 left | 13:04 |
| → pcre_ joined | 13:04 |
| → alansaul joined | 13:04 |
|
talin
| hello. i need to compare two files on different branches and in different dirs | 13:07 |
|
| i tried git diff branch1:file branch2:file, but it claims that it can't find the first file | 13:07 |
|
polyzen
| talin, try omitting branch1: | 13:08 |
| → garethdaine joined | 13:09 |
| → cdg joined | 13:09 |
| ← cdg left | 13:09 |
|
polyzen
| by the lack of a response, I can only assume Git has crashed your system | 13:10 |
| → cdg joined | 13:10 |
| → ASOLAr joined | 13:10 |
| ← Raging_Hog left | 13:10 |
|
talin
| no such path in the working tree | 13:11 |
|
| if i add -- between them, i get some output | 13:12 |
|
| not sure if it's correct | 13:12 |
| ← CuriousMind left | 13:13 |
| → cyan__ joined | 13:13 |
| → rahtgaz joined | 13:13 |
| ← nikivi left | 13:13 |
| → Peuc joined | 13:13 |
| ← ASOLAr left | 13:15 |
| → RustyShackleford joined | 13:15 |
| ← darkbit left | 13:16 |
| ← ws2k3 left | 13:17 |
| ← Gitzilla left | 13:17 |
| → bsanford joined | 13:18 |
|
SporkWitch
| selckin: ok, that tool sounds pretty sweet lol | 13:18 |
| → _sjs joined | 13:18 |
| → al-damiri joined | 13:19 |
|
jstein
| Hi, I read a discussion about version tagging recently, but do not understand what changed in git in the past. https://github.com/smxi/inxi/issues/92 Do you know, what was bad about tags in the past and changed? | 13:20 |
| → fahadash joined | 13:21 |
| ← zeroed left | 13:21 |
| ← mingrammer left | 13:21 |
| → rgrinberg joined | 13:21 |
| → ws2k3 joined | 13:22 |
| ← _sjs left | 13:23 |
|
kim_bruning
| is etckeeper init supposed to be slow? | 13:24 |
| → stux|away joined | 13:25 |
|
kim_bruning
| and git status? | 13:25 |
|
| oh boy | 13:25 |
| → zeroed joined | 13:26 |
| ← zeroed left | 13:26 |
| → zeroed joined | 13:26 |
| → vassagus joined | 13:27 |
|
jast
| kim_bruning: with huge directories it can be, though if you have enough RAM the filesystem cache should be able to take the edge off it after the first time | 13:27 |
| ← netj left | 13:27 |
| → netj joined | 13:27 |
|
jstein
| kim_bruning: no, it should not be slow. How long did it take? | 13:27 |
|
kim_bruning
| 45 megs | 13:27 |
|
| I stopped it after a minute | 13:27 |
|
jast
| you have to keep in mind that 'git status' has to look at the metadata of every single file in the directory | 13:27 |
|
kim_bruning
| suspect a symlink loop or something | 13:28 |
| ← aguimaraes1986 left | 13:28 |
|
kim_bruning
| ok, there be a lot of files in that dir ;-) | 13:28 |
|
jast
| the size of the files shouldn't matter as much. if anything, the number of files does. | 13:28 |
|
kim_bruning
| 7798 | 13:28 |
| → ExoUNX joined | 13:28 |
|
kim_bruning
| can't be that bad | 13:28 |
|
jast
| still shouldn't take a minute unless you've got a tape recorder as your storage system | 13:28 |
|
jstein
| kim_bruning: that is a lot, but no problem for git | 13:28 |
|
jast
| or I/O saturation from unrelated processes | 13:29 |
|
| (especially if it's not an SSD) | 13:29 |
|
kim_bruning
| hum, running etckeeper init twice is probably the wrong move :-P | 13:29 |
|
| got an ssd and 8 gigs of ram. Not fastest, but definitely not slowest :-P | 13:30 |
|
| anyway, this time it was near-instant | 13:30 |
|
selckin
| time for a backup, your ssd is about to die | 13:30 |
|
kim_bruning
| apparantly apt-get had run etckeeper init for me already | 13:30 |
|
| Ok, let's set up for a remote push | 13:30 |
| ← vassagus left | 13:31 |
| ← MadHatter42 left | 13:32 |
| → ash_workz joined | 13:32 |
| ← zivester left | 13:33 |
|
kim_bruning
| ok, let's push this thing | 13:35 |
| ← mycyber left | 13:36 |
| → sangy joined | 13:36 |
| → kaldoran joined | 13:36 |
| ← rossome left | 13:37 |
| → romerocesar joined | 13:39 |
| → kadoban joined | 13:39 |
| ← satya4ever left | 13:39 |
| → Shentino joined | 13:41 |
|
kim_bruning
| hum, for some reason git doesn't accept a remote like ssh://rbackup@pi:myserver-backup | 13:42 |
|
| it has to be ssh://rbackup@pi/home/rbackup/myserver-backup | 13:42 |
|
| am i Doing It Wrong(tm) ? | 13:43 |
| → ASOLAr joined | 13:43 |
| ← romerocesar left | 13:43 |
|
kim_bruning
| also, now I'm doing git push backup .... but wasn't there a way to make a default for git push | 13:44 |
|
kadoban
| kim_bruning: I always specify SSH URLs as just me@whatever:/some/path usually leaving off the me@ part as well, since I set that stuff in the alias config in SSH | 13:44 |
| ← Muzer left | 13:44 |
| → jeffreylevesque joined | 13:45 |
| → mycyber joined | 13:45 |
| → cqi joined | 13:45 |
| → fairuz joined | 13:45 |
| ← shams left | 13:46 |
| ← mostlybadfly left | 13:47 |
| → shams joined | 13:48 |
| ← ASOLAr left | 13:48 |
| → AaronMT joined | 13:50 |
| ← AaronMT left | 13:51 |
| → AaronMT joined | 13:51 |
| ← mycyber left | 13:51 |
| → jimi_ joined | 13:52 |
| → macivy joined | 13:52 |
|
kim_bruning
| ohhhhh, etckeeper immediately runs after I do an apt run | 13:53 |
|
| <3<3<3 | 13:53 |
|
| selckin: that was a really neat tip. Why doesn't everyone know about this? | 13:53 |
|
selckin
| because nutella is to breakfast food | 13:54 |
|
kim_bruning
| it just doesn't automatically do a push... though that might actually be a Good Thing (tm) | 13:54 |
|
jast
| kim_bruning: you may be getting the two different SSH URI schemes mixed up. one is user@host:relative/path. the other is ssh://user@host/absolute/path. | 13:54 |
|
kim_bruning
| jast: indeed! | 13:55 |
| ← bsanford left | 13:55 |
|
kim_bruning
| both are valid for git? | 13:55 |
|
jast
| yes | 13:55 |
| ← TooLmaN left | 13:56 |
|
kim_bruning
| learn something new every day | 13:56 |
|
jast
| in fact possibly git even allows ssh://foo@bar/~/relative/to/homedirt | 13:56 |
|
kim_bruning
| this is why you gotta *do* stuff, RTFM might be necessary, but not sufficient | 13:56 |
| → roflincopter joined | 13:56 |
| ← garethdaine left | 13:56 |
|
kim_bruning
| so now that I've thoroughly shaved this yak, I'm off to shave the next one ;-) | 13:58 |
|
| geeze it's 4 pm already | 13:58 |
| ← roflin left | 13:59 |
| → Rodya_ joined | 13:59 |
| → nikivi joined | 13:59 |
| ← stux left | 13:59 |
| → jaafar joined | 14:00 |
| → roflin joined | 14:02 |
| fairuz → fairuz2 | 14:02 |
| ← fairuz2 left | 14:04 |
| ← roflincopter left | 14:04 |
| ← subhojit777 left | 14:04 |
| → mingrammer joined | 14:06 |
| ← TomyWork left | 14:06 |
| → GodGinrai joined | 14:06 |
| → ncd|leeN joined | 14:06 |
| → phaleth joined | 14:07 |
|
kim_bruning
| laters o/ | 14:07 |
| ← kim_bruning left | 14:08 |
| → Finnoloid joined | 14:08 |
| ← leeN left | 14:10 |
| → delboy1978uk joined | 14:10 |
| → MainB_ joined | 14:10 |
|
delboy1978uk
| whatever_file: needs merge | 14:10 |
|
| then i nano it, search for <<<, nothing | 14:10 |
|
| no conflicts | 14:10 |
|
| so what has broken? | 14:10 |
| ← ash_workz left | 14:11 |
| → ResidentBiscuit joined | 14:11 |
| ← m0viefreak left | 14:12 |
|
delboy1978uk
| its cool, think ive fixed it | 14:13 |
| → pioiytr joined | 14:13 |
|
jast
| there are several possibilities, e.g. file mode conflict, delete/modify conflict | 14:13 |
|
| tools like 'git merge' and 'git rebase' tell you, as part of their output, what kind of conflict they detected. unfortunately you can't see that information later on, so it helps to pay attention to the output | 14:14 |
|
delboy1978uk
| jast: interesting, thanks, i'll investigate a little more | 14:14 |
| → garethdaine joined | 14:14 |
| ← sanketdg left | 14:15 |
| → sanketdg joined | 14:16 |
| ← sanketdg left | 14:16 |
| → sanketdg joined | 14:17 |
| ← qt-x left | 14:19 |
| ← mattsl left | 14:19 |
| → hahuang65 joined | 14:20 |
| ← rgrinberg left | 14:21 |
| → Dougie187 joined | 14:21 |
| → rgrinberg joined | 14:21 |
| ← rgrinberg left | 14:21 |
| → l4v2 joined | 14:22 |
| → rgrinberg joined | 14:22 |
| → notfrosty joined | 14:22 |
| → Darren_ joined | 14:23 |
| ← hahuang61 left | 14:23 |
|
notfrosty
| How do I set master up to date from branch without actually changing branch ? | 14:23 |
|
GodGinrai
| so you want to merge your branch into master | 14:25 |
|
| but not change branch? | 14:25 |
| ← Literphor left | 14:25 |
|
GodGinrai
| to reword: but not switch branches? | 14:25 |
| ← Manuel15 left | 14:26 |
|
notfrosty
| No, I wanna see what changes were done in master without switching to it. (git diff --name-status master..branch) | 14:26 |
|
selckin
| think you might mean like, git fetch; git diff master..origin/master, else i'm lost | 14:27 |
| ← delboy1978uk left | 14:27 |
|
GodGinrai
| ^ this | 14:27 |
| → zivester joined | 14:27 |
| ← fakenerd left | 14:27 |
| ← cqi left | 14:27 |
| → vassagus joined | 14:27 |
| → madewokherd joined | 14:28 |
|
notfrosty
| git fetch doesn't update master (git log master doesn't show latest commits) | 14:28 |
|
| I wanna do git branch master; git pull origin master; git branch branch; Is it possible without actually changing branch ? | 14:29 |
|
osse
| notfrosty: fetch updates origin/master | 14:29 |
| → Manuel15 joined | 14:30 |
| ← Manuel15 left | 14:30 |
| → Manuel15 joined | 14:30 |
| → przemoc joined | 14:30 |
| ← przemoc left | 14:30 |
| → przemoc joined | 14:30 |
|
selckin
| not in a sane way and only if its a fast forward | 14:30 |
|
osse
| notfrosty: sort of. you can "push" to the current repo. but it's a bit awkward | 14:30 |
|
| use origin/master in place of master. it probably gives you want to want | 14:30 |
| ← chigang_ left | 14:31 |
| → stamina joined | 14:31 |
|
GodGinrai
| notfrosty: it updates origin/master | 14:32 |
| ← vassagus left | 14:32 |
|
GodGinrai
| notfrosty: it would be better to stash, checkout master, pull, checkout branch, and then stash pop | 14:32 |
|
notfrosty
| ok I got it, thx guys | 14:33 |
|
GodGinrai
| if you want to update master and be back on your branch | 14:33 |
| → ash_workz joined | 14:33 |
|
osse
| git push . origin/master:master | 14:33 |
|
| aww yiss | 14:33 |
|
lmat
| When I clone a remote | 14:34 |
| ← notfrosty left | 14:34 |
|
lmat
| I clone a remote (git clone git4 git4clone;) and the new repo's branches don't match the old! :o | 14:34 |
| → eric97477 joined | 14:35 |
|
lmat
| The old repo had a branch pointing to a particular merge point, but in the new one, that branch is pointing somewhere else!! | 14:35 |
|
| This seems very bad. | 14:35 |
| ← ncd|leeN left | 14:35 |
|
lmat
| What's the difference between a green ref and a red ref in git log --decorate? | 14:35 |
|
bremner
| also somewhat unlikely, | 14:35 |
| ← MainB_ left | 14:36 |
|
osse
| lmat: usually local vs remote branches | 14:36 |
| → kaldoran_ joined | 14:36 |
| → _sjs joined | 14:36 |
|
lmat
| osse: okay | 14:36 |
| ← kaldoran left | 14:36 |
| ← Electrometro left | 14:37 |
|
lmat
| Maybe the problem is how I Get those branches in the original repo. | 14:38 |
| ← ikmaak left | 14:38 |
|
lmat
| I use for remote in $(git branch -r); do git branch --track "$remote"; done; | 14:38 |
|
osse
| then you clone the original branches become remote branches in the new clone | 14:38 |
|
lmat
| Does this make all local tracking branches track at HEAD? | 14:38 |
| → clemf joined | 14:39 |
|
osse
| lmat: i suggest you only create the local branches you need. otherwise it just becomes a mess | 14:39 |
|
lmat
| osse: No-can-do. I'm converting a repo and I need to get all the branches. | 14:39 |
| → vassagus joined | 14:39 |
|
osse
| maybe you want clone --mirror then | 14:39 |
|
lmat
| osse: This will be a "central" repo. Of course, my local | 14:39 |
| → thiago_ joined | 14:39 |
|
lmat
| HAH! | 14:39 |
|
| lmat kisses osse | 14:40 |
|
lmat
| I'm pretty sure that's the one. Thanks! | 14:40 |
| ← submitnine left | 14:41 |
|
lmat
| osse: Tell me about no-hardlinks. What happens whet I don't pass this? | 14:41 |
| ← Darren_ left | 14:41 |
|
osse
| git hardlinks | 14:42 |
|
lmat
| osse: so du . -sh; | 14:42 |
|
| What is the point of passing no-hardlinks? | 14:42 |
| ← rgrinberg left | 14:43 |
| ← ifra201 left | 14:43 |
|
lmat
| *with* hardlinks, du . -sh; shows the total repo size. | 14:43 |
|
osse
| "This may be desirable if you are trying to make a back-up of your repository." | 14:44 |
|
lmat
| osse: hmm, okay. Thanks! | 14:44 |
|
osse
| i don't know more than that | 14:45 |
| gitinfo set mode: +v | 14:45 |
| → rgrinberg joined | 14:45 |
|
osse
| and I would guess du counts the size of hard linked files | 14:45 |
|
| du can't tell which is the "original" and which is the "linked" files, since that distinction is not present with hardlinking | 14:46 |
|
| (i think) | 14:46 |
|
lmat
| My thoughts exactly. | 14:46 |
| → Tobarja joined | 14:46 |
| ← ShekharReddy left | 14:49 |
|
eric97477
| I am not sure how to solve this problem. I need to transition two git repos ( X & Y ) from server A to B. I did a git clone —mirror from A and a git push —mirror to B. This all seemed to work correctly and without issue. However, repo X has many branches and repo Y is a submodule on every branch. As I understand it, the .gitmodules file for X is tracked per branch. So, what is the best way to update the location of the submodule Y across all branches in X? | 14:49 |
|
| Hopefully this makes sense. I am hoping that I do not need to individually checkout each branch, update the location of the submodule, and then commit/push .gitmodules. | 14:49 |
| → Lipp joined | 14:50 |
| → astrofog joined | 14:50 |
| → TomyLobo joined | 14:51 |
| ← nettoweb left | 14:52 |
| → dmto joined | 14:52 |
| ← infra-red left | 14:55 |
|
ToxicFrog
| eric97477: git filter-branch? | 14:55 |
| ← robotroll left | 14:55 |
| → bsanford joined | 14:56 |
| ← tvw left | 14:56 |
|
eric97477
| I honestly have no idea ToxicFrog. I have to assume someone has faced this issue before and I am hoping someone has an easy solution. | 14:56 |
| → artemisart joined | 14:57 |
| → darkbit joined | 14:57 |
| ← rscata left | 14:57 |
| ← RustyShackleford left | 14:57 |
|
ToxicFrog
| eric97477: so, the two approaches that immediately come to mind for me are to use filter-branch (if you want to rewrite the historical contents of .gitmodules) or just a simple for loop over the output of 'git branch' (if you just want to make new commits updating it without changing the historical values) | 14:57 |
| → peepsalot joined | 14:58 |
| → suchness joined | 14:59 |
|
eric97477
| ok. so, essentially, I need to write a little script that will do the checkout for each branch, modify .gitmodules, and then push the results? I think I like that option better then rewriting history. | 14:59 |
|
suchness
| Can someone tell me what this means: warning: symbolic ref is dangling: refs/remotes/origin/HEAD | 14:59 |
|
| It's been reporting that when i switch branches | 14:59 |
|
selckin
| !dangl | 14:59 |
|
gitinfo
| [!dangling] Dangling objects represent things added to git which are no longer needed based on the git commands you typed in. This can be normal workflow (rebase, reset, add, etc) or errors you made. Typing "!dangling_commit" "!dangling_blob" and "!dangling_tree" into a query to me will get you more information about each type. | 14:59 |
|
lmat
| suchness: I guess that means HEAD doesn't point to a | 14:59 |
|
| nevermind | 14:59 |
| → LionsMane joined | 14:59 |
|
selckin
| you most likely made a commit on a detached head (maybe) | 14:59 |
|
osse
| eric97477: hmm, maybe I misunderstand but can't you just copy them over? | 14:59 |
|
lmat
| suchness: You need to create a *local* branch to track that remote. | 15:00 |
|
osse
| eric97477: oh.. urls in .gitmodules and that I suppose? | 15:00 |
|
eric97477
| osse…yes, the url in the .gitmodules need to change for each branch. | 15:00 |
| → InfoTest joined | 15:01 |
|
eric97477
| osse…as ToxicFrog mentioned, I could write a script to do this, but if there is an easier way, without rewriting history (unless that truly is the recommended method in this case), I would be interested to learn what that is. | 15:02 |
| → cagomez joined | 15:02 |
|
eric97477
| If I didn’t have 30 some branches to update, this wouldn’t be much of an issue. | 15:02 |
|
osse
| 30 branches! :O | 15:03 |
|
eric97477
| do not ask. | 15:03 |
| → roelmonn_ joined | 15:03 |
| ← roelmonnens left | 15:03 |
|
osse
| move repo X first. wait for the whole thing to blow over. forget about moving Y. profit. | 15:03 |
|
eric97477
| osse….I like your plan. Sadly, it is not one I can follow. So, a script it shall be. | 15:04 |
| → Guest5 joined | 15:04 |
|
ToxicFrog
| eric97477: the script seems pretty easy -- for branch in $(git branch); do git checkout $branch; sed -Ei '...' .gitmodules; git commit -am "update repo Y URL"; done | 15:04 |
|
ResidentBiscuit
| I've never heard of a good story coming out of submodule usage | 15:04 |
| → a_thakur joined | 15:05 |
|
osse
| eric97477: git for-each-ref --format=%(refname:short) 'refs/heads' | while read branch; do git checkout $branch && sed -i .gitmodules blabla && git commit -am 'Update URL for module'; done | 15:05 |
|
| eric97477: e< | 15:05 |
|
| $(git branch) :O for i in * master feature; do... Woops! | 15:06 |
|
| you rekt yourself | 15:06 |
| ← roelmonn_ left | 15:06 |
|
eric97477
| thanks. I will go that route and get myself a script to do the work for me. | 15:06 |
| → ASOLAr joined | 15:07 |
| → algae joined | 15:07 |
| → roelmonnens joined | 15:07 |
| ← ASOLAr left | 15:08 |
| → JanC_ joined | 15:08 |
| ← HoierM left | 15:08 |
|
ToxicFrog
| osse: if for some reason you have a branch named *, it won't be expanded in the output of $(git branch) | 15:08 |
| → chrisgeorge joined | 15:08 |
| ← chrisgeorge left | 15:09 |
|
osse
| ToxicFrog: git branch prints a '*'. and the shell will expand it | 15:09 |
| JanC → Guest40946 | 15:09 |
| JanC_ → JanC | 15:09 |
|
osse
| at least bash/dash/sh will. zsh won't | 15:09 |
| ← Guest40946 left | 15:09 |
| ← sanketdg left | 15:10 |
| kaldoran_ → kaldoran | 15:10 |
|
ToxicFrog
| osse: aha. That explains it. I tested on zsh. | 15:11 |
| ← roelmonnens left | 15:11 |
| → boyen joined | 15:11 |
| → ASOLAr joined | 15:11 |
|
ToxicFrog
| And totally forgot about the * | 15:11 |
| ← suchness left | 15:12 |
| ← ASOLAr left | 15:13 |
| → ech0s7 joined | 15:13 |
|
ech0s7
| hi! | 15:13 |
|
GodGinrai
| good morning | 15:13 |
| ← Guest5 left | 15:13 |
|
ech0s7
| i would create a different patch file for each commit into my repo, one by one in separate file ordered by time (from oldest to newest) | 15:14 |
|
| how can i do ? | 15:14 |
| ← thiago_ left | 15:14 |
| → cfxd joined | 15:15 |
| ← a_thakur left | 15:15 |
| ← slugmandrew left | 15:15 |
| → rossome joined | 15:16 |
| → Guest93616 joined | 15:16 |
| ← _sjs left | 15:17 |
| ← Sceorem left | 15:17 |
| ← victorbjelkholm_ left | 15:17 |
|
GodGinrai
| osse: wouldn't for-each-ref be applicable here? ^ | 15:17 |
| ← synthroid left | 15:18 |
| → jguillen joined | 15:18 |
| → dhollinger joined | 15:19 |
| ← johntramp left | 15:19 |
| → sanketdg joined | 15:19 |
| → tyreld joined | 15:20 |
| → Darren_ joined | 15:20 |
| ← mingrammer left | 15:22 |
| ← eric97477 left | 15:22 |
| → liamonade joined | 15:22 |
| → Guest5 joined | 15:22 |
|
Seveas
| ech0s7: man git format-patch | 15:22 |
|
gitinfo
| ech0s7: the git-format-patch manpage is available at http://jk.gs/git-format-patch.html | 15:22 |
| ← madewokherd left | 15:23 |
|
Seveas
| ech0s7: though do be aware that merge commits are not representable as patches, so if you have merges, this cannot be done. | 15:24 |
| ← rchavik left | 15:24 |
|
osse
| GodGinrai: see my suggestion :p | 15:24 |
| ← kaldoran left | 15:25 |
|
osse
| ToxicFrog: btw, git forbids ref names with a * in it. but I think the classic shell fork bomb is allowed | 15:25 |
|
ech0s7
| Seveas: i haven't merges | 15:25 |
|
GodGinrai
| osse: I didn't see a suggestion in response to ech0s7 | 15:25 |
|
osse
| GodGinrai: oh, i misunderstood | 15:25 |
| → kaldoran joined | 15:25 |
| → sebboh joined | 15:25 |
|
osse
| that just sounds like git format-patch --all or somesuch | 15:26 |
| → EduardoMartins joined | 15:26 |
| ← jimi_ left | 15:28 |
| ← davisonio left | 15:28 |
|
ech0s7
| thanks osse | 15:28 |
|
| just looking a way to exclude the first commit :) | 15:28 |
| → fakenerd joined | 15:28 |
| → khmarbaise joined | 15:28 |
| ← Derperperd left | 15:30 |
|
osse
| git format-patch firstcommit..HEAD | 15:30 |
| ← ahmed_elgabri left | 15:30 |
| → synthroid joined | 15:31 |
| ← synthroid left | 15:31 |
| → synthroid joined | 15:31 |
| ← khmarbaise left | 15:32 |
| → ahmed_elgabri joined | 15:32 |
| → atomicb0mb joined | 15:32 |
| ← rossome left | 15:32 |
| → rwswitch joined | 15:33 |
| ← LionsMane left | 15:34 |
| → wilhelmtell joined | 15:34 |
| → LionsMane joined | 15:35 |
| ← wilhelmtell left | 15:36 |
|
sebboh
| Hi! I'm trying to build some open source project, but that's not what my question is about. My question is, what knowledge am I missing about git which is preventing me from understanding what is happening? I'll describe what is happening... I've cloned a project called uzbl from github. I'm using git 2.8.1. Like some other projects, there's a master branch and a 'next' branch. So I tried `git checkout origin/next`. It says I am | 15:36 |
|
| in a detached HEAD state. I don't recall seeing that message when I did the same thing on other projects. But I think too that I only did `git checkout next`, when switching to the 'beta' on other projects. Why did this one specify 'origin/next' in the install docs? Why am I in a detached head state? Does not each branch have its own HEAD? | 15:36 |
| ← liamonade left | 15:36 |
| → eric97477 joined | 15:36 |
| ← eric97477 left | 15:36 |
| ← filcab left | 15:37 |
| → Gitzilla joined | 15:37 |
|
Seveas
| sebboh: 'origin/next' is not a branch, so if you check it out, your HEAD gets detached | 15:38 |
| → wilhelmtell joined | 15:38 |
| ← jceb left | 15:38 |
| ← Guest93616 left | 15:38 |
| ← wilhelmtell left | 15:38 |
|
Seveas
| 'git checkout next' is a bit magical, it actually translates to 'git checkout -b next origin/next', so 'create branch next, tracking origin/next. And then check it out' | 15:38 |
|
sebboh
| I didn't download a list of branches when I cloned the repo? | 15:39 |
| ← shams left | 15:39 |
| → davisonio joined | 15:39 |
|
Seveas
| you did, but those are stored as refs in refs/remotes, local branches don't get created automatically | 15:40 |
| → shams joined | 15:40 |
|
sebboh
| Does a simple git clone <Address> download everything that could possibly be downloaded? Is the result suitable for use as a historical archive of the repo at the point in time the clone was made? | 15:40 |
|
Seveas
| see https://git.seveas.net/recovering-from-a-detached-head.html and https://git.seveas.net/the-meaning-of-refs-and-refspecs.html for background info | 15:40 |
|
sebboh
| ok, thanks | 15:41 |
|
Seveas
| sebboh: it downloads everything downloadable, but that misses things like repo config and hooks, so it's not a complete backup | 15:41 |
| ← Lipp left | 15:42 |
|
sebboh
| ok, understood. | 15:42 |
| → shinnya joined | 15:42 |
| → romerocesar joined | 15:42 |
| → liamonade joined | 15:43 |
| → leeN joined | 15:43 |
| → rossome joined | 15:43 |
| → byteflame joined | 15:43 |
| ← Jibz left | 15:44 |
| ← Balliad left | 15:44 |
| → mrkat joined | 15:46 |
| → abyx joined | 15:49 |
|
kbs
| oh, that looks a great site Seveas - nice; and one more handy link for me :) | 15:49 |
| → ShekharReddy joined | 15:50 |
| ← wrouesnel1 left | 15:50 |
| → Muzer joined | 15:51 |
|
Dougie187
| Seveas: Doesn't it also miss unreachable commits? | 15:51 |
| → hashpuppy joined | 15:52 |
| → ksolv joined | 15:52 |
|
Dougie187
| Maybe those are considered not downloadable, but I think that distinction missing. | 15:53 |
| → Electrometro joined | 15:54 |
| ← jstein left | 15:55 |
| ← Lomex left | 15:55 |
| → Derperperd joined | 15:55 |
| → Lomex joined | 15:56 |
| ← Lomex left | 15:56 |
| → madewokherd joined | 15:58 |
|
bambams
| I was hoping I could use GIT_DIFF_OPTS to get -w --ignore-blank-lines into git commit -v. It doesn't appear to work. | 15:59 |
| ← Guest5 left | 15:59 |
|
bambams
| ack'ing the source it looks like it only looks for --unified and -u specifically...? | 15:59 |
| → morenoh149 joined | 15:59 |
|
Seveas
| Dougie187: it does. And the reflogs | 16:00 |
| ← artemisart left | 16:00 |
|
Seveas
| https://git.seveas.net/how-to-back-up-a-git-repository.html :) | 16:00 |
| ← cagomez left | 16:00 |
| ← ahmed_elgabri left | 16:01 |
| → cagomez joined | 16:01 |
| → Guest5 joined | 16:01 |
| ← Guest5 left | 16:01 |
| → mingrammer joined | 16:01 |
| → irco joined | 16:02 |
| → Guest5 joined | 16:02 |
| → dreiss joined | 16:04 |
| ← Hounddog left | 16:04 |
| → ikmaak joined | 16:04 |
| ← cagomez left | 16:05 |
| → ahmed_elgabri joined | 16:05 |
| ← mingrammer left | 16:06 |
| → eivarv joined | 16:07 |
| → oich joined | 16:08 |
| ← ksolv left | 16:10 |
| ← zeroed left | 16:10 |
| → preyalone joined | 16:10 |
| ← ahmed_elgabri left | 16:10 |
| ← mrkat left | 16:11 |
| ← govg left | 16:14 |
| → subhojit777 joined | 16:16 |
| ← rossome left | 16:16 |
| ← Guest5 left | 16:17 |
| → artemisart joined | 16:17 |
| → johntramp joined | 16:17 |
| → Guest5 joined | 16:18 |
| → spudowiar joined | 16:18 |
| gitinfo set mode: +v | 16:18 |
| ← astrofog left | 16:19 |
| ← artemisart left | 16:19 |
| → mingrammer joined | 16:20 |
| → m0viefreak joined | 16:20 |
| ← HappyLoa- left | 16:20 |
| → xall joined | 16:21 |
| ← eivarv left | 16:21 |
| ← ech0s7 left | 16:22 |
| → blackwind_123 joined | 16:22 |
| ← Timvde left | 16:23 |
| ← fahadash left | 16:23 |
| ← liamonade left | 16:24 |
| → SteffanW2 joined | 16:24 |
| ← mingrammer left | 16:24 |
| ← garethdaine left | 16:24 |
| → HappyLoa- joined | 16:25 |
| → mSSM joined | 16:25 |
| → dsdeiz_ joined | 16:26 |
| ← xall left | 16:27 |
| ← dsdeiz left | 16:27 |
| → Timvde joined | 16:28 |
| ← The_Phoenix left | 16:31 |
| ← HappyLoa- left | 16:31 |
| → Noldorin joined | 16:31 |
| → nitric joined | 16:32 |
| ← Electrometro left | 16:33 |
|
bambams
| http://explosm.net/comics/4388/ | 16:34 |
| → kpease joined | 16:35 |
| → Vampire0_ joined | 16:35 |
| ← dreiss left | 16:36 |
| → dreiss joined | 16:36 |
| ← Vampire0 left | 16:37 |
| → nettoweb joined | 16:38 |
| → HappyLoa- joined | 16:38 |
| ← cfxd left | 16:38 |
| ← mahendra_ left | 16:39 |
| ← Rodya_ left | 16:40 |
| → rossome joined | 16:41 |
| ← kurkale6ka left | 16:42 |
| → albel727 joined | 16:42 |
| ← EduardoMartins left | 16:43 |
| ← Guest5 left | 16:43 |
| → jstein_ joined | 16:43 |
| ← vaibhavsagar left | 16:44 |
| jstein_ → jstein | 16:45 |
| ← HappyLoa- left | 16:46 |
| ← davisonio left | 16:48 |
| → rubyonrailed joined | 16:48 |
| → jheckman joined | 16:49 |
| ← rubyonrailed left | 16:49 |
| → ahmed_elgabri joined | 16:50 |
| → xall joined | 16:52 |
| → daynaskully joined | 16:52 |
| → HoierM joined | 16:53 |
| → durham joined | 16:53 |
| gitinfo set mode: +v | 16:53 |
|
jheckman
| I am running into a weird problem that I can't figure out. Earlier I cloned an internal repo, specifying the directory it should clone into. It cloned just fine but for some reason when I would fetch and reset nothing would actually change (but the log was correct). I deleted the folder and tried to clone again without specifying the folder and instead of cloning like normal, it is just showing the content of .git in the root of the chec | 16:53 |
|
| If I try to checkout in a different place (like my home directory) it complains about the checkout in a different directory. This is on debian. I can't reproduce with the same repo on my mac | 16:54 |
| ← ahmed_elgabri left | 16:54 |
| ← lss8 left | 16:55 |
|
_ikke_
| jheckman: A transcript of what you are doing would help a lot | 16:57 |
| → davisonio joined | 16:57 |
|
grawity
| hmm you aren't cloning with --bare or --mirror, are you? | 16:57 |
| ← Impaloo left | 16:57 |
| → Impaloo joined | 16:57 |
| → HappyLoa- joined | 16:57 |
| ← phaleth left | 16:57 |
|
jheckman
| not doing bare or mirror, one sec on transcript | 16:58 |
| → lss8 joined | 16:58 |
| ← fakenerd left | 16:59 |
| → jost_ joined | 16:59 |
| ← dreiss left | 16:59 |
|
jheckman
| jheckman@vm101:/var/git$ git clone git@internal_repo:ops/docker_config Cloning into 'docker_config'... remote: Counting objects: 41, done. remote: Compressing objects: 100% (32/32), done. remote: Total 41 (delta 9), reused 0 (delta 0) Receiving objects: 100% (41/41), 10.68 KiB | 0 bytes/s, done. Resolving deltas: 100% (9/9), done. Checking connectivity... done. | 17:00 |
|
| that formatting is less than ideal though | 17:00 |
| ← UTAN_dev left | 17:01 |
|
grawity
| hmm | 17:01 |
|
jheckman
| jheckman@vm101:/var/git/docker_config$ ls branches description hooks info logs packed-refs config HEAD index jenkins_master objects refs | 17:01 |
| → UTAN_dev joined | 17:01 |
|
jheckman
| jenkins_master is one of the folders within the repo, that for some reason that is where the code is | 17:01 |
|
grawity
| check that 'config' file, does it say "[core] bare = true"? | 17:02 |
| ← jost left | 17:02 |
|
jheckman
| jheckman@vm101:~$ pwd /home/jheckman jheckman@vm101:~$ git clone git@internal_repo fatal: working tree '/var/git/docker_config/jenkins_master' already exists. | 17:02 |
|
grawity
| hmm | 17:02 |
|
_ikke_
| type git | 17:03 |
|
jheckman
| bare is false in the config | 17:03 |
|
grawity
| env | grep GIT | 17:03 |
|
jheckman
| GIT_WORK_TREE=/var/git/docker_config/jenkins_master -- this was set for another script | 17:04 |
|
grawity
| kindly please unset it | 17:04 |
| → hdon joined | 17:05 |
|
_ikke_
| grawity++ | 17:05 |
|
jheckman
| reset my session, That fixed my problem. Thank you, should probably use a better variable name | 17:06 |
| → eivarv joined | 17:06 |
| ← chll_ left | 17:06 |
| ← Jonuz left | 17:06 |
|
_ikke_
| GIT_WORK_TREE has a meaning to git | 17:06 |
| → phanimahesh joined | 17:06 |
| → Jonuz joined | 17:07 |
| ← bongjovi left | 17:07 |
| ← skylite left | 17:07 |
| → skylite joined | 17:08 |
|
jheckman
| good to know. I did not write the other script so maybe there was a reason it used that instead of something unique | 17:08 |
| ← texinwien_ left | 17:08 |
| → roelmonnens joined | 17:09 |
| ← dmto left | 17:09 |
|
Dougie187
| Seveas: Oh sorry, I meant `git clone`. Not the proper backup method. | 17:10 |
|
| Maybe I was plugging in to the wrong part of a conversation though. :P | 17:10 |
| → tgunr joined | 17:11 |
| ← roelmonnens left | 17:11 |
| → roelmonnens joined | 17:12 |
|
_ikke_
| jheckman: It's usually used in combination with git checkout on an existing repository to put the files in some directory | 17:13 |
| → jimi_ joined | 17:14 |
| ← eivarv left | 17:15 |
| ← jheckman left | 17:15 |
|
bambams
| (Sorry for the explosm link.. Wrong channel) | 17:16 |
| → eciohc joined | 17:16 |
| → weedtm joined | 17:16 |
| ← jost_ left | 17:17 |
| ← cyphase left | 17:17 |
| → InfoTest1 joined | 17:17 |
| ← InfoTest left | 17:18 |
| InfoTest1 → InfoTest | 17:18 |
| ← nettoweb left | 17:18 |
| ← fees left | 17:18 |
| → filcab joined | 17:18 |
| ← weedtm left | 17:19 |
| → dan2k3k4 joined | 17:19 |
| → TooLmaN joined | 17:21 |
| ← abyx left | 17:21 |
| → abyx_ joined | 17:21 |
| ← boombatower left | 17:22 |
| ← rossome left | 17:22 |
| ← weckl left | 17:22 |
| ← sanketdg left | 17:23 |
| → cyphase joined | 17:23 |
| ← abyx_ left | 17:23 |
| ← notebox left | 17:26 |
| → sanketdg joined | 17:28 |
| → notebox joined | 17:30 |
| ← notebox left | 17:31 |
| → mostlybadfly joined | 17:32 |
| → fahadash joined | 17:32 |
| ← roelmonnens left | 17:33 |
| → roelmonnens joined | 17:34 |
| → siaw23 joined | 17:34 |
| ← rwswitch left | 17:35 |
|
siaw23
| in my git log i have only 2 messages. the very first commit messages is wrong. i want to fix it. i tried ‘git rebase -i HEAD~2’ but it won’t show the 2 commit messages so i can pick which one i want to edit. it shows the last commit which is not what i want | 17:35 |
| ← tgunr left | 17:35 |
|
siaw23
| any idea how to fix old commit messages? | 17:36 |
| → grayjoc joined | 17:36 |
| → Ahmed90 joined | 17:36 |
| → aard_ joined | 17:36 |
|
siaw23
| better if i can use the hash code to edit a particular commit message | 17:36 |
|
GodGinrai
| wouldn't HEAD~2 mean to go to a commit that doesn't exist? | 17:36 |
|
| considering you only have 2 commits | 17:37 |
| ← subhojit777 left | 17:37 |
|
bremner
| siaw23: pass the commit _before_ the one you want to edit to rebase -i | 17:37 |
|
| oh. root commit. Yeah, there's a way, but I forget | 17:37 |
| ← niranjan left | 17:37 |
|
GodGinrai
| siaw23: http://stackoverflow.com/questions/2119480/edit-the-root-commit-in-git | 17:38 |
|
siaw23
| bremner: ok what if i have about 90 commits and i want to edit the 5th commit message? | 17:38 |
|
| how would i do it? | 17:38 |
| → YourTheBombNow23 joined | 17:38 |
|
bremner
| then pass the commit before (so the 4th hash) | 17:38 |
| → romankl joined | 17:38 |
| ← roelmonnens left | 17:38 |
| ← YourTheBombNow23 left | 17:38 |
|
siaw23
| so it would look like | 17:39 |
|
| git commit hast_of_4th_commit —amend? | 17:39 |
|
_ikke_
| siaw23: git rebase --root | 17:40 |
|
bremner
| no, git rebase -i hash_of_4th | 17:40 |
|
siaw23
| bremner: ah ok let me try | 17:40 |
|
| _ikke_: git rebase —root does nothing for me | 17:42 |
| → airdisa joined | 17:42 |
|
siaw23
| i want to edit the root commit message | 17:42 |
| → infra-red joined | 17:42 |
| → dreiss joined | 17:43 |
|
_ikke_
| siaw23: What do you mean, does nothing? | 17:44 |
| ← infra-red left | 17:44 |
| → Spacew00t joined | 17:44 |
| → annoymouse_ joined | 17:44 |
|
_ikke_
| AH, I thought it implied -i | 17:44 |
|
| git rebase -i --root | 17:45 |
| ← afuentes left | 17:46 |
| → LarArT joined | 17:47 |
| ← iota_pi left | 17:49 |
| ← dpower left | 17:50 |
| → iota_pi joined | 17:51 |
| ← dsantiago left | 17:52 |
| ← eciohc left | 17:52 |
| → mingrammer joined | 17:52 |
| ← blackwell left | 17:53 |
| ← siaw23 left | 17:53 |
| → blackwell joined | 17:53 |
| → todd_dsm_wk joined | 17:54 |
| → ASOLAr joined | 17:54 |
| ← ASOLAr left | 17:55 |
| → Dyonisos joined | 17:55 |
| ← moop left | 17:55 |
| → Guest5 joined | 17:56 |
| ← grayjoc left | 17:56 |
| ← BrianBlaze420 left | 17:56 |
| ← mingrammer left | 17:56 |
| → siaw23 joined | 17:57 |
| ← iota_pi left | 17:58 |
| → kinetik_ joined | 17:58 |
| ← ash_workz left | 17:58 |
| → BrianBlaze420 joined | 17:58 |
|
siaw23
| _ikke_: works now thanks :) | 17:59 |
| gitinfo set mode: +v | 17:59 |
| ← LarArT left | 17:59 |
| → nettoweb joined | 17:59 |
| ← mSSM left | 18:00 |
| → govg joined | 18:00 |
| ← MrMojito left | 18:00 |
| → iota_pi joined | 18:01 |
| → dpower joined | 18:01 |
| → moop joined | 18:01 |
| Maple__ → Belgium | 18:01 |
| → MrMojito joined | 18:01 |
|
_ikke_
| yw | 18:01 |
|
kinetik_
| Hello guys. I am interesting on understand the inner workings of git revert. Can we say that git revert works the same way as the svn reverse merge ? | 18:02 |
|
fakenullie
| it just applies commit in reverse | 18:02 |
| ← kadoban left | 18:03 |
|
_ikke_
| Take a patch, change all + to - and - to +, apply | 18:03 |
| → kadoban joined | 18:03 |
|
kinetik_
| I see. | 18:03 |
|
_ikke_
| (where patch is the diff of the commit to revert | 18:04 |
| → BSaboia joined | 18:05 |
| ← byteflame left | 18:06 |
| ← Didac left | 18:06 |
| → b1tchcakes joined | 18:06 |
| → subhojit777 joined | 18:06 |
| ← nanga left | 18:07 |
| → infra-red joined | 18:08 |
|
kinetik_
| Let's say we have 3 sequential commits, and all change the first character of the file. Why reverting the second commit makes git throw a conflict cause it can't decide between the first and the third change? Why git doesn't assume that the last commit should be preferred when managing the conflict? | 18:08 |
|
fakenullie
| revert doesn't know anything about other commits | 18:08 |
| ← romankl left | 18:10 |
|
_ikke_
| kinetik_: Why is the last commit prefered? | 18:10 |
| → StuartMI joined | 18:11 |
|
_ikke_
| kinetik_: When you revert a commit, you want the changes of that commit gone | 18:11 |
|
kadoban
| kinetik_: That specific revert seems like it would make no sense at all. Even thinking about it myself, I'd have no idea what you want the result to be. How could git know? | 18:11 |
| → roelmonnens joined | 18:12 |
| ← cyan__ left | 18:12 |
| Belgium → Maple__ | 18:13 |
| ← durham left | 18:14 |
| → ahmed_elgabri joined | 18:14 |
| → nanga joined | 18:15 |
| → eivarv joined | 18:15 |
|
kinetik_
| _ikke_: because the last commit is closer to the right code, since it was the last change | 18:15 |
| ← nidr0x left | 18:15 |
|
_ikke_
| Not necessarily | 18:15 |
| → hseg joined | 18:16 |
| ← davisonio left | 18:16 |
|
kinetik_
| what I really want to do (regardless of which command), it's to take a out a specific commit from the repository. In a real-case scenario I want to take out a specific feature from the repository by removing the commit, as the feature doesn't belong to the code anymore avoiding manual intervention | 18:16 |
|
| I thought revert was designed for that | 18:17 |
|
fakenullie
| git is stupid content tracker | 18:17 |
| → durham_ joined | 18:17 |
| ← durham_ left | 18:17 |
| → davisonio joined | 18:18 |
| → durham_ joined | 18:18 |
|
_ikke_
| Sure, but does not mean that reverting a commit would not commit with the current history | 18:18 |
|
fakenullie
| not feature management tool | 18:18 |
| → btree_ joined | 18:18 |
|
_ikke_
| (last commit == conflict) | 18:19 |
|
kadoban
| kinetik_: You can certainly do that, with revert or otherwise. git doesn't know what your code means though, you have to resolve the conflicts that arise. | 18:19 |
| → AaronMT_ joined | 18:19 |
| → vaibhavsagar joined | 18:19 |
| ← davisonio left | 18:20 |
| ← mohabaks left | 18:20 |
| ← btree left | 18:21 |
| → Didac joined | 18:21 |
| ← AaronMT left | 18:22 |
|
kbs
| I also wonder if you mean revert in the sense of not having it in the history at all, as I wonder if git-revert actually does that? | 18:22 |
|
_ikke_
| kbs: No | 18:23 |
|
| kbs: That would be rewriting history | 18:23 |
|
kbs
| right | 18:23 |
|
_ikke_
| kbs: git is basically creating a new 'undo' commit | 18:23 |
|
kbs
| but reading log above, I sorta wonder if that's the actual intent, and was curious | 18:23 |
|
| because git-revert is easier to understand (in the not-actually-removing-history sense) as being a merge | 18:23 |
| ← bocaneri left | 18:24 |
| ← filcab left | 18:26 |
| → EvilPeng1 joined | 18:26 |
|
kinetik_
| I appreciate that, but in my perspective if you take a commit in the middle of a pool of commits and conflicts arise shouldn't the commit after the left out one be the deciding base-source to manage any conflicts? | 18:26 |
| ← spudowiar left | 18:27 |
| ← kyan left | 18:27 |
|
kbs
| I think _ikke_ would know best, might strategy=recursive -Xours roughly approximate a merge that wanted to prefer HEAD on conflicts? | 18:27 |
|
| kbs stays away from debates about about what should and should not be default behavior :) | 18:28 |
| ← yan left | 18:28 |
| ← dan2k3k4 left | 18:28 |
|
_ikke_
| kinetik_: git plays safe and lets you decide | 18:29 |
|
kadoban
| kinetik_: Probably not. It requires human intervention to figure it out. | 18:29 |
| ← roelmonnens left | 18:29 |
| → roelmonnens joined | 18:29 |
| → SonikBoom joined | 18:29 |
| ← LionsMane left | 18:30 |
|
kinetik_
| Ok. Thank you for your quick answers fakenullie, _ikke_ and kadoban | 18:30 |
| ← subhojit777 left | 18:31 |
| → veilig2000 joined | 18:31 |
|
kinetik_
| I guess it makes also sense because every commit is based on the previous one, so git plays safe not assuming more than it should | 18:32 |
|
fakenullie
| you can try branch from that commit, revert it in that branch and merge that branch | 18:32 |
|
| but there will still be conflict, because commits in both branches changed that line | 18:33 |
| ← roelmonnens left | 18:34 |
|
_ikke_
| in any case, git revert does not look at the history at all | 18:34 |
| ← Maple__ left | 18:34 |
| → cagomez joined | 18:35 |
|
hseg
| Hi. I'm trying to get a feel for my options w.r.t. subproject management. I have a couple of libraries that are used in multiple projects. How would I manage them? | 18:35 |
|
_ikke_
| git can be summarized as: git diff <commit> <commit>~1 | git apply && git commit | 18:36 |
|
| git revert* | 18:36 |
|
hseg
| It seems like I could use submodules, but I've heard a lot of bad stuff about it. | 18:36 |
|
fakenullie
| I've used git submodules successfully | 18:36 |
|
| it's good when each project can break from library upgrade | 18:37 |
|
kbs
| ah, that's makes it very clear (re: git revert) thanks | 18:37 |
| → mohabaks joined | 18:37 |
| → Maple__ joined | 18:37 |
|
hseg
| fakenullie: What do you mean by "break from library upgrade"? | 18:37 |
|
fakenullie
| hseg: when library interface is unstable | 18:38 |
|
| and needs to change | 18:38 |
|
| or you just don't want to break other projects by changes in library | 18:38 |
| ← Manuel15 left | 18:38 |
|
fakenullie
| we had dormant projects, so that worked good | 18:38 |
|
hseg
| Ah, OK. | 18:38 |
|
| also, is it correct to summarize safe submodule usage as: "clients of a library only change the SHA they point to, all changes to the library are made in the library repo itself"? | 18:38 |
|
fakenullie
| it's only possible usage | 18:39 |
| → artemisart joined | 18:39 |
|
_ikke_
| yes, that's correct | 18:39 |
|
hseg
| OK. | 18:39 |
|
_ikke_
| Although nothing prevents you from comitting changes in the submodule repository | 18:39 |
|
| It's your responsibility to share those changes | 18:40 |
| → romankl joined | 18:40 |
|
fakenullie
| you can refer them by write-only urls in project | 18:40 |
|
| read-only | 18:40 |
| → dsantiago joined | 18:40 |
|
fakenullie
| that's how we did it, git:// url on github | 18:40 |
|
hseg
| How does a git:// github URL make it read-only? | 18:41 |
|
_ikke_
| It doesn't | 18:41 |
|
hseg
| Then what did you mean by that remark? | 18:41 |
| ← kinetik_ left | 18:41 |
| → ASOLAr joined | 18:42 |
|
fakenullie
| github does not allow write via git:// | 18:42 |
|
| or you can specify read-only user in url | 18:42 |
|
hseg
| Really? | 18:42 |
| ← cagomez left | 18:42 |
| ← sonOfRa left | 18:42 |
|
bremner
| almost nobody allows write via git:// | 18:42 |
|
hseg
| Oh, for organizations I suppose. | 18:42 |
|
_ikke_
| You can still commit in the repository | 18:42 |
|
hseg
| _ikke_: If you commit changes to the submodule, how do you keep them from being lost? | 18:42 |
|
_ikke_
| and if you commit that commit in the parent repo, no one is able to find hte commit | 18:43 |
|
fakenullie
| hseg: you push them | 18:43 |
| → Manuel15 joined | 18:43 |
| ← Manuel15 left | 18:43 |
| → Manuel15 joined | 18:43 |
| ← ASOLAr left | 18:43 |
| → grayjoc joined | 18:43 |
|
hseg
| OK. Then what's this about commits being lost? | 18:44 |
|
fakenullie
| I'm not sure | 18:44 |
|
_ikke_
| You need to make sure they're pushed | 18:44 |
|
hseg
| Otherwise, what happens? Suppose I committed a local patch to a library I use, then pull from upstream? | 18:45 |
| → diegoviola joined | 18:45 |
| → sonOfRa joined | 18:45 |
|
fakenullie
| the change will be merged or rebased into upstream | 18:45 |
|
_ikke_
| It gets merged | 18:45 |
|
fakenullie
| maybe "lost" change are then someone forgets to commit and push submodule changes | 18:46 |
|
_ikke_
| yes | 18:46 |
| ← cdg left | 18:46 |
|
hseg
| assuming I'm tracking a remote branch. So submodules are no different from regular repos? | 18:46 |
|
_ikke_
| or commit them, commit them in the parent repo, but never push | 18:46 |
|
fakenullie
| yeah | 18:46 |
|
_ikke_
| Then other ones try to check out the submodule but cannot find the recorded commit | 18:46 |
| → davisonio joined | 18:47 |
|
hseg
| OK, so don't update the library version used in the project without pushing the library commits first. | 18:47 |
|
_ikke_
| correct | 18:48 |
|
hseg
| And seeing as submodules are considered binary blobs w.r.t. git, resolve merge conflicts in the submodules before fetching from upstream in the project. | 18:49 |
|
| Doesn't seem like they deserve the bad press they seem to be getting. | 18:49 |
|
| (he said, unaware of the hours of sadness ahead of him) | 18:50 |
| → ash_workz joined | 18:50 |
|
fakenullie
| well, unpushed submodules happen quite often | 18:50 |
|
hseg
| Oh? Why? | 18:51 |
| → satifant joined | 18:51 |
| ← veilig2000 left | 18:51 |
|
fakenullie
| people forget | 18:51 |
| → axelitus joined | 18:51 |
|
fakenullie
| iirc you have to go into submodule and push explicitly | 18:52 |
| ← nikivi left | 18:52 |
|
hseg
| Eh. OK. | 18:52 |
|
fakenullie
| so if someone does that on goes on vacation it can be tough | 18:52 |
|
hseg
| Right. As usual, make sure to leave history in consistent state before getting hit by a bus. | 18:53 |
|
_ikke_
| It's better to not directly work in the submodule dir | 18:53 |
|
hseg
| OK, will avoid doing that. | 18:53 |
|
| _ikke_ thinks read-only submodules should be a thing | 18:53 |
| → veilig2000 joined | 18:54 |
|
hseg
| Yeah... If you actually need to patch the submodule, wouldn't it be saner to clone the submodule repo as a repo in its own right, develop on it, and use the clone as a submodule? | 18:55 |
|
fakenullie
| it's more convenient to make changes together | 18:55 |
|
_ikke_
| yes, but also more error prone | 18:56 |
|
hseg
| Why? | 18:56 |
|
_ikke_
| For the reasons we just mentioned | 18:56 |
| → zacts joined | 18:56 |
|
hseg
| I develop libfoo-v1-internal, then set project bar to use that version of libfoo instead of the upstream version. | 18:57 |
|
NightStrike
| I just did a "git checkout -b XX".... how do I rename that to YY ? | 18:57 |
| ← davisonio left | 18:58 |
| ← nettoweb left | 18:58 |
|
hseg
| Keeping track of work within libfoo works just as usual, and the only thing to keep in mind is to only change library version used once the corresponding commit is pushed | 18:58 |
|
| NightStrike: git branch -m XX YY | 18:59 |
| → FuzzySockets joined | 18:59 |
|
NightStrike
| hseg: thanks | 18:59 |
| → davisonio joined | 18:59 |
| → nettoweb joined | 18:59 |
| ← Maple__ left | 18:59 |
| ← MrMojito left | 19:00 |
| → jnewt joined | 19:00 |
| → MrMojito joined | 19:00 |
| ← MrMojito left | 19:00 |
| → MrMojito joined | 19:00 |
| → Maple__ joined | 19:00 |
|
jnewt
| i'd like to set the author & commit date of one commit to the same as another (i split a commit buried in history, but didn't preserve the acutal dates of the file changes (which i would like to)) | 19:00 |
|
| i have the sha of the old commit and the sha of the new commits. | 19:01 |
|
_ikke_
| jnewt: look into git commit -c / -C | 19:02 |
|
siaw23
| i did a rebase and i have my profile pic appearing on commits fromt he point i did the rebase. how do i revert this? https://gyazo.com/6294feabb16524e043b36d3a16fc31cd | 19:02 |
| → dan2k3k4 joined | 19:02 |
|
_ikke_
| (you do have to restore the message though) | 19:02 |
| → xdinomons joined | 19:03 |
| ← xall left | 19:03 |
|
_ikke_
| siaw23: This is probably because comitted date is different from author date | 19:03 |
| → NeonSynth joined | 19:04 |
|
siaw23
| but this has affected my app and tests are failing now | 19:04 |
|
| but there’s no code change :( | 19:04 |
|
_ikke_
| Why? | 19:04 |
|
jnewt
| _ikke_, is there a way to get the commit date of a commit by sha? | 19:04 |
|
_ikke_
| Why should your app fail on this? | 19:04 |
|
siaw23
| i don’t know why the test are failing after. since there’s not code change | 19:04 |
| ← l4v2 left | 19:04 |
|
_ikke_
| jnewt: look at man git show --format | 19:04 |
|
gitinfo
| jnewt: the git-show manpage is available at http://jk.gs/git-show.html | 19:05 |
| ← preyalone left | 19:05 |
| → l4v2 joined | 19:05 |
|
siaw23
| i just edited an older commit using rebase and reword | 19:05 |
| ← Pinkamena_D left | 19:05 |
| ← eivarv left | 19:05 |
|
xdinomons
| how do i make a bare repository available to anyone like a webserver | 19:05 |
| ← snowkidind left | 19:05 |
|
_ikke_
| xdinomons: dumb http is easiest, but requires you to execute git update-server-information regularly | 19:06 |
|
| siaw23: Why would that break your app? | 19:07 |
| ← MrMojito left | 19:07 |
|
siaw23
| _ikke_: i don’t know why it’s doing that honestly | 19:07 |
|
_ikke_
| siaw23: find out why the tests are failiing | 19:07 |
|
| failing | 19:07 |
| → MrMojito joined | 19:07 |
| → monk12 joined | 19:08 |
| → eivarv joined | 19:08 |
|
xdinomons
| ohh just read an article that ssh is best | 19:09 |
| ← infra-red left | 19:09 |
|
monk12
| Hey all, Im using git with Eclipse. I was curious... i forked a project in BitBucket (so its my personal playground for a project)... in Eclipse i had the original origin Remote. but also just added a new Remote for my personal fork... how does Eclipse know which Remote to send it to by default (pretend its the same branch in both remotes)? | 19:09 |
|
_ikke_
| xdinomons: yeah, imo it's the best | 19:10 |
|
siaw23
| _ikke_: is there a way to revert the rebase i made? | 19:10 |
|
_ikke_
| monk12: git has so called tracking information | 19:10 |
|
monk12
| how does it know which Remote to send to currently. Im wondering how I can find that out or change it via GUI/Eclipse and command line git. | 19:10 |
|
siaw23
| i honestly don’t know why my tests are failing | 19:10 |
| ← xdinomons left | 19:10 |
|
monk12
| so if the checked out branch in Eclipse was originally associated with the origin remote... how can i change to new remote be4 my Push? | 19:11 |
| ← Derperperd left | 19:11 |
|
_ikke_
| siaw23: A beter thing would be to diff the changes from before and after | 19:11 |
|
| monk12: I don't know how to do it in eclipse | 19:11 |
|
siaw23
| _ikke_: i thought of that but i’m not sure what to diff against what | 19:11 |
|
_ikke_
| siaw23: look at man git reflog | 19:11 |
|
gitinfo
| siaw23: the git-reflog manpage is available at http://jk.gs/git-reflog.html | 19:11 |
|
_ikke_
| This keeps track of HEAD and your branches so that you can retrieve back commits | 19:12 |
|
monk12
| _ikke_: its might be Right CLick->Properties in the configuration... u can change... _ikke_: how about on the command line? how can you check and change a remote for a branch. | 19:12 |
|
| just curious how to do it the proper way on command line | 19:12 |
|
_ikke_
| monk12: easiest is git push -u <remote> <branch> | 19:13 |
|
| the -u will make git update the tracking info | 19:13 |
| ← mohabaks left | 19:13 |
|
monk12
| _ikke_: cool... i think i also got a way to report it tooo.. | 19:14 |
|
| _ikke_: git branch -vv (two v's) | 19:14 |
|
| seems to work | 19:14 |
|
_ikke_
| monk12: correct | 19:15 |
| → merpnderp joined | 19:15 |
|
monk12
| sweet... thanks _ikke_ ... this really helps | 19:15 |
|
_ikke_
| git status will also mention it for the current branch | 19:15 |
|
| git checkout | 19:15 |
| → mingrammer joined | 19:16 |
|
merpnderp
| We have a react project in git. But we don't want to regularly check in our builds. But we do want to deploy those builds with git. Are there sub projects that we'd only commit and push to a sub repo for that build folder? | 19:16 |
|
GodGinrai
| merpnderp: git is not a deploy tool | 19:18 |
| ← romankl left | 19:18 |
|
GodGinrai
| merpnderp: you shouldn't use it as one | 19:18 |
|
siaw23
| _ikke_: i think the head somehow moved to another point | 19:19 |
| → Pinkamena_D joined | 19:19 |
| → filcab joined | 19:20 |
| → mr_quincy joined | 19:20 |
| ← davisonio left | 19:20 |
| ← mingrammer left | 19:21 |
| → jeffmjack joined | 19:21 |
| ← artemisart left | 19:21 |
| ← grayjoc left | 19:23 |
|
merpnderp
| GodGinrai: git is actually a great deploy tool if you want to use it as one. | 19:24 |
|
| Lots of people happily use it that way day in and day out. | 19:24 |
|
| Github et al have special git deployment keys just for using a special key for deployments. | 19:25 |
| ← hseg left | 19:25 |
| ← MainB left | 19:25 |
| ← boyen left | 19:25 |
| → palmira67 joined | 19:25 |
|
GodGinrai
| merpnderp: A lot of people use excel to keep track of their work, but JIRA et al do a much better job | 19:25 |
| ← SteffanW2 left | 19:26 |
|
GodGinrai
| merpnderp: github deploy keys are for deployment tools to use to clone the repo *during* the deploy process. | 19:26 |
|
| git itself isn't the deployment tool | 19:26 |
| → Derperperd joined | 19:27 |
| gitinfo set mode: +v | 19:27 |
|
mr_quincy
| I inherited a "non-bare" git repo, and I'm getting a strange result from running "git status" from the master branch. It says "On branch master" and on the next line says "Your branch is ahead of origin/master by 7 commits". This should not be. The master branch should be identical to the origin/master branch. | 19:27 |
| ← jimi_ left | 19:27 |
| → davisonio joined | 19:28 |
|
tobiasvl
| mr_quincy: well apparently it's not, but your origin/master might not be up to date with origin's master | 19:28 |
|
| do a git fetch | 19:28 |
|
GodGinrai
| mr_quincy: They might not be identical in commits | 19:28 |
|
merpnderp
| GodGinrai: so the deployment tool does git clone or git pull. Like my fingers will do on the CLI. | 19:28 |
|
GodGinrai
| what tobiasvl said, too | 19:28 |
|
siaw23
| _ikke_: ok the problem is this “Your branch is ahead of 'origin/rails4_clone' by 125 commits. | 19:29 |
|
| (use "git push" to publish your local commits) | 19:29 |
|
| nothing to commit, working directory clean” | 19:29 |
|
| _ikke_: how can i fix that please. i don’t want to risk to get things worse | 19:29 |
| ← Pinkamena_D left | 19:29 |
|
siaw23
| is it because i used rebase? | 19:29 |
|
GodGinrai
| merpnderp: the deployment tool will clone so that it can get the source for building/deploying | 19:29 |
|
siaw23
| because i don’t see how my branch can be ahead 125 commits | 19:29 |
|
| that’s why my tests are failing :( | 19:30 |
|
GodGinrai
| merpnderp: if you don't intend to "control" your source, there is no reason to be using git | 19:30 |
| → paul424 joined | 19:30 |
|
merpnderp
| GodGinrai: What do you mean? I want a submodule for our build folder. We run a build that we decide is ready for deployment. Check it in to the submodule's master. And then on prod we can do a git pull. | 19:31 |
|
| What's wrong with that? | 19:31 |
|
GodGinrai
| siaw23: did you try the fetch command like tobiasvl suggested? | 19:31 |
|
tobiasvl
| that was for mr_quincy | 19:31 |
|
| but applies for siaw23 too probably | 19:31 |
|
siaw23
| GodGinrai: i didn’t see his “fetch” suggesting | 19:31 |
| ← kpease left | 19:32 |
| → LionsMane joined | 19:32 |
|
siaw23
| git fetch is not the same as git pull? | 19:32 |
|
GodGinrai
| !deploy | 19:32 |
|
gitinfo
| Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html | 19:32 |
| → arand joined | 19:33 |
|
GodGinrai
| siaw23: `git pull` === `git fetch; git merge origin/master` essentially | 19:33 |
|
| when run from master | 19:33 |
| ← johnmilton left | 19:34 |
| → mniip joined | 19:35 |
| → _Cyclone_ joined | 19:35 |
| → kpease joined | 19:35 |
| ← ki0 left | 19:35 |
| → fractalizator joined | 19:35 |
| ← paul424 left | 19:36 |
|
siaw23
| how do i set the head to the current commit? | 19:37 |
|
| i think that’s what’s bugging me | 19:37 |
| → Bizkit joined | 19:37 |
|
GodGinrai
| siaw23: HEAD is where the current commit is | 19:37 |
|
| that's what HEAD means | 19:37 |
|
siaw23
| i thought you could set it to which commit you would like | 19:38 |
| → dodobrain joined | 19:38 |
|
GodGinrai
| siaw23: when you do, that changes which commit is the "current commit" for a branch | 19:38 |
| ExoUNX → John | 19:38 |
|
siaw23
| yes | 19:38 |
| John → John_Doe | 19:38 |
| John_Doe → ExoUNX | 19:39 |
|
siaw23
| my tests is failing i think for this reasong “Your branch is ahead of 'origin/rails4_clone' by 125 commits.” | 19:39 |
|
| but i don’t understand why my local repo can be AHEAD | 19:39 |
|
| and i want it to be the same as the remote repo | 19:39 |
| ← Spacew00t left | 19:39 |
|
fakenullie
| you pulled commits from other branch | 19:39 |
|
yitz
| ls | 19:40 |
|
fakenullie
| . .. | 19:40 |
|
yitz
| If someone checked a massive binary into a repo and I did a 'git rm', how do I clear it out of the .git to shrink my repo size? | 19:41 |
|
fakenullie
| you can't | 19:41 |
|
| it's forever there unless you change the history | 19:41 |
|
perlpilot
| yitz: rewrite the commits such that it's not there anymore | 19:41 |
|
yitz
| >.> | 19:41 |
| → khmarbaise joined | 19:41 |
| ← nettoweb left | 19:41 |
|
yitz
| How do I do that? | 19:43 |
| → shaggycat joined | 19:43 |
|
fakenullie
| https://help.github.com/articles/remove-sensitive-data/ | 19:44 |
| ← siaw23 left | 19:45 |
| ← l4v2 left | 19:46 |
| ← kapu left | 19:46 |
| ← circ-user-RNfpp left | 19:46 |
| → l4v2 joined | 19:47 |
|
yitz
| If I got to a detached HEAD, how do I get back to the ... origin HEAD? | 19:47 |
|
| Oh. origin/HEAD :) | 19:47 |
|
arooni
| i added a file to not be ignored via a .gitignore file; yet when it try to add the file it tells me its still part of the git ignore file.. why? | 19:47 |
| → kapu joined | 19:47 |
|
arooni
| do i need to commit the changes to the ignore file firsT? | 19:48 |
| ← eka left | 19:48 |
|
fakenullie
| arooni: something is wrong, you don't need to commit it | 19:48 |
| → yoan joined | 19:48 |
|
arooni
| why does git hate me | 19:49 |
| ← Bizkit left | 19:49 |
| → circ-user-RNfpp joined | 19:49 |
|
fakenullie
| I guess you made a mistake | 19:49 |
|
arooni
| in my ignore file i have * ; then later i have !bin/pbcopy-remote .. located in ~/bin/pbcopy-remote | 19:49 |
|
gitinfo
| [!binary] Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions | 19:49 |
| → paul424 joined | 19:50 |
|
mr_quincy
| tobiasvl: Thanks for the tip. I want my master to become origin/master. Ordinarily I would git add, git commit, and git push origin master. When I try to push however, I get an error message related to non-bare repositories. I don't want to create an inconsistent work tree, but I do want to push my local master branch to the origin/master branch. | 19:51 |
| → Sasazuka__ joined | 19:51 |
|
fakenullie
| mr_quincy: your remote is non-bare repository | 19:51 |
| ← vaibhavsagar left | 19:52 |
| → zeroed joined | 19:53 |
| ← zeroed left | 19:53 |
| → zeroed joined | 19:53 |
|
mr_quincy
| fakenullie: that seems consistent with the messages I'm seeing. Why would anyone use a non-bare repo? I haven't seen one before I inherited this. | 19:53 |
| ← Sasazuka__ left | 19:53 |
|
fakenullie
| mr_quincy: did you clone from non-bare repository? | 19:54 |
|
tobiasvl
| mr_quincy: perhaps the remote has only been pulled from, not pushed to in the past? | 19:54 |
| → Sasazuka__ joined | 19:54 |
| ← hjubal left | 19:55 |
|
mr_quincy
| fakenullie: unfortunately I'm not certain how this clone was initially created. It does seem likely that no one has ever pushed to this. It was kind of an abandoned undergraduate project | 19:55 |
|
tobiasvl
| do you need to push to it? | 19:55 |
| Sasazuka__ → Sasazuka | 19:56 |
|
tobiasvl
| do you have access to the remote somehow? | 19:56 |
| ← veilig2000 left | 19:56 |
|
yitz
| ...how do I attach my HEAD? I did a checkout origin/HEAD | 19:57 |
|
mr_quincy
| Ideally, I'd like to push the changes that haven't been committed yet, just so I have a complete history. Once that's done I'll wipe this .git out and create a bare repo for my future developments. | 19:57 |
|
| I do have access to the remote | 19:57 |
|
| admin rights as well | 19:57 |
|
| on the fs where the remote is located | 19:57 |
|
grawity
| yitz: checkout an actual branch | 19:57 |
| ← shaggycat left | 19:58 |
|
fakenullie
| mr_quincy: you can clone it into bare repo and then push to it | 19:59 |
|
| or you can push to new .git | 19:59 |
|
yitz
| grawity: Thanks | 19:59 |
| ← InfoTest left | 20:01 |
| → cdg joined | 20:02 |
| → nettoweb joined | 20:02 |
| → thiago joined | 20:03 |
| → foist joined | 20:05 |
| ← Sasazuka left | 20:05 |
| ← Guest5 left | 20:05 |
| ← t-mart left | 20:05 |
|
mr_quincy
| fakenullie: Please feel free to tell me if I'm doing something stupid, but it seems cleaner to push these changes to the non-bare origin as a kind of "final backup" before I create a bare repo. This repo contains a subset of the source I wish to control moving forward. | 20:05 |
|
fakenullie
| mr_quincy: create new bare repo and push to it, without changing old repo | 20:06 |
| → t-mart joined | 20:06 |
| ← shams left | 20:07 |
| → Guest5 joined | 20:07 |
| ← HoierM left | 20:07 |
| ← zacts left | 20:08 |
| → xall joined | 20:08 |
| → hjubal joined | 20:08 |
| ← SirCmpwn left | 20:08 |
| → vaibhavsagar joined | 20:09 |
| → JacobsLadd3r joined | 20:09 |
| ← jeffreylevesque left | 20:09 |
| ← JacobsLadd3r left | 20:10 |
|
mr_quincy
| fakenullie: thanks, I'll do that. What's the use case for a non-bare repo? | 20:11 |
| → zumba_addict joined | 20:11 |
| → le_melomane joined | 20:11 |
|
fakenullie
| mr_quincy: work with it? | 20:11 |
|
zumba_addict
| folks, when my ofcmate was doing git revert on a sha 3 commits ago, it's failing | 20:11 |
|
| i only told to do a git log and find the sha | 20:12 |
| ← Narwhaal left | 20:12 |
|
fakenullie
| failing? | 20:12 |
|
zumba_addict
| then also told him to do a git revert the_sha_key_here | 20:12 |
|
| yeah | 20:12 |
|
| it's failing | 20:12 |
| → rossome joined | 20:12 |
|
fakenullie
| what error | 20:12 |
|
zumba_addict
| one sec, let me ask him to forward the error to me | 20:13 |
| ← CheckDavid left | 20:13 |
| ← sanketdg left | 20:13 |
|
zumba_addict
| he's sending it | 20:13 |
| → grayjoc joined | 20:13 |
| → Narwhaal joined | 20:14 |
| → nwkj86 joined | 20:16 |
| ← mostlybadfly left | 20:17 |
| → javier_ joined | 20:18 |
| → Sasazuka joined | 20:18 |
| ← dodobrain left | 20:19 |
|
zumba_addict
| gheez, i LOL hard, he git revert someone's code | 20:19 |
|
| can we undo the revert? | 20:20 |
|
fakenullie
| you can revert a revert | 20:20 |
|
zumba_addict
| so the sha of the last revert right? | 20:20 |
|
GodGinrai
| and revert a revert of a revert | 20:20 |
|
fakenullie
| yes | 20:20 |
|
zumba_addict
| hahaha :D | 20:20 |
|
| he is friggin scared man! LOL | 20:20 |
|
| and teammates where wondering why i was laughing so hard | 20:20 |
|
| brb | 20:20 |
| ← Derperperd left | 20:21 |
|
merpnderp
| Thanks GodGinrai that was good stuff. | 20:21 |
|
mr_quincy
| fakenullie: I misspoke, sorry. Reading a bit to ask a better question. Is there a use case for establishing non-bare remote origin? I hope I asked that correctly... | 20:21 |
|
GodGinrai
| merpnderp: np | 20:22 |
| ← btree_ left | 20:22 |
|
fakenullie
| mr_quincy: well, he may worked on it, and then he cloned it in a new place | 20:22 |
| → sbeex joined | 20:22 |
|
fakenullie
| mr_quincy: he did not plan to push | 20:22 |
| ← grayjoc left | 20:22 |
|
sbeex
| good evening | 20:23 |
|
fakenullie
| clone just kept source repository as origin | 20:23 |
|
| mr_quincy: or he pushed to non-checked out branches | 20:23 |
| → SirCmpwn joined | 20:23 |
| → ajf- joined | 20:24 |
| → mablae joined | 20:26 |
| ← rwb left | 20:26 |
| ← ajf- left | 20:27 |
| → netcarver joined | 20:27 |
|
zumba_addict
| fakenullie: finally received the error message - error: Commit ef058f25291fecf952abf027d3f797ec4 is a merge but no -m option was given. | 20:27 |
|
mr_quincy
| got it. Thanks fakenullie, you've been very helpful. | 20:27 |
|
_ikke_
| zumba_addict: says it all | 20:27 |
|
zumba_addict
| then next line fakenullie fatal: revert failed | 20:27 |
|
| what do we have to do? | 20:28 |
|
_ikke_
| zumba_addict: Do you actually want to revert a merge? | 20:28 |
|
zumba_addict
| he just wants to revert all the things he updated | 20:28 |
| → jimi_ joined | 20:28 |
| → cyan__ joined | 20:28 |
|
zumba_addict
| git log shows it | 20:28 |
|
_ikke_
| git revert would not remove it from git log | 20:28 |
| ← thiago left | 20:29 |
|
zumba_addict
| yup, I'm aware | 20:29 |
|
fakenullie
| git reverting a merge is not trivial | 20:29 |
|
zumba_addict
| he just want to remove the errors he introduced | 20:29 |
| ← Sasazuka left | 20:29 |
| → Sasazuka joined | 20:29 |
|
zumba_addict
| so he wants to git revert the sha that git log is showing but we're getting that error above | 20:29 |
| → artemisart joined | 20:29 |
|
fakenullie
| you have to specify which branch you want to get rid of | 20:29 |
|
zumba_addict
| we are in master | 20:30 |
| ← kaldoran left | 20:30 |
| ← eivarv left | 20:30 |
|
zumba_addict
| so if it's a merge, we have to specify that branch that we merged into master? | 20:30 |
|
fakenullie
| fakenullie: look at a commit, see which branch is master | 20:30 |
|
| which parent of it is master | 20:30 |
|
zumba_addict
| which command would show it? | 20:31 |
|
| will git log show it? | 20:31 |
|
fakenullie
| yes, search for -m in git revert | 20:31 |
|
| man git revert | 20:31 |
|
gitinfo
| the git-revert manpage is available at http://jk.gs/git-revert.html | 20:31 |
|
zumba_addict
| ok | 20:31 |
|
| -m parent-number so parent-number is the sha? | 20:31 |
|
fakenullie
| I can't remember which command shows parents | 20:31 |
|
_ikke_
| zumba_addict: parent number is always 1 | 20:31 |
|
zumba_addict
| so -m 1 ? | 20:32 |
|
_ikke_
| yes | 20:32 |
|
zumba_addict
| so git revert -m 1 theshaofthecommit | 20:32 |
|
_ikke_
| It tells git revert which side of the revert to 'keep' | 20:32 |
| ← nettoweb left | 20:33 |
| → jadew joined | 20:35 |
|
jadew
| hey, is it still not possible to add an empty folder to the index? | 20:35 |
| ← Ineentho[m] left | 20:35 |
|
milki
| jadew: it will never be allowed | 20:35 |
|
jadew
| milki, why never? | 20:35 |
| ← aard_ left | 20:35 |
|
milki
| folders arent tracked by git at all | 20:35 |
|
jadew
| well, yeah, but why would it never be allowed | 20:36 |
|
milki
| jadew: this is a very low-level git specification | 20:36 |
|
jadew
| it seems like a big oversight | 20:36 |
|
| I see, so no plans to fix it | 20:36 |
|
milki
| jadew: a question we would ask is why do you need a folder? | 20:36 |
| → NeverDie joined | 20:36 |
|
ResidentBiscuit
| It's nothing to "fix" | 20:36 |
|
| It's not a bug | 20:36 |
|
jadew
| milki, because an empty folder or folder structure for that matter can be part of a project | 20:36 |
|
| it's not always the contents of the files that matter | 20:36 |
|
milki
| jadew: we believe its not the responsbility of git to track non-code things like folders | 20:36 |
| → Pinkamena_D joined | 20:37 |
| ← TooLmaN left | 20:37 |
|
milki
| jadew: why does the project require empty folders? | 20:37 |
| → tjbp joined | 20:37 |
|
jadew
| milki, for structure | 20:37 |
|
milki
| what does that mean? | 20:37 |
|
jadew
| it means that some stuff may go in there in the future and there's a place for that | 20:37 |
|
| it may also be as part of a template | 20:38 |
|
perlpilot
| jadew: a common mechanism is to put a .gitignore file in the directory and add that to the repo | 20:38 |
|
jadew
| perlpilot, yeah, that doesn't seem like a decent solution | 20:38 |
|
perlpilot
| jadew: another is to have your deployment mechanism build the needed directory structure | 20:38 |
|
milki
| jadew: this sounds like a workflow responsibility rather than a code repository responsibility | 20:39 |
| ← lamont left | 20:39 |
|
jadew
| milki, the code may rely on those folders being there | 20:39 |
| → crayon joined | 20:39 |
|
jadew
| anyway, I see your point | 20:39 |
|
milki
| your application should be able to handle the creation of folders during runtime or configuration | 20:39 |
| ← crayon left | 20:39 |
| → crayon joined | 20:39 |
|
milki
| jadew: and its best not to run your applications straight out of the repo | 20:39 |
| → Ineentho[m] joined | 20:40 |
|
zumba_addict
| sorry was in his cube | 20:40 |
|
jnewt
| just put a blank .gitignore in the folder | 20:40 |
|
zumba_addict
| so I saw the branch that was merged into master | 20:40 |
|
jadew
| jnewt, yeah, silly solution | 20:40 |
|
| how is that part of the code? | 20:40 |
|
| the point is that various projects need this sort of functionality and forcing the user to do shitty stuff like putting .gitignoore files or dummy files in there doesn't seem to make sense | 20:41 |
|
zumba_addict
| ah _ikke_ since it's a merge say branch_A into master with a sha of abc123, the command will be git revert -m 1 abc123? | 20:41 |
|
jnewt
| it's not, but it will solve the problem of not having folders you create stick around. | 20:41 |
|
jadew
| jnewt, I know, I've been using dummy files in the past, right now I was just countering the point that "it shouldn't do it" | 20:42 |
| ← GodGinrai left | 20:42 |
|
perlpilot
| jadew: It is a little weird that git doesn't treat directories as files (just like unix does). But, it is what it is. | 20:43 |
|
ResidentBiscuit
| git tracks files, not directories. If that doesn't suit your needs, don't use git | 20:43 |
|
jadew
| ResidentBiscuit, how's that an argument? | 20:43 |
| → dmto joined | 20:43 |
|
ResidentBiscuit
| It's not an argument, it's a fact of life. If a tool doesn't do what you need, don't use the tool | 20:43 |
|
jadew
| perlpilot, I agree | 20:43 |
|
zumba_addict
| i found this in stackoverflow,i it | 20:44 |
|
jnewt
| are we arguing about something? | 20:44 |
|
| jnewt is late to the party | 20:44 |
|
zumba_addict
| it's git log output, Am i right that first value is parent? Merge: 8989ee0 7c6b236 | 20:44 |
|
morenoh149
| how do I list the current changes when committing? | 20:44 |
| ← javier_ left | 20:44 |
|
zumba_addict
| i mean 8989ee0 is the parent 1 which is master? | 20:44 |
|
jnewt
| morenoh149, git status | 20:44 |
|
morenoh149
| I think it's a thing added by zsh and I miss it | 20:44 |
|
kbs
| jadew: basically, you're right that git doesn't support empty folders; and for fairly basic choices made in its design. It's reasonable to want it to do it if it can, and the main reason it doesn't exist is fundamentally a symptom, not an explicit goal per-se. | 20:44 |
|
morenoh149
| jnewt: I used to be able to do `git commit` and I'll be prompted with vim and a diff below my commit message | 20:45 |
| ← MrMojito left | 20:45 |
|
jnewt
| git diff . | 20:45 |
|
morenoh149
| this way I can write the commit message while reviewing the changes to be commited in a single vim window | 20:45 |
|
jadew
| kbs, makes sense, thanks | 20:45 |
|
| I thought it's a design decision | 20:46 |
|
zumba_addict
| he couldn't wait, he edited the file again, lol | 20:46 |
| → lamont joined | 20:46 |
| → thiago joined | 20:46 |
| ← atomicb0mb left | 20:46 |
| ← hjubal left | 20:46 |
|
morenoh149
| jadew: git commit -v | 20:46 |
|
| https://gist.github.com/bkono/6358506 | 20:47 |
|
| now I need colors 8) | 20:47 |
| → CheckDavid joined | 20:47 |
| ← fmcgeough left | 20:48 |
| → cagomez joined | 20:50 |
| ← mariuscc left | 20:50 |
|
morenoh149
| dash vee son | 20:51 |
| ← kutsuya left | 20:53 |
|
morenoh149
| ah that's a vim setting actually | 20:53 |
| ← synthroid left | 20:54 |
| → nettoweb joined | 20:54 |
| ← leeN left | 20:58 |
| → EvilPenguin joined | 20:59 |
| ← ExoUNX left | 21:00 |
| ← EvilPeng1 left | 21:00 |
| → thibaultcha joined | 21:01 |
| ← Pinkamena_D left | 21:01 |
| ← Guest5 left | 21:02 |
| ← circ-user-RNfpp left | 21:02 |
| → mingrammer joined | 21:05 |
| ← dan2k3k4 left | 21:07 |
| → Cihan joined | 21:08 |
| ← ShekharReddy left | 21:09 |
| ← cagomez left | 21:09 |
| ← cyan__ left | 21:09 |
| ← mingrammer left | 21:10 |
| ← mniip left | 21:10 |
| ← mda left | 21:11 |
| ← Dyonisos left | 21:11 |
| ← SporkWitch left | 21:11 |
| → SporkWitch joined | 21:11 |
| ← glebihan_ left | 21:12 |
| → adron joined | 21:12 |
| → kyan joined | 21:13 |
| → paws_ joined | 21:14 |
| → cyan__ joined | 21:14 |
| → glebihan_ joined | 21:14 |
|
osse
| pro tip, if you ever forget -v you can do :$r!git diff --staged | 21:15 |
| → mingrammer joined | 21:15 |
|
osse
| nnoremap SHIT :$r!git diff --staged<CR>`` | 21:15 |
|
| hmm | 21:17 |
|
| might be easier to :q and git commit -v | 21:17 |
| → dodobrain joined | 21:17 |
| ← satifant left | 21:18 |
| ← mingrammer left | 21:19 |
| → ericP joined | 21:20 |
| ← ericP left | 21:20 |
| → mda1 joined | 21:20 |
| ← mattcen left | 21:22 |
| ← ash_workz left | 21:24 |
| → mattcen joined | 21:28 |
| ← t0by left | 21:28 |
| ← sagerdearia left | 21:29 |
| → Literphor joined | 21:31 |
| ← blackwind_123 left | 21:31 |
| → aard_ joined | 21:33 |
| → blackwind_123 joined | 21:33 |
| → cd-rum joined | 21:33 |
| ← khmarbaise left | 21:33 |
| ← Manuel15 left | 21:35 |
| ← LucaTM left | 21:35 |
| → veilig2000 joined | 21:36 |
| ← f0rblaze left | 21:36 |
| ← adron left | 21:37 |
| → cd-rum_ joined | 21:37 |
| → sagerdearia joined | 21:37 |
| ← veilig2000 left | 21:37 |
| → Manuel15 joined | 21:37 |
| ← Manuel15 left | 21:37 |
| → Manuel15 joined | 21:37 |
| ← fractalizator left | 21:37 |
| ← zeroed left | 21:38 |
| ← cd-rum left | 21:38 |
| → mycyber joined | 21:39 |
| ← ResidentBiscuit left | 21:39 |
| → texinwien_ joined | 21:39 |
| → mellernoia joined | 21:39 |
| ← cyphase left | 21:40 |
| ← cyan__ left | 21:41 |
| → veilig2000 joined | 21:41 |
| ← JamesBaxter left | 21:43 |
| → cyphase joined | 21:44 |
| ← Gitzilla left | 21:46 |
| → robotroll joined | 21:46 |
| ← mycyber left | 21:46 |
| ← jeffmjack left | 21:48 |
| ← le_melomane left | 21:49 |
| ← axelitus left | 21:49 |
| ← robotroll left | 21:51 |
| ← thiago left | 21:51 |
| ← Dougie187 left | 21:51 |
| → unbalanced joined | 21:52 |
| ← unbalanced left | 21:56 |
| ← veilig2000 left | 21:57 |
| ← madewokherd left | 21:58 |
| ← texinwien_ left | 22:00 |
| ← AaronMT_ left | 22:00 |
| ← TomyLobo left | 22:01 |
| → veilig2000 joined | 22:01 |
| → cortexman joined | 22:02 |
| ← aard_ left | 22:02 |
| ← davisonio left | 22:02 |
| ← monk12 left | 22:02 |
|
cortexman
| is there a way to have a meta-repository that has the behavior when you "git clone" it clones all the repositories that it points to, and that when you "git pull" it updates to the latest version of all the repositories that it points to? | 22:03 |
| → DeJoker joined | 22:03 |
| ← irco left | 22:05 |
| ← rgrinberg left | 22:06 |
|
jhass
| you might want the repo tool from the android project https://code.google.com/p/git-repo/ | 22:06 |
|
cortexman
| it wasn't clear to me how general that tool is | 22:08 |
| ← sbeex left | 22:09 |
|
osse
| Poor man's alternative: use git clone --recursive, and put 'git submodule update' in .git/hooks/post-merge and .git/hooks/post-checkout | 22:10 |
|
cortexman
| osse, those hooks go in all submodules? | 22:10 |
| ← zivester left | 22:11 |
|
osse
| no | 22:11 |
|
| they go in the outer repo | 22:11 |
| → spudowiar joined | 22:11 |
| → adron joined | 22:11 |
| gitinfo set mode: +v | 22:11 |
|
cortexman
| osse, how will i then update? | 22:12 |
|
| git pull? | 22:12 |
|
osse
| yes | 22:12 |
| ← StuartMI left | 22:12 |
|
cortexman
| nice | 22:12 |
| ← DeJoker left | 22:12 |
| → mycyber joined | 22:12 |
| ← netcarver left | 22:13 |
| → StuartMI joined | 22:13 |
|
osse
| but this requires some manual steps to set up. maybe the android repo tool is better in this regard | 22:13 |
| ← b1tchcakes left | 22:13 |
|
cortexman
| if i could set up the meta repository such that users just type repo init, etc, that would be ideal | 22:13 |
| ← Ineentho[m] left | 22:14 |
| ← Ravana left | 22:14 |
| → vassagus_ joined | 22:14 |
| ← adron left | 22:14 |
|
osse
| that's not happening with vanilla git | 22:14 |
| → adron joined | 22:14 |
| ← pioiytr left | 22:14 |
|
osse
| but you could put a script in the outer repo that will set things up after they clone it | 22:15 |
| ← vassagus left | 22:15 |
| ← cd-rum_ left | 22:15 |
| ← darkbit left | 22:16 |
| → cagomez joined | 22:17 |
| → Ravana joined | 22:17 |
| ← zumba_addict left | 22:18 |
| ← evanvarvell left | 22:19 |
| → Ineentho[m] joined | 22:20 |
| ← jaafar left | 22:20 |
| → jaafar joined | 22:21 |
| ← perlpilot left | 22:22 |
| → perlpilot joined | 22:23 |
| ← macivy left | 22:23 |
| → cdg_ joined | 22:24 |
| ← veilig2000 left | 22:24 |
| ← cdg left | 22:25 |
| ← Shakeel__ left | 22:25 |
| ← nettoweb left | 22:25 |
| → ahr3n joined | 22:26 |
| → cd-rum joined | 22:26 |
| → Shakeel_ joined | 22:26 |
| → nettoweb joined | 22:29 |
| → boombatower joined | 22:29 |
| → thiago_ joined | 22:29 |
| ← cd-rum left | 22:31 |
| ← dhollinger left | 22:31 |
| → madewokherd joined | 22:34 |
| ← artemisart left | 22:34 |
| → artemisart1 joined | 22:35 |
| ← l4v2 left | 22:36 |
| → cjohnson joined | 22:37 |
|
cjohnson
| When I make a new branch and git push origin newbranch | 22:37 |
|
| I always have to come back and --set-upstream-to | 22:37 |
|
| How can I tell git to be smarter about that? | 22:37 |
|
osse
| cjohnson: use -u the first time you push | 22:38 |
| → mingrammer joined | 22:38 |
|
osse
| -u = --set-upstream | 22:38 |
|
cjohnson
| sweet. is there also a shorthand to say "use the same branch name on remote"? | 22:38 |
|
osse
| yes. you're already using it | 22:38 |
|
| git push origin newbranch is the same as git push origin newbranch:newbranch | 22:39 |
|
| for something even shorter and/or general I think git push origin HEAD will work | 22:39 |
|
cjohnson
| Oh I guess I mean, even shorterhand to say "use the current branch" | 22:39 |
|
| gotchya | 22:39 |
| ← paul424 left | 22:39 |
| → cd-rum joined | 22:40 |
|
osse
| git config alias.topkek 'push -u origin HEAD' | 22:40 |
|
| then git topkek | 22:40 |
|
| \o/ | 22:40 |
| → red_ joined | 22:41 |
| ← kpease left | 22:41 |
| → b1tchcakes joined | 22:42 |
| → cd-rum_ joined | 22:43 |
| → Spec-Chum joined | 22:43 |
| ← mingrammer left | 22:43 |
|
NightStrike
| I have a commit that has changes from 2 files... it's supposed to be 2 commits one for each file... how do I split that? | 22:43 |
| ← thiago_ left | 22:43 |
| ← cd-rum left | 22:44 |
| → mingrammer joined | 22:45 |
| → garethdaine joined | 22:45 |
| → l4v2 joined | 22:45 |
|
nedbat
| NightStrike: is it the latest commit on your current branch? | 22:46 |
|
NightStrike
| yeah | 22:47 |
|
osse
| git reset HEAD~; git add file; git commit; git add file2; git commit | 22:47 |
|
NightStrike
| osse: thanks! | 22:48 |
| ← dsdeiz_ left | 22:49 |
| ← mingrammer left | 22:49 |
| ← crayon left | 22:50 |
| ← ahmed_elgabri left | 22:50 |
| ← Orion3k left | 22:51 |
| → le_melomane joined | 22:53 |
| ← mr_quincy left | 22:53 |
| → Orion3k joined | 22:54 |
| → rkazak joined | 22:55 |
| → Derperperd joined | 22:56 |
| ← FuzzySockets left | 22:56 |
| ← red_ left | 22:56 |
| ← adron left | 22:57 |
| → adron joined | 22:57 |
| → crayon joined | 22:58 |
| ← thibaultcha left | 22:58 |
| ← cortexman left | 22:58 |
| ← bartosz_ left | 22:59 |
| ← jimi_ left | 22:59 |
| ← crayon left | 22:59 |
| ← alansaul left | 23:00 |
| → crayon joined | 23:01 |
| → Rodya_ joined | 23:01 |
| ← crayon left | 23:01 |
| ← SonikBoom left | 23:01 |
| ← CheckDavid left | 23:03 |
| ← l4v2 left | 23:03 |
| ← Tobarja left | 23:03 |
| ← ams__ left | 23:04 |
| ← ahr3n left | 23:04 |
| → crayon joined | 23:04 |
| ← cagomez left | 23:05 |
| ← Finnoloid left | 23:07 |
| ← artemisart1 left | 23:07 |
| ← xaa left | 23:08 |
| ← crayon left | 23:09 |
| → crayon joined | 23:09 |
| ← LionsMane left | 23:09 |
| ← nwkj86 left | 23:09 |
| → rwb joined | 23:10 |
| ← mycyber left | 23:10 |
| → red_ joined | 23:13 |
| → liamonade joined | 23:13 |
|
yitz
| After a `git fetch origin master` how do I see the diff between local HEAD and origin/master/HEAD ? | 23:13 |
| → zivester joined | 23:13 |
|
osse
| git diff HEAD origin/master | 23:14 |
| ← GenZai left | 23:15 |
|
osse
| origin/master/HEAD isn't a thing | 23:15 |
|
yitz
| That command is showing no output >.> | 23:16 |
|
osse
| Then there are no differences | 23:17 |
| → ljc joined | 23:17 |
|
yitz
| But `git fetch origin master` showed: remote: Total 31 (delta 20), reused 16 (delta 9) | 23:17 |
|
osse
| It probably fetched more than just master | 23:18 |
| → timewalker joined | 23:18 |
| ← ljc left | 23:19 |
| ← dodobrain left | 23:20 |
| → dodobrain joined | 23:20 |
| ← Rodya_ left | 23:20 |
| ← al-damiri left | 23:20 |
| → kn-928 joined | 23:21 |
| ← saedelaere left | 23:26 |
| ← rahtgaz left | 23:29 |
| → dsdeiz joined | 23:29 |
| ← dsdeiz left | 23:29 |
| → dsdeiz joined | 23:29 |
| → alansaul joined | 23:30 |
| ← alansaul left | 23:31 |
| → alansaul joined | 23:31 |
| ← adron left | 23:33 |
| → JanC_ joined | 23:35 |
| ← JanC left | 23:36 |
| ← vassagus_ left | 23:36 |
| JanC_ → JanC | 23:36 |
| ← Derperperd left | 23:38 |
| → vassagus joined | 23:38 |
| → mablae_ joined | 23:39 |
| → Derperperd joined | 23:39 |
| → nilg joined | 23:40 |
| ← dmto left | 23:40 |
| → _sjs joined | 23:42 |
| → AbstractArtist joined | 23:42 |
| ← mablae left | 23:43 |
| ← garethdaine left | 23:43 |
| → afuentes joined | 23:44 |
| → ahr3n joined | 23:46 |
| ← cdg_ left | 23:47 |
| → cdg joined | 23:47 |
| ← a3Dman left | 23:50 |
| → RustyShackleford joined | 23:52 |
| ← cdg left | 23:53 |
| → kulyzu joined | 23:53 |
| ← kulyzu left | 23:53 |
| → a3Dman joined | 23:53 |
| → kulyzu joined | 23:53 |
| ← Spec-Chum left | 23:54 |
| ← foist left | 23:54 |
| ← nilg left | 23:54 |
| → Spec-Chum joined | 23:54 |
| ← Thorn__ left | 23:54 |
| ← mellernoia left | 23:56 |
| ← pcre_ left | 23:57 |
| ← Ahmed90 left | 23:58 |
| ← kulyzu left | 23:59 |