Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-09

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

All times shown according to UTC.

Time Nick Message
00:00 preaction Wulf: you can use git format-patch and git am
00:00 peterpp no need to defend git
00:00 peterpp my team member and I did not make the same commit, we were working on totally separate things
00:00 preaction Wulf: you could also add one as a remote of the other and use cherry-pick
00:01 preaction peterpp: then it's the other thing i said: one of you rebased and the author of the commit got reset (or bitbucket decided to report the "committed by" instead of the "authored by" on its website)
00:01 cdown joined #git
00:01 peterpp then why does my log diverge from what bitbucket reports?
00:02 matsaman if a clone from bitbucket diverges, it's because bitbucket is flawed, as suggested
00:02 preaction because you haven't pulled from bitbucket yet to resolve the conflict
00:02 belak peterpp: I'm fairly certain we just display what comes from the Author field in git-log
00:02 belak Er, that was for preaction
00:03 preaction i mean, it doesn't matter to me
00:03 peterpp belak, do you work at bitbucket?
00:03 cdg_ joined #git
00:03 belak Yes
00:03 spacelord_ joined #git
00:03 preaction peterpp: so i'd explain to your coworker to not be rewriting public history, because that's incredibly rude and is going to cause you problems when you try to merge with upstream now
00:03 belak We don't mangle commits on the backend
00:04 preaction how could you and still have anything work?
00:04 matsaman think he means incorrectly mangle =P
00:04 peterpp my team member is even more ignorant than me when it comes to git, and only ever presses the pull and push buttons in his ui
00:04 Wulf preaction: excellent, format-patch + am worked. Thank you!
00:04 peterpp he would never rewrite the history
00:05 matsaman peterpp: if he's using a UI, it's hard to imagine he wouldn't rewrite history =)
00:05 preaction peterpp: _someone_ did
00:05 belak You can use branch permissions to protect branches to ensure they don't get rewritten
00:05 belak They may have changed the name of that, but I'm fairly certain it's an option
00:05 matsaman I use fire employees for that instead
00:05 peterpp belak, inside the repo settings on bitbucket?
00:05 peterpp I'll be sure to check it out
00:06 om_henners joined #git
00:06 belak Orrr, maybe not
00:06 belak >_<
00:06 belak Darn it, I guess we changed that... sorry for the false hope
00:06 peterpp matsaman, I don't understand your comment about ui users rewriting the history
00:07 peterpp belak, too bad
00:07 matsaman (trivially) tongue-in-cheek reference to GUI users being lost in the tall grass all the time
00:07 matsaman =D
00:07 peterpp matsaman, also I can't fire him, only he can fire me ;-)
00:07 belak peterpp: feel free to PM me your repo name and I can see if there's any more info
00:07 preaction if, for example, there's a "conflict resolver" in the ui that does something terrible like "rebase remote onto my local"
00:07 matsaman peterpp: gross
00:08 sobersabre_ joined #git
00:08 belak Ah, I see what we did for our repos... we used branch permissions to disallow people from pushing to that branch directly... and everything needs to be done through a pull request
00:08 matoro joined #git
00:09 belak So, people can still merge through a pull request, but it won't let them push rewritten history to the main branch
00:09 matsaman where's the fun in that
00:10 peterpp matsaman, he hired me because he thought I was some kind of git whizz, since I can do `git push` on the command line ;-)
00:10 matsaman peterpp: tale as old as time
00:10 matsaman manager hires someone more qualified to do his work
00:11 matsaman this necessarily requires a manager that isn't qualified to hire someone
00:11 matsaman =D
00:11 Kaisyu joined #git
00:11 matsaman https://en.wikipedia.org/wiki/Peter_principle
00:11 zivester joined #git
00:12 manuelschneid3r joined #git
00:15 peterpp matsaman, interesting, never heard of it before
00:16 matsaman and your nick is even peter!
00:16 matsaman made for your situation
00:16 max____ joined #git
00:17 peterpp oh yeah I didn't even realize ;-)
00:17 peterpp now I'll never forget it
00:17 causasui joined #git
00:17 causasui joined #git
00:18 matsaman that's the real problem isn't it, forgetting
00:18 bebe joined #git
00:22 denimsoft joined #git
00:23 Taikibansei joined #git
00:26 cdg joined #git
00:29 Rodya_ joined #git
00:30 daurnimator joined #git
00:32 sobersabre_ joined #git
00:32 joshszep joined #git
00:32 sobersabre_ joined #git
00:33 dendazen joined #git
00:34 glspi joined #git
00:37 j7k6 joined #git
00:38 menip joined #git
00:42 xaviergmail_ joined #git
00:43 Gsham joined #git
00:47 pur3eval joined #git
00:48 cluelessperson joined #git
00:50 duderonomy joined #git
00:52 nckpz joined #git
00:52 notebox joined #git
00:53 elsevero joined #git
00:54 rnsanchez joined #git
00:55 Lyqyd joined #git
00:57 gugah joined #git
00:57 svm_invictvs joined #git
00:59 Lyqyd joined #git
01:00 nickabbey joined #git
01:01 rivarun joined #git
01:02 gopar joined #git
01:03 mehola joined #git
01:04 elsevero_ joined #git
01:04 mischat joined #git
01:06 glspi hi...google gives me like 5 different commands for this...i have multiple changes to my local project (very basic just 2 .py files)...i want to revert ALL changes i've made lately, since the last time i did 'git pull'...whats the best way to do that? i have no worries of losing any data/files i've changed
01:07 spacelord_ joined #git
01:09 rewt glspi: git reset --hard
01:10 matoro joined #git
01:13 hvxgr joined #git
01:13 j7k6 joined #git
01:13 mikecmpbll joined #git
01:14 madewokherd joined #git
01:15 wiesel joined #git
01:15 Ardethian joined #git
01:16 DolpheenDream joined #git
01:17 glspi thanks
01:17 lektrik joined #git
01:18 Ardethian joined #git
01:20 kulelu88 joined #git
01:20 durham_ joined #git
01:27 Hudu joined #git
01:28 peepsalot joined #git
01:28 JamesBaxter joined #git
01:29 khisanth_ joined #git
01:31 netj joined #git
01:32 cyphase joined #git
01:33 jimi_ joined #git
01:33 brent__ joined #git
01:33 Vinnie_win joined #git
01:34 brent__ joined #git
01:34 Sasazuka_ joined #git
01:45 pandeiro joined #git
01:46 Sasazuka joined #git
01:49 Ardethian\ joined #git
01:50 Ardethian\ joined #git
01:52 memfrob joined #git
01:52 memfrob Greetings lifesavers!
01:55 AustinMatherne joined #git
02:00 gugah joined #git
02:01 Sasazuka joined #git
02:04 kristofferR joined #git
02:04 ozmage joined #git
02:07 ShapeShifter499 joined #git
02:08 Aut0maton joined #git
02:10 elsevero joined #git
02:10 Saturn812 joined #git
02:12 gelei007 joined #git
02:12 Sasazuka joined #git
02:12 rivarun joined #git
02:12 dodobrain joined #git
02:13 Dandelock joined #git
02:13 HandheldPenguin joined #git
02:14 AustinMatherne joined #git
02:15 congdv21 joined #git
02:15 UniFreak joined #git
02:17 hhee joined #git
02:18 sobersabre_ joined #git
02:18 congdv21 hi all, I create private repository on dropbox, but my dropbox is almost full,  how to delete some folder of my repository on dropbox?
02:20 _28_ria joined #git
02:21 arescorpio joined #git
02:21 kadoban dropbox sounds like a truly awful place to have git repositories.
02:21 Sasazuka joined #git
02:21 kadoban Why not use bitbucket or something?
02:21 Ardethian joined #git
02:22 jameser joined #git
02:23 j7k6 joined #git
02:24 congdv21 i think it's easy to set up a private repository on dropbox.
02:24 rewt easy, sure, but it won't work well
02:26 kadoban I wouldn't be surprised if it corrupts repos in edge cases.
02:27 finalbeta joined #git
02:27 Wulf4 joined #git
02:27 joshszep joined #git
02:28 errant_rider joined #git
02:28 _UniFreak joined #git
02:28 errant_rider is there a way to remove an OLD commit from the log?  I want to remove an old commit, but keep all the commits around it(and their records)?
02:29 joshszep joined #git
02:29 _UniFreak joined #git
02:29 errant_rider joined #git
02:29 errant_rider joined #git
02:30 joshszep joined #git
02:31 _UniFreak joined #git
02:33 ismithers joined #git
02:34 ojacobson joined #git
02:35 Vinnie_win_v joined #git
02:36 pur3eval joined #git
02:37 cdg joined #git
02:37 memfrob congdv21, just out of curiosity, what made you choose dropbox?
02:37 j7k6 joined #git
02:38 safe joined #git
02:39 jameser joined #git
02:39 cqi joined #git
02:40 cqi joined #git
02:40 rchavik joined #git
02:41 congdv21 with small project, i think dropbox is easy to set up, and i don't know the best way for set up a private repository.
02:46 errant_rider left #git
02:46 memfrob I mean I suppose someone new to a vcs would think "oh it's just a tool that generates a bunch of files inside a generated folder"
02:46 memfrob congdv21, github is the most user friendly one IMO, you can even set it up and initialize the repo all using a (graphical) web browser so it eases the process.
02:46 raijin joined #git
02:46 Vampire0 joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a bag of wheeee | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | Are you even reading this? Prove it by submitting to https://madeitwor.se/git-jokes
02:49 memfrob I'm surprised that even exists @ ojacobson
02:49 ojacobson _usually_ this'll manifest as lost writes to refs, or missing objects
02:49 memfrob the dropbox/git bridge
02:49 ojacobson _occasionally_ it'll manifest as "welp an entire pack didn't sync"
02:49 memfrob Amazing what people write on their free time XD
02:49 ojacobson Yeah, I'm wih kadoban on this
02:49 ojacobson use github/rhodecode/bitbucket/whatever
02:49 ojacobson or a unix box and gitolite
02:50 memfrob kadoban was actually against my idea of using github because it costs money, so you're actually with me on this :P
02:50 ojacobson Sure, fair enough
02:50 thiago joined #git
02:51 kadoban Well, github does charge for private ones, yes, but github *far* from the only place to have repos, even if you don't want to set up gitolite yourself.
02:51 ojacobson Here's a better writeup of dropbox eating a repo https://edinburghhacklab.com/2012/11/when-git-on-dropbox-conflicts-no-problem/
02:52 ojacobson The sync conflicts are probably fixable by manually renaming the right files, but knowing which ones are "right" requires an uncomfortable degree of familiarity with git's on-disk data structures
02:52 jameser joined #git
02:52 Ardethian\ joined #git
02:52 jstimm joined #git
02:52 ojacobson "In the rare event of a collision (its never happened to me), git will stop working. " is not a conclusion that fills me with joy
02:54 llamapixel gitlab has free private but a sys admin will randomly delete it all :P
02:54 kadoban So the thing breaks, and the conclusion is that it's safe? Wtf.
02:54 kadoban The internet is a fucking bizarre place.
02:54 llamapixel https://about.gitlab.com/2017/02/01/gitlab-dot-com-database-incident/
02:55 ojacobson breaks in a data-preserving way is, admittedly, better than breaks in a data-destroying way
02:55 kadoban True
02:55 ojacobson however "it can be fixed" and "it's still usable" are also quite different
02:55 atomi joined #git
02:56 aavrug joined #git
02:56 pks joined #git
02:57 cagmz joined #git
02:57 bremner iirc, actual repos were not deleted on gitlab, just fluff like tickets and PRs
02:57 hahuang61 joined #git
02:57 memfrob I'm assuming this is the only IRC channel where we can say "fuck" without receiving a lecture on how bad it is to say that XD
02:58 mar77i_ joined #git
02:58 memfrob Good lord I've been banned from so many channels for foul language.
02:58 UTAN_dev joined #git
02:58 bremner no, it's not the only one. OTOH, if all you say is fuck you might still get banned for being boring
02:58 llamapixel aye
02:58 puff` joined #git
02:58 aavrug joined #git
02:58 memfrob rofl!
02:58 llamapixel foul mind, language, code
02:58 fstd_ joined #git
02:59 d^sh joined #git
02:59 MajorPay1e joined #git
02:59 ojacobson Oh, we'll happily ban you for foul language
02:59 llamapixel Anger bad commits into the skull jelly server.
02:59 danmackay joined #git
02:59 ojacobson it's just that our definition of foul is more like racism and sexism, rather than anglo-saxon cursing
03:00 ojacobson You can say "fuck" all you want, just don't tell us you believe some genders are more suited to programming than others and we'll get along fine :)
03:00 amagawdd joined #git
03:00 dermoth joined #git
03:00 notebox joined #git
03:01 EisNerd joined #git
03:01 moritz joined #git
03:01 memfrob I'm not racist or sexist, former LGBT activist actually, but once they added the Q I budded out.
03:01 llamapixel stick to GIT chat
03:01 ojdo joined #git
03:02 memfrob Possible to get a git log of a specific line of a file?
03:02 kadoban Nobody is really that strict about the topic, as long as you're not drowning out actual on-topic conversation or being annoying.
03:02 memfrob Text string, rather.
03:03 kadoban Maybe you're looking for -G or -S in git log? Doesn't sound quite like the first question, but maybe.
03:04 ozmage joined #git
03:04 dsantiago joined #git
03:04 Dandelock joined #git
03:04 AKPWD joined #git
03:05 AlgorithmWizard joined #git
03:05 NvpkD1y7Ez joined #git
03:05 sparetire joined #git
03:05 jab416171 joined #git
03:05 bipolar joined #git
03:05 matoro joined #git
03:06 njbair joined #git
03:06 kasual joined #git
03:07 TooLmaN joined #git
03:07 rizonz joined #git
03:07 rivarun joined #git
03:09 gnarf joined #git
03:10 brendyn joined #git
03:11 AustinMatherne joined #git
03:11 theoceaniscool joined #git
03:11 jwest joined #git
03:11 nckpz joined #git
03:11 drawkula joined #git
03:11 razorback joined #git
03:13 memfrob Had no idea you could pass arguments to git log, -S helped me find it, thanks!
03:13 chachasmooth joined #git
03:14 Arokh joined #git
03:15 kadoban Oh ya, git log has ridiculously helpful arguments.
03:15 mischat joined #git
03:17 sarbs joined #git
03:17 Vortex34 joined #git
03:18 watabou joined #git
03:18 nd joined #git
03:19 razorback I need a sanity check. I have a coworker that insists the "master" branch of a repo on github is the "gh-pages" branch. It's his way of keeping "gh-pages" always up to date. He argues that we may forget to push to "gh-pages"  and it won't always be in sync. The project itself is a small front end boilerplate used internally. Has anyone come across this before in other repos ?
03:20 ojacobson razorback: That's more of a #github question but, in short, uhhhhhh
03:20 ojacobson You can do it that way, I guess, if the project is appropriate for publishing via github pages as-is
03:21 razorback Yeah you're right but thank you for your response.
03:22 razorback Is there a way to sync a branch if another one is pushed to ?
03:22 ojacobson no
03:23 ojacobson not on github, anyways - in git you could do it with a hook
03:23 ojacobson or make the second branch an alias of the first using symbolic refs, I guess
03:24 Ardethian joined #git
03:25 razorback Ok, thanks. That is something I'm going to look into.
03:25 razorback It just feels weird that it's not on master.
03:25 j7k6 joined #git
03:25 j7k6 joined #git
03:26 solenodic joined #git
03:27 kadoban That the default branch isn't master? Ya, it's uncommon, but ... I actually kind of prefer it. I get a bit tired of guessing what 'master' means with no context.
03:27 jimsio joined #git
03:27 razorback Yes, the default branch is "gh-pages".
03:27 kadoban Not that a random other branch name tells you either, but at least then you're not expected to know
03:30 inflames joined #git
03:30 razorback I always thought that "master", especially on github, implied that it is the production ready branch.
03:30 ojacobson It really depends on workflow
03:30 ojacobson all _git_ means is "this is the default name of the default branch"
03:31 dreiss joined #git
03:32 basiclaser joined #git
03:32 razorback To be honest, I'm not entirely sure if "gh-pages" is the default branch. It's just the one we push to lol
03:32 kadoban It's usually either the "production" branch or the dev branch, it seems. Which is only two real possibilities I guess, but ... they're vastly different.
03:33 pandeiro joined #git
03:35 k_sze[work] joined #git
03:35 Arokh joined #git
03:35 rivarun joined #git
03:36 jwest joined #git
03:37 pur3eval joined #git
03:37 brendyn joined #git
03:38 razorback We also had a discussion about semantic versioning. A little back story, we're building a components library for this project. After we're finished with all the pull requests we will tag "gh-pages" as a major release. After we tag it, from now on out if we ever push to "gh-pages" we would have to tag with a minor release. Have you guys/gals ever come across this type of workflow?
03:39 sunri5e joined #git
03:43 UniFreak joined #git
03:44 MrWoohoo joined #git
03:45 jon-mac joined #git
03:46 Phenix joined #git
03:48 hexagoxel joined #git
03:55 Ardethian\ joined #git
03:57 matoro joined #git
04:00 shinnya joined #git
04:01 snits joined #git
04:06 sorressean joined #git
04:06 sorressean I wish to clone a git repo into a current dir where I have my project so I can just add files, but it refuses to clone into a dir with stuff in it. any way around this?
04:07 dmc joined #git
04:07 kadoban Clone to an empty dir, copy in your files and then whatever.
04:07 a_thakur joined #git
04:08 gelei007 joined #git
04:09 xall joined #git
04:09 sorressean I need the files to remain where they are, though
04:10 kadoban move the dir back afterwards then?
04:10 kadoban Or is this some deployment nonsense?
04:11 sorressean kadoban:  It's part of a larger project so I need to keep the dir where it's at or things will brea.
04:11 sorressean break*
04:12 kadoban Even if you move it temporarily?
04:14 gfixler joined #git
04:14 navidr joined #git
04:16 patarr joined #git
04:17 mischat joined #git
04:17 memfrob What's the proper syntax for git format-patch of <commit> to HEAD? git format-patch -k <commit id> HEAD -o ../<dir> ?
04:18 memfrob or is <commit id> after HEAD or after -o or what?
04:19 memfrob The only way I've been getting it to work is using HEAD~<var> but I'm getting tired of counting because my commit history is building.
04:26 j7k6 joined #git
04:27 Ardethian joined #git
04:27 sobersabre joined #git
04:27 ajd left #git
04:27 Aut0maton joined #git
04:28 chriskos joined #git
04:29 amagawdd joined #git
04:30 govg joined #git
04:31 platzhirsch joined #git
04:32 platzhirsch I use git submodule update --init --remote --rebase to set up my git submodules and fetch master, that usually works, when there is a remote change and it rebases it still ends up in a headless satte
04:32 platzhirsch state
04:32 platzhirsch is there a way to avoid that?
04:33 Aut0maton joined #git
04:34 Jarrah[m] joined #git
04:36 robotroll joined #git
04:36 Emperor_Earth joined #git
04:38 j7k6 joined #git
04:38 Cabanoss- joined #git
04:39 _28_ria joined #git
04:39 mehola joined #git
04:42 LordRyan joined #git
04:45 rivarun joined #git
04:47 aidalgol joined #git
04:48 ShekharReddy joined #git
04:52 memfrob sorressean, will making a symlink work?
04:53 pur3eval joined #git
04:54 memfrob platzhirsch, maybe try doing it in steps? i.e. try avoiding several flags at once?
04:55 sargentmki joined #git
04:55 xall joined #git
04:58 memfrob ah looks like git format-patch <commit id> -k -o <dir> will work fine according to what i could find online.
04:58 Ardethian\ joined #git
04:59 CEnnis91 joined #git
04:59 memfrob Say the commit id of HEAD~5 is bob123, throughout all of git and it's commands and option parsing, is HEAD~5 and <commit id> always interchangeable?
04:59 memfrob i.e. Will git always accept either HEAD~5 or bob123, and will it's behavior change at all based on which one is used?
05:00 platzhirsch memfrob: I think it's because they were all set up without tracking branch
05:00 memfrob platzhirsch, that would make sense
05:01 memfrob Now how to fix that, I'm not sure. I have not run into a problem yet running into headless states and unable to track stuff.
05:02 platzhirsch memfrob: you can add the branch in the .gitmodules file
05:02 MaekSo_ left #git
05:02 memfrob Eeek, modifying .git files directly?
05:02 Derperperd joined #git
05:03 MaekSo joined #git
05:03 memfrob My way is to always back up all my work, commits, patches, etc to an external non-git directory so I can always recover with ease without being a git guru :P
05:04 memfrob So even if .git is permanently gone, corrupted, whatever, I can reclone and reapply all my work effortlessly with git am. Been pretty failsafe so far.
05:05 jameser joined #git
05:05 memfrob Yes! git format-patch worked flawlessly, 44 files all in order!
05:06 LordRyan joined #git
05:08 Goplat joined #git
05:10 gelei007 joined #git
05:11 arup_r joined #git
05:11 gelei007 joined #git
05:11 DaveTaboola joined #git
05:11 NimeshNeema joined #git
05:12 rscata joined #git
05:13 arup_r hi I am getting this CONFLICT message "CONFLICT (modify/delete): config/puma.rb deleted in master and modified in HEAD. Version HEAD of config/puma.rb left in tree." but if I open the file, then there is no conflict *markers*. Any help how to resolve this?  https://gist.github.com/aruprakshit/b0327985ab20cd510873166f3157c6e9
05:14 Guest9 joined #git
05:15 memfrob Because there are no conflicting LINES, but rather files.
05:15 kadoban arup_r: Read what it says. The file was completely deleted in one side, and modified in the other. There's no conflict markers to add, it'd just be the whole file.
05:15 memfrob HA! I beat you!
05:16 kadoban arup_r: You need to decide if you want it as-is or gone, essentially.
05:16 staafl joined #git
05:16 pmyjavec joined #git
05:16 memfrob arup_r, try rebasing your commit upon the latest commit in master? Maybe you haven't ran git pull in awhile?
05:17 memfrob Perhaps the patch you downloaded was based off of an old commit and you yourself need to port it to the newest version?
05:17 memfrob (if one isn't available)
05:17 dreiss joined #git
05:17 arup_r kadoban: ok so what I have is fine... so I can just commit and push. that will be fine. right?
05:17 mischat joined #git
05:18 pmyjavec Hey all, does signing commits with via GPG have any impact on other developers working in the same project, the section at the end of https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work kind of confuses me
05:18 memfrob You want to add config/puma.rb to the tree?
05:18 arup_r yes
05:18 memfrob git add -A
05:18 arup_r cool
05:18 kadoban arup_r: You probably have to add it first, then yes.
05:18 arup_r thanks kadoban and memfrob
05:18 memfrob yee boiiii
05:18 Doginal joined #git
05:19 memfrob arup_r, no problem. I'm a bit of a git nub but I'm getting better thanks to these guys.
05:19 pmyjavec Does that mean everyone will have to have my public key available to re-write history or something (makes no sense really)
05:19 kadoban pmyjavec: It doesn't really bother other people in any way I've seen. If they want to they can verify your signatures, but they're not required to or anything.
05:19 memfrob I'm here a lot btw.
05:19 kadoban pmyjavec: No
05:19 pmyjavec kadoban: cool, that sounds correct to me, that section of the documentation is a little confusing
05:19 staafl Does anyone  know if Git's diff algorithm only uses unchanged lines for matching or can it detect small changes on a line and figure out it corresponds to the same line?
05:20 phroa pmyjavec: Though when history is rewritten the commits become unsigned unless you are the one rewriting.
05:20 memfrob staafl, git diff catches everything, even file permissions changes, new lines, whitespace, you name it.
05:20 phroa (actually, they still do, you have to go in and sign them later)
05:20 memfrob I have yet to see something that git diff hasn't been able to catch :P even unicode/non-ASCII changes.
05:20 staafl memfrob, my question was about the procedure of the algorithm :-)
05:21 pmyjavec phroa: so my commits remained signed?
05:21 memfrob it detects small changes on a line and figures out how it corresponds to the same line
05:21 staafl Let me rephrase it: does it do a simple "longest common subsequence" of lines between the two files and then calculate the diff according to that, or does it try to be smarter
05:21 phroa no, you need to sign each one after editing history.  I regret saying that now because I'm in "well maybe there's a better way I don't know about" territory
05:22 memfrob "longest common subsequence" i believe, that's what the "fuzz" is there for.
05:22 memfrob More fuzz, the longer the "longest common subsequence"
05:22 memfrob kind of, as "fuzz" factors in lines that don't match at all.
05:23 memfrob hence fuzz 1, fuzz 2, etc.
05:23 memfrob I'm pretty sure it's the first one though.
05:24 ayogi joined #git
05:24 sbulage joined #git
05:25 staafl memfrob, what does "fuzz" mean in this context? :-)
05:26 fletom joined #git
05:27 Gsham joined #git
05:27 j7k6 joined #git
05:28 staafl memfrob, nevermind, found it in the diff manpage - thanks :-)
05:28 memfrob Say you have 3 lines that match, but after the 3 lines is a line that doesn't exist in the previous version, that'd be fuzz, as it's a line that git sees in one revision but not another. git diff by default factors in 3 lines outside the actual diff.
05:28 ShapeShifter499 joined #git
05:30 Ardethian joined #git
05:30 ayogi i hello guys, i have one question is there a way i can reduce the size of repository, i have a git repo it contains multiple branches
05:31 memfrob like delete a branch?
05:31 grawity how large is the repo anyway?
05:31 grawity when cloning that is
05:31 ayogi i have separate folders for each branch acting as sandbox, but each folder contains all the branches
05:31 * memfrob 's head explodes by that statement
05:32 ayogi it is around 8gb
05:32 grawity huh
05:32 grawity what sort of stuff do you keep in there
05:32 memfrob I'd need a picture / flowchart for that one XD
05:32 grawity does it have to be kept in Git in the first place?
05:33 memfrob grawity, aren't you from #defocus ?
05:33 ayogi sorry it is 342 mb
05:33 ayogi i calculated it wrong
05:34 memfrob I'd say so!
05:34 ayogi so master is 342 mb
05:34 grawity the only size that really matters is what it takes for new developers to `git clone` the repo
05:34 ayogi and i want other folders to have just particular branch
05:34 grawity there's `git clone --single-branch` for that
05:35 ayogi but i already have cloned using "git clone"
05:35 ayogi now is there a way i can delete unused branched from each folder, so that i can reduce the disk usage
05:36 grawity git branch -d, git gc --aggressive
05:36 grawity actually maybe consider using a) shared clones with `git clone --reference=~/masterrepo`, or b) shared repos with `git worktree`
05:36 grawity that'd save a lot more space
05:37 ayogi grawity: sorry but i am not getting what you are suggesting
05:39 memfrob Is this a bug? git rebase -i <commit> lets me edit only the commits AFTER <commit> not <commit> itself
05:39 memfrob For that I need to do git rebase -i <commit before the commit I want to edit>
05:40 memfrob git rebase -i <commit> opens a text editor which lets me choose to edit any commit after the one I selected. :/
05:41 memfrob So I need to automatically one-up git which is kind of bogus, no?
05:42 grawity memfrob: that's normal for `git rebase` in general
05:43 memfrob Why is it normal? If I'm rebasing to a commit, that commit should be HEAD, not the one after it.
05:43 grawity don't forget -i is just sort of "manual mode" of the general rebase tool
05:43 grawity the main purpose of `git rebase` is still to reapply the current branch on top of new upstream
05:43 sargentmki joined #git
05:43 memfrob Otherwise git rebase is just fooling you, thinking you're rebasing to that commit but you're actually only able to rebase to the ones after it. Why would anyone want this??
05:44 grawity so when you're rebasing a branch over itself, well, I'd say *you're* fooling itself by thinking it was made to be a branch editing tool foremost
05:44 grawity fooling yourself*
05:44 raijin joined #git
05:45 memfrob Well there is no other branch editing tool, is there?
05:45 memfrob I was told that's the only way XD
05:45 grawity that still doesn't retroactively make `git rebase` a dedicated branch editing tool
05:45 grawity it's a rebase tool that happens to have interactive mode
05:45 grawity to which things like upstream and --onto still apply
05:46 memfrob git commit --amend <commit> would be nice..
05:47 grawity and when one does `git rebase X`, a regular rebase never touches commit X itself, it only replays your branch *on top* of that commit; and -i is still the same process
05:47 grawity that said,
05:47 sobersabre_ joined #git
05:48 grawity for certain kinds of edits there's `git replace --edit` followed by `git filter-branch`
05:49 ngm joined #git
05:49 ojacobson_ joined #git
05:51 ojacobson joined #git
05:51 ^7heo joined #git
05:52 ojacobson joined #git
05:53 MrMojit01 joined #git
05:55 MineCoins joined #git
05:57 hahuang61 joined #git
06:01 Ardethian\ joined #git
06:04 sargentmki joined #git
06:06 Guest82 joined #git
06:06 Bizkit joined #git
06:07 dec0n joined #git
06:07 dsdeiz hey all so i have like foo and Foo directories in the same location.. it there a way i could move the contents of 'Foo' inside of 'foo'?
06:09 shgysk8zer0_ joined #git
06:11 jstimm joined #git
06:11 gelei007 joined #git
06:12 safe joined #git
06:14 snits` joined #git
06:14 jameser joined #git
06:17 patarr joined #git
06:18 ^7heo joined #git
06:18 mischat joined #git
06:23 mda1_ joined #git
06:23 pur3eval joined #git
06:25 dsdeiz i am on osx as well
06:28 j7k6 joined #git
06:29 b1tchcak_ joined #git
06:29 sharon_so_ joined #git
06:30 zifnab_ joined #git
06:30 stoopkid_ joined #git
06:30 martin_g_ joined #git
06:30 aendrew_ joined #git
06:30 moop_ joined #git
06:30 eshlox_ joined #git
06:30 aleb_ joined #git
06:30 jameser joined #git
06:31 mroth_ joined #git
06:31 cloudcell__ joined #git
06:31 Ferris___ joined #git
06:31 pfg_ joined #git
06:31 fmeerkoetter_ joined #git
06:31 stevenxl_ joined #git
06:31 adambrenecki_ joined #git
06:32 nickabbey joined #git
06:32 runlevl4 joined #git
06:32 msm joined #git
06:32 EisNerd_ joined #git
06:32 Mathiasdm joined #git
06:32 hvxgr_ joined #git
06:32 Boniche- joined #git
06:32 cata__ joined #git
06:33 Ardethian joined #git
06:33 Grum joined #git
06:33 JelmerD joined #git
06:33 moritz joined #git
06:33 Ramen_ joined #git
06:33 Jarrah[m] joined #git
06:33 Junior joined #git
06:33 ojacobson dsdeiz: Mov `foo` aside, create `Foo` directory, move `foo` from wherever you put it to `Foo/foo`
06:33 albel727 joined #git
06:33 ojacobson then git add --all foo Foo/foo
06:34 BackEndCoder joined #git
06:34 ertes joined #git
06:34 ShapeShifter499 joined #git
06:36 svm_invictvs joined #git
06:36 SebastianFlyte joined #git
06:37 atomi joined #git
06:39 moei joined #git
06:39 j7k6 joined #git
06:39 jknetl joined #git
06:40 raijin joined #git
06:43 Boniche- left #git
06:43 dersand joined #git
06:44 a_thakur joined #git
06:45 jameser joined #git
06:47 qt-x joined #git
06:50 peepsalot joined #git
06:52 ozmage joined #git
06:53 jameser joined #git
06:53 zeroed joined #git
06:53 zeroed joined #git
06:56 sobersabre_ joined #git
06:56 watabou joined #git
06:57 ShalokShalom joined #git
06:58 catsup joined #git
06:58 Raging_Hog joined #git
06:58 hahuang61 joined #git
07:00 tmk joined #git
07:01 bocaneri joined #git
07:01 jameser joined #git
07:02 sargentmki joined #git
07:03 algun joined #git
07:03 Ardethian\ joined #git
07:05 quackgyver joined #git
07:08 jameser joined #git
07:09 Macaveli joined #git
07:10 JeroenT joined #git
07:12 zeroed joined #git
07:13 JeroenT_ joined #git
07:13 ihradek joined #git
07:13 chele joined #git
07:15 memfrob rebootin
07:15 lordjancso joined #git
07:15 a_thakur joined #git
07:16 a_thakur joined #git
07:19 gelei007 joined #git
07:19 b100s joined #git
07:20 ozmage joined #git
07:20 mischat joined #git
07:21 danimal2 joined #git
07:21 solenodic joined #git
07:22 masuberu joined #git
07:24 jstimm joined #git
07:24 elect_ joined #git
07:26 jameser joined #git
07:27 done joined #git
07:27 overlord_tm joined #git
07:28 Guest30 joined #git
07:30 j7k6 joined #git
07:30 j7k6_ joined #git
07:34 _UniFreak joined #git
07:35 ozmage joined #git
07:35 sekire joined #git
07:35 JeroenT joined #git
07:35 Hudu joined #git
07:35 Ardethian joined #git
07:35 ozmage joined #git
07:36 gelei007 joined #git
07:36 zefferno joined #git
07:40 freimatz joined #git
07:40 JanC_ joined #git
07:42 watabou joined #git
07:44 JeroenT joined #git
07:45 TomyWork joined #git
07:50 d1z joined #git
07:51 d1z how can I replace the last commit, by this new commit, and make like the last commit never happened?
07:51 Ramen joined #git
07:51 grawity generally `git commit --amend` is what people use
07:52 vuoto joined #git
07:53 Vampire0_ joined #git
07:54 pur3eval joined #git
07:54 j7k6 joined #git
07:57 Snugglebash joined #git
07:57 moritz though only do that if you haven't pushed that commit yet. !rewrite applies
07:57 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
07:58 azerus joined #git
08:00 jnavila joined #git
08:02 xall joined #git
08:02 JeroenT_ joined #git
08:06 Ardethian\ joined #git
08:06 j7k6 joined #git
08:06 Vampire0 joined #git
08:08 jimsio joined #git
08:11 armyriad joined #git
08:13 Balliad joined #git
08:14 _28_ria joined #git
08:14 Murr joined #git
08:15 Mikerhinos joined #git
08:16 ojacobson_ joined #git
08:18 Alienpruts joined #git
08:18 patarr joined #git
08:18 jameser joined #git
08:21 k_sze[work] joined #git
08:22 rivarun joined #git
08:22 gelei007 joined #git
08:25 denisMone joined #git
08:25 _ng joined #git
08:26 Kaisyu joined #git
08:27 pijiu2 joined #git
08:27 mindfart joined #git
08:29 dcpc007 left #git
08:30 jimsio joined #git
08:32 vuoto joined #git
08:33 tilerendering joined #git
08:34 tilerendering I just realized my ubuntu server has lost “gitolite” package after upgrade from 14.04 to 16.04 lts
08:34 cdown joined #git
08:35 JeroenT joined #git
08:36 Balliad joined #git
08:36 tilerendering anyone know how to replace it or repair it? without losing my previously configured repositories?
08:37 Vampire0_ joined #git
08:37 llamapixel tilerendering: http://gitolite.com/gitolite/install.html
08:37 llamapixel I would start there mate.
08:37 Ardethian joined #git
08:38 Dumblez0r joined #git
08:38 tilerendering llamapixel: are you sure this guide will tell me how to save my current gitolite repositories while “repairing”/“upgrading” ?
08:38 tobiasvl sangy: git merge-base branch1 branch2 ?
08:38 soc42 joined #git
08:39 d1z how can I amend two commits back?
08:39 solenodic joined #git
08:39 llamapixel tilerendering:  you could always try it on a new user with a temp project.
08:39 a_thakur joined #git
08:40 tilerendering yeah, but you know… I m a bit tired of “trying” - keeps one busy for weeks for things that can be achieved in 5 minutes.
08:40 tilerendering but thanks for the help
08:40 ShalokShalom_ joined #git
08:41 osse tilerendering: is the gitolite user still there? /home/git or /home/gitolite ?
08:41 tilerendering yes
08:41 tilerendering also, the repos seem still to be there
08:41 tilerendering actually everything
08:41 osse hmm, all the gitolite config is under there too, no? or is there anything in /etc ?
08:41 theoceaniscool joined #git
08:42 tilerendering but my “new” and “shiny” 16.04 ubuntu tells me gitolite is not installed all of a sudden
08:42 osse maybe the package has changed name ?
08:42 tilerendering osse: yes, might be - however, I m not plannign on spending hours on figuring out the internals of gitolite when an upgrade proces should be cleanly updating packages.
08:42 tilerendering and yeah gitolite is not supported anymore it seems
08:42 tilerendering seems one is “forced” now to use gitolite3
08:43 watabou joined #git
08:43 tilerendering which is great, because.. nothing is upgraded and … the admin is not alerted
08:43 tilerendering so you just upgrade and your repos are unreachable all of a sudden.
08:43 tobiasvl sangy: oops, I was scrolled up.
08:43 tilerendering sometimes I ask myself what goes on in the heads of those nerds
08:43 solenodic joined #git
08:44 osse seems like installing gitolite but not doing any setup should work
08:44 osse but I suppose you should ask #ubuntu why they screwed you over
08:44 llamapixel tilerendering:  a user account and repo test doesn’t take weeks
08:45 troulouliou_div2 joined #git
08:45 Tobbi_ joined #git
08:45 llamapixel logic will win anyday over exaggerations ;)
08:45 Doginal joined #git
08:45 Gloomy joined #git
08:46 tilerendering osse: I did. common practice in todays “communities”: 1) “your problem is not the problem. your problem is wrong. your problem is something else.” 2) we didnt break things, you just should have read a 200 page manual for upgrading prior to doing the upgrade. 3) not answer at all.
08:46 tilerendering this mentality doesnt encourage many ppl to actually care about using open source at all anymore
08:47 llamapixel more rant than productive results.
08:47 osse You're frustrated, I can tell. But #git is the wrong place to vent it
08:47 tilerendering if I calculate down the time I invested into fixing things that shouldnt break, or caring about standards that everyone interprets differently, I d been better off with just getting commercial software + commercial supportr (and responsibility) by far
08:47 tilerendering ok
08:47 oskarkv joined #git
08:48 drodger joined #git
08:48 llamapixel how about trying the advice with a new account and a test repo ;) You can be done and back to open source bashing in 10 minutes ;)
08:48 b100s joined #git
08:48 osse and that's why a lot of people do go for commercial support. It's how Red Hat and SUSE makes money
08:49 llamapixel What required you to update ubuntu as well by chance?
08:49 osse seems like "just" installing the new gitolite package and runing 'gitolite setup' will work
08:49 osse according to the docs
08:49 llamapixel Windows update mentality?
08:52 p4trick joined #git
08:54 kurkale6ka joined #git
08:55 DieguezZ joined #git
08:56 Vampire0 joined #git
08:56 borkr joined #git
08:57 howdoi joined #git
08:58 Sadeukko joined #git
08:59 tilerendering osse: nope, actually it wont. it will require a lot of work which I would like to have avoided, if the ubuntu “upgrade” “feature” would have warned me prior to making the “upgrade”...
08:59 tilerendering osse: just look at http://gitolite.com/gitolite/migr.html
09:00 hahuang61 joined #git
09:00 mikecmpbll joined #git
09:01 pmyjavec joined #git
09:01 osse Maybe that's exactly why it's a separate package and not an upgrade
09:01 osse But I agree it's weird there was no notification
09:02 tilerendering osse: it doesnt surprise me at all anymore, tbh
09:02 osse Not sure how the work would be avoided
09:02 tilerendering not at all. it s going to be a days work
09:02 osse Oh I misread
09:03 tilerendering and it’s just one step in an odyssee of steps I am currently performing to just get some basic load tests running.. since days.
09:03 llamapixel A virtual machine next time before upgrading tilerendering ?
09:03 osse Maybe there's a way of reinstalling the old gitolite
09:03 tilerendering llamapixel: indeed. very much indeed. so much indeed. +++indeed.
09:03 llamapixel :)
09:03 redeemed joined #git
09:03 xall joined #git
09:03 tilerendering or even better: dockerization
09:04 tilerendering I just thought the ubuntu upgrade process would be production-proof
09:04 bongjovi joined #git
09:04 tilerendering especially for lts versions.
09:04 tilerendering osse: nope..
09:05 congdv21 joined #git
09:05 jstimm joined #git
09:05 tilerendering osse: actually, instead of performing all of the migration steps I could just set up new repos - would be easier. or even go for a better git repo server package.
09:05 tilerendering but you know - when I serve “package” which such popularity, I d feel somehow committed (to say the least) to making sure upgrade processes are easier than new installations.
09:05 mehola joined #git
09:06 Snugglebash joined #git
09:06 osse what nope? isntalling v2 ?
09:06 llamapixel There is an emergency area on gitolite site. I guess it is a little more than a config install issue. http://gitolite.com/gitolite/gitolite.html#emergencies
09:07 vuoto joined #git
09:08 tilerendering osse: there is only gitolite3 available for 16.04...
09:08 Ardethian\ joined #git
09:09 osse as a package, sure
09:09 tilerendering osse: hm. what are you suggesting?
09:09 llamapixel http://packages.ubuntu.com/precise/vcs/gitolite%20%7C%20http://packages.ubuntu.com/xenial/vcs/gitolite3 a comparison of the packages.
09:10 llamapixel http://packages.ubuntu.com/precise/vcs/gitolite | http://packages.ubuntu.com/xenial/vcs/gitolite3 sorry that got malformed
09:10 dodobrain joined #git
09:11 tmk joined #git
09:11 tilerendering if you read the migration guide, you will see that there is a lot more to “upgrading to gitolite3” than to just install it
09:11 dodobrain joined #git
09:11 tilerendering like: one day of work more to it if unfortunate.
09:12 osse tilerendering: I am suggesting you follow the official isntall isntructions, which involving getting the gitolite source, then checkout the latest v2 tag before running the installs cript
09:12 tilerendering anyhow - any idea how I can virtualize my ubuntu 16.04 easily (transform it into a vm for vmware or virtualbox)
09:12 tilerendering osse: v2 is not available for 16.04 or where did you get that?
09:12 madduck joined #git
09:12 cqi joined #git
09:13 * llamapixel tags out. good luck til m8
09:13 kadoban tilerendering: It's not as much work as you're making it out to be in the *vast* majority of cases. Most of the stuff there is just "this obscure-ish feature changed, in case you were using it"
09:13 osse tilerendering: where I got what?
09:13 osse did you read what I wrote?
09:13 tilerendering osse: youre talking about v2
09:14 tilerendering gitolite v2 right?
09:14 osse yes
09:14 tilerendering but v2 is not available for ubuntu 16.04.
09:14 osse did you read what I wrote
09:14 tilerendering if v2 was available, it would be easy
09:14 tilerendering I did. where did you see it being available?
09:14 osse especially the part about following the official instructions that involve getting the source code?
09:15 tilerendering osse: you mean checking ou the v2 source, compiling it, then installing it?
09:15 nettoweb joined #git
09:15 osse no compiling, it's a perl script
09:15 jstimm joined #git
09:15 JeroenT_ joined #git
09:15 osse the official instructions are: git clone ... && gitolite/install.  My suggestion:   git clone ... && git checkout v2.3.1 && gitolite/install
09:15 drodger joined #git
09:16 tilerendering hm
09:16 osse never mind.
09:16 tilerendering good point
09:16 osse the isntall script doesn't exit
09:16 tilerendering very good point.
09:16 osse surely there must be official docs on how to install v2 somewhere
09:17 mehola joined #git
09:17 osse lol
09:17 osse http://gitolite.com/gitolite/g2/master-toc.html
09:17 cqi joined #git
09:18 osse I retract everything. Upgrade to v3
09:18 Vampire0_ joined #git
09:18 tilerendering osse: theyre really asking for somebody to show up physically and demanding “support” ...
09:19 marcogmonteiro joined #git
09:19 osse sitaram: tilerendering needs your help
09:19 osse there.
09:19 tilerendering osse: yeah. reinstall. recreate repositories. swear. swear again. or look for bteer alternatives - because frankly, I dont want to stay a user of this bunch anymore
09:19 osse then get gitlab. it's much cheaper than github
09:20 grayjoc joined #git
09:20 osse tilerendering: sitaram is the main gitolite dev. he's around sometimes
09:20 llamapixel gitlab sys admins randomly delete all the things ;)
09:20 elsevero joined #git
09:20 tilerendering osse: thank you. but .. I guess I ll look for something better
09:21 tilerendering do you guys know of any good gui-administratable repo software running on ubuntu?
09:21 tilerendering ah
09:21 tilerendering gitlab
09:21 tilerendering will dive into that.
09:22 dminuoso tilerendering: It's all web tools anyway.
09:22 dminuoso And with todays docker it doesn't even matter what kind of server you have.
09:23 dminuoso https://hub.docker.com/r/gitlab/gitlab-ce/ (:
09:23 tilerendering yihah!
09:25 Tobbi_ joined #git
09:25 chriskos joined #git
09:26 Vampire0 joined #git
09:26 _ADN_ joined #git
09:27 tolland joined #git
09:28 zeroed joined #git
09:28 zeroed joined #git
09:29 tolland I made some changes on a branch and my text editor fixed lots of line ending problems and its made the commit look messy. I want to split the changes into 2 commits, the functional change, and then the line ending changes.
09:30 ngm joined #git
09:31 tolland I want to get back to the last commit, so I can do git checkout HEAD~
09:31 Levex joined #git
09:32 tolland to get the previous commit, but I am left with detached head. Is that the best way to do that, really, just exporting the commit to the working directory would be enough to get me to the point where I can just reapply the subset of changes
09:33 osse tolland: git checkout branchname to get back, then git reset HEAD~
09:33 osse this removes the latest commit but not its changes
09:33 osse then use git add (perhaps with -p) selectively
09:33 King_Hual joined #git
09:33 King_Hual joined #git
09:33 DaveTaboola joined #git
09:33 nickabbey joined #git
09:35 nevodka joined #git
09:36 kevleyski joined #git
09:37 miczac\away joined #git
09:38 Endarked joined #git
09:38 hiq[m] joined #git
09:40 Ardethian joined #git
09:40 drodger joined #git
09:42 tolland Thnx!
09:43 pur3eval joined #git
09:43 vuoto joined #git
09:43 Shashikant86 joined #git
09:44 watabou joined #git
09:45 mischat joined #git
09:45 ferr1 joined #git
09:45 jsolano joined #git
09:45 pijiu joined #git
09:47 pijiu joined #git
09:47 rivarun joined #git
09:48 ShapeShifter499 joined #git
09:49 Levex joined #git
09:50 chll_ joined #git
09:50 ocbtec joined #git
09:51 ChiLL_SurF joined #git
09:51 Levex joined #git
09:57 Hudu joined #git
09:58 m1dnight_ joined #git
09:58 rnsanchez joined #git
09:58 Knirch joined #git
10:00 Murr joined #git
10:00 overlord_tm joined #git
10:01 manuelschneid3r joined #git
10:02 achadwick joined #git
10:02 rivarun joined #git
10:05 notebox joined #git
10:05 tvw joined #git
10:07 DaveTaboola joined #git
10:07 Serpent7776 joined #git
10:07 a_thakur joined #git
10:10 JeroenT joined #git
10:10 sea-gull joined #git
10:10 a_thakur joined #git
10:11 finalbeta joined #git
10:11 Ardethian\ joined #git
10:13 Shashikant86 joined #git
10:13 byte512 joined #git
10:15 mda1 joined #git
10:16 ablackack joined #git
10:17 JeroenT joined #git
10:18 zefferno joined #git
10:19 ablackack joined #git
10:19 patarr joined #git
10:20 zeroed joined #git
10:23 ablackack joined #git
10:24 rivarun joined #git
10:26 irqq joined #git
10:27 vuoto joined #git
10:27 nostrora joined #git
10:31 ablackack joined #git
10:32 zeroed joined #git
10:33 lss8 joined #git
10:33 lss8 joined #git
10:34 Keverw joined #git
10:35 JeroenT joined #git
10:36 a_thakur joined #git
10:37 marcogmonteiro joined #git
10:38 bcc joined #git
10:38 bcc joined #git
10:39 afuentes joined #git
10:40 Levex joined #git
10:40 marcogmonteiro joined #git
10:43 Ardethian joined #git
10:45 JeroenT joined #git
10:45 mda1 joined #git
10:46 watabou joined #git
10:46 bcc joined #git
10:46 bcc joined #git
10:48 Ben_1 joined #git
10:48 Ben_1 hi
10:49 mkoskar joined #git
10:49 Ben_1 when I use git log --no-merges does it just filter the empty commit of the merge or all commits that are merged?
10:50 canton7 Ben_1, man git log says "Do not print commits with more than one parent. This is exactly the same as --max-parents=1.", so it looks like it just skips the merge commits themselves
10:50 gitinfo Ben_1: the git-log manpage is available at http://jk.gs/git-log.html
10:50 chriskos joined #git
10:50 canton7 --first-parent would skip the merge commit and the thing which was merged in
10:50 CheckDavid joined #git
10:51 Ben_1 do you know a way to hide the empty commit that just contains the merge message?
10:51 canton7 does '--no-merges' not do that? :P
10:52 Ben_1 it does but it also skips the commits which was merged in or not? :P
10:52 gajus joined #git
10:52 canton7 <canton7> Ben_1, man git log says "Do not print commits with more than one parent. This is exactly the same as --max-parents=1.", so it looks like it just skips the merge commits themselves
10:52 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
10:52 canton7 <canton7> --first-parent would skip the merge commit and the thing which was merged in
10:53 Ben_1 I thought the commits which are merged in have also 2 parents
10:53 canton7 that's wrong
10:53 canton7 only the merge commit itself has two parents
10:53 Ben_1 oh ok thank you :)!
10:54 canton7 :)
10:58 manuelschneid3r joined #git
11:00 DieguezZ joined #git
11:01 JeroenT joined #git
11:01 hahuang61 joined #git
11:02 mischat_ joined #git
11:03 tmk joined #git
11:04 Impaloo joined #git
11:04 elsevero joined #git
11:05 elsevero I’m facing https://gist.github.com/alexszilagyi/9362ab6bcc54d536ec8afcd823353848 and I’ve tried http://stackoverflow.com/a/23749070/850491 but it doesn’t seems to work
11:05 notebox joined #git
11:07 ToBeCloud joined #git
11:09 jnavila joined #git
11:09 Ben_1 left #git
11:14 Ardethian\ joined #git
11:15 theoceaniscool joined #git
11:16 jstimm joined #git
11:16 ac3takwas joined #git
11:17 patarr joined #git
11:18 NimeshNeema joined #git
11:20 Tobbi_ joined #git
11:21 DaveTaboola joined #git
11:23 xall joined #git
11:23 jimi_ joined #git
11:26 lss8 joined #git
11:27 chriskos joined #git
11:28 Levex joined #git
11:29 chipotle joined #git
11:29 PioneerAxon joined #git
11:29 djb-irc joined #git
11:31 gelei007 joined #git
11:32 pur3eval joined #git
11:32 jost_ joined #git
11:32 xdv joined #git
11:32 Anticom joined #git
11:33 zefferno joined #git
11:36 Gloomy joined #git
11:40 sitaram tilerendering: I'm kinda stuck in meetings (all out of town, plus bad connectivity)
11:40 rivarun joined #git
11:40 sitaram tilerendering: what I can suggest is look for packages called "gitolite3" not "gitolite"
11:40 JeroenT joined #git
11:40 sitaram (if you're going the package way)
11:42 sitaram gitolite v3 has been out for more than 5 years; I no longer support v2 unless there is a provable security violation
11:42 sitaram sorry!
11:42 sitaram s/more than 5 years/almost 5 years/
11:43 DolpheenDream joined #git
11:43 _ikke_ time flies
11:43 sitaram indeed
11:43 eblip joined #git
11:43 sitaram time flies.  Hair grays.  Middle grows.  :)
11:44 albel727 joined #git
11:45 _ikke_ haha
11:45 notebox joined #git
11:46 Ardethian joined #git
11:47 watabou joined #git
11:48 adymitruk joined #git
11:49 dsdeiz joined #git
11:49 dsdeiz joined #git
11:51 pietv joined #git
11:52 tilerendering sitaram: errm. I m just frustrated about the seemingly very difficult upgrade process from gitolite to gitolite3. you do neither provide gitolite anymore, nor do you provide an easy migration tool for gitolite to gitolite3, you break working environments without providing for easy escape scenarios, and what’s more, in the ubuntu upgrade process one is not warned about such things
11:52 tilerendering sitaram: tbh - this kind of mentality decourages anyone from using the software itself
11:53 tilerendering I earn my money through it consulting as well and one key premise is: do not break things
11:53 tilerendering (api contracts, apis, working environments, etc.)
11:53 ertesx joined #git
11:53 tilerendering now my repo is broken and I have to live with that - thanks.
11:54 DaveTaboola joined #git
11:54 tilerendering moreover, this was the last step of todays “wth” moments (and last days etc.) with open source software that got me into just writing my own components in the future.
11:55 osse are you talking about the repo(s) that gitolite help you host?
11:55 tilerendering osse: I m talking about the functionality : repo + service
11:55 ShalokShalom joined #git
11:55 tilerendering I m always talking about functaionlity cause in the end this is what creates real value
11:55 tilerendering it doesnt matter what breaks.
11:55 tilerendering and if an upgrade has to be done this way, I say it s a very very bad policy
11:55 osse it matters when figuring out how to fix it
11:55 tilerendering to not offer either of the things I mentioned above
11:56 tilerendering osse: tell me about it - I m very keen on knowing more on IT methodology
11:57 osse no methodology on my part
11:57 tilerendering anyhow, enough said
11:57 osse yes, it's bad etc etc. How to fix it? Depends on what's broken. That's why I asked
11:57 osse e.g. there's a big difference between being unable to host repos and having actual file corruption in the repos
11:58 tilerendering osse: I m currently considering: migrating to gitlab, converting to svn, or getting a commercial github plan
11:58 tilerendering aka as: all the work I spent into configuring gitolite is now gone
11:58 PtxDK joined #git
11:58 tilerendering thanks to a very visionary project owner.
11:59 bremner I think it took me an hour to follow the instructions to upgrade.
11:59 bremner ymmv.
11:59 tilerendering bremmer: with all the medium high and low impact issues quoted?
11:59 bremner yes
11:59 ayogi guys, if i run "git gc --aggressive" on running application directory will it impact performance or something?
11:59 tilerendering an hour - if nothing breaks
11:59 * bremner shrugs
12:00 canton7 how many of the incompatible features actually impact you?
12:00 themill I've got two feature branches being developed in parallel that have both been pushed (and cloned) and I have some bug fixes in one branch that need to land in the other too. Do I cherry-pick or is there some other way to do this?
12:00 tilerendering bremner: hm - first light in sight.
12:01 tilerendering canton7: I ll have to evaluate that, with great joy I will do so.
12:01 ayogi i do not want application or user to know that git is internally doing some cleanup
12:01 ayogi or is there a better way of reducing repo size?
12:02 canton7 tilerendering, bear in mind that *none* of them will affect you unless you're explicitly started using them.
12:02 canton7 s/you're/you've/
12:03 tilerendering canton7: hm. also very good news.
12:03 tilerendering canton7: youre talking about v1 —> v3 right?
12:03 PtxDK joined #git
12:04 canton7 no, v2 -> v3: hadn't clocked you were still on v1. From the migration doc, it looks like migration from v1 and from v2 to v3 are roughly the same, though
12:05 tilerendering canton7: let’s pray so.
12:07 DaveTaboola joined #git
12:07 dec0n joined #git
12:10 Sound joined #git
12:13 sitaram tilerendering: there's a heck of a lot of documentation on migrating from v2 to v3; if there are specific bits in it that are problematic, ask on the mailing list (more reliable than IRC for me when I am travelling)
12:13 sitaram (even if delayed)
12:13 sitaram ubuntu etc, are not in my control
12:14 sitaram the "gitolite3" versus "gitolite" package name thing -- arguably that's my fault.  Gitolite v3 is so different I could not create an auto upgrade reliably
12:14 sitaram (think of it in the same vein as apache2, sqlite3, and so on...
12:14 tilerendering yeah - but letting people use the old gitolite package would have been a thing
12:14 tilerendering I mean it worked for many ppl
12:15 sitaram I never stopped you; sorry there's some misunderstanding here
12:15 sitaram "no support" does not mean "you can't use what is already working for you"
12:15 sitaram (even "no support" is not a hard and fast rule; weekends may be ok for that, but when I am out of town, and so on... tough)
12:15 mischat joined #git
12:15 tilerendering sitaram: hm - so can you confirm that an install from gitolite (v1) repo into ubuntu 16.04 will work without resetting old settings/users/repos?
12:16 sitaram I have to draw the line somewhere, and as I said i'ts been ~ 5 years
12:16 tilerendering yeah understandable
12:16 YuGiOhJCJ joined #git
12:16 overlord_tm joined #git
12:16 Levex joined #git
12:16 Ardethian\ joined #git
12:16 noecc joined #git
12:17 yqt joined #git
12:18 ShalokShalom joined #git
12:18 buzzLightBeer joined #git
12:20 Tobbi joined #git
12:23 eroux joined #git
12:25 troulouliou_div2 joined #git
12:27 cdown joined #git
12:30 mda1_ joined #git
12:33 overlord_tm joined #git
12:33 jimi_ joined #git
12:34 sea-gull joined #git
12:35 krillr joined #git
12:37 theoceaniscool joined #git
12:42 Snugglebash joined #git
12:42 sergi_ joined #git
12:45 sergi_ left #git
12:47 noecc joined #git
12:47 superherointj joined #git
12:47 watabou joined #git
12:48 vuoto joined #git
12:48 superherointj Hello fellows. I'm doing lots of parallels in CI that have 'git push'. When I try to push to remote master. Errors: remote: error: cannot lock ref 'refs/heads/master': is at xxxxx but expected yyyy. How can I solve this and still be able to do parallel pushs?
12:48 Ardethian joined #git
12:51 aliencat joined #git
12:52 aliencat Hey it seems that the gitignore files are not fetched?
12:52 Hudu joined #git
12:52 moritz aliencat: it's the same as with other files; either git tracks them, or not
12:52 moritz if you 'git add .gitignore', commit and push, and the next pull in a different copy of the repo will fetch it
12:54 jameser joined #git
12:54 Snugglebash joined #git
12:56 daivyk joined #git
12:56 a_thakur joined #git
12:58 superherointj joined #git
12:58 superherointj Hi.
13:01 grayjoc joined #git
13:02 re1 joined #git
13:03 cris_ joined #git
13:03 ephimetheus joined #git
13:04 moritz superherointj: hi. I don't tihnk you can reliably push in parallel, from the same repo
13:04 moritz git uses file locking to prevent data corruption, hence the errors you're getting
13:04 moritz why does it need to be in parallel?
13:04 moritz if the local meta data isn't important, you could make copies of the repo, and push to each remote in a separate copy
13:05 albel727 joined #git
13:05 superherointj moritz, because the builds are being processed in parallel. Right now GIT is my bottleneck.
13:05 superherointj What happens is some builds end up simultaneously and the build pipeline errors because of GIT.
13:05 moritz superherointj: but why do you even push at the end of a build?
13:06 superherointj Actually it is a publish operation.
13:06 superherointj Before I do 'npm publish' I need to save new version of package.json. Otherwise other builds will get the wrong version.
13:06 Soliton_ joined #git
13:06 superherointj So far I haven't figured out the right way of doing these things.
13:06 solenodic joined #git
13:06 moritz so collect it as an artifact in your CI/CD system
13:06 moritz and do the publish from there
13:09 superherointj So what you suggest is to do a batch git push?
13:09 ephimetheus joined #git
13:09 superherointj Btw, thanks for answering. I was feeling alone before. Glad you are here. :)
13:10 al-damiri joined #git
13:11 raijin joined #git
13:12 peepsalot joined #git
13:12 cdown joined #git
13:16 superherointj One solution I see would be to force a single version to all packages. What I have is a mono-repository set up. Where I keep several packages/projects in a single GIT repository.
13:19 Ardethian\ joined #git
13:20 [mgv] dudes, its really necessary have git installed to clone repository from gitlab in android studio? or can i clone that only have android studio without git
13:20 pur3eval joined #git
13:21 selckin yes you need git to use git
13:21 MineCoins joined #git
13:21 [mgv] right. thanks selckin
13:21 tobiasvl I think android studio comes with some git stuff
13:21 tobiasvl no idea though
13:21 osse but maybe android studio includes it? I have no idea
13:22 osse lol
13:22 selckin doesn't
13:22 osse the no idea gang
13:22 Soni joined #git
13:22 [mgv] in fact. this make any sense to me. but...
13:22 dave0x6d joined #git
13:23 Soni hi, I'd like to add an URI handler for dcc: protocol, how can I do that?
13:24 canton7 Soni, read man git-remote-helpers ?
13:24 gitinfo Soni: the git-remote-helpers manpage is available at http://jk.gs/git-remote-helpers.html
13:24 Tobbi joined #git
13:25 canton7 Soni, also man git-remote-testgit
13:25 gitinfo Soni: the git-remote-testgit manpage is available at http://jk.gs/git-remote-testgit.html
13:26 mohabaks_ joined #git
13:27 xall joined #git
13:28 localh0st left #git
13:28 Sound joined #git
13:32 mohabaks joined #git
13:33 cyberz joined #git
13:35 Soni should I use a daemon or something for connecting to IRC, to avoid getting banned for (re)connecting too quickly?
13:35 nickabbey joined #git
13:35 rivarun joined #git
13:35 that_linux_guy joined #git
13:35 that_linux_guy left #git
13:35 jeffreylevesque joined #git
13:36 superherointj joined #git
13:40 Snugglebash joined #git
13:42 a3Dman joined #git
13:43 chriskos joined #git
13:43 marcogmonteiro joined #git
13:45 dendazen joined #git
13:47 brent__ joined #git
13:49 watabou joined #git
13:50 Walex Soni: just reconnect manually...
13:51 Soni Walex, I don't feel like integrating with IRC clients...
13:51 Ardethian joined #git
13:55 zeroed joined #git
13:55 zeroed joined #git
13:57 PaulCapestany joined #git
13:59 amagawdd joined #git
13:59 mischat_ joined #git
14:01 Es0teric joined #git
14:01 sevenever joined #git
14:02 jeffreylevesque_ joined #git
14:02 grawity run something like irker and provide DCC-negotiation-as-a-service
14:05 texinwien joined #git
14:06 grawity make it so that I can `git clone dcc://rizoff/#horriblesubs`
14:06 xall joined #git
14:07 sbulage joined #git
14:07 Soni grawity, no channel clones, since that'd lead to conflicts
14:08 Soni channel pushes are fine tho, easier mirroring
14:10 a_thakur joined #git
14:10 tmk joined #git
14:10 jimi_ joined #git
14:11 mohabaks joined #git
14:12 tilerendering I m still hating this unnecessary work so much, I hate it. all my repos are there, everything is there, but hey - let’s break gitolite existing installations…
14:13 Levex joined #git
14:14 _ikke_ Why didn't you stay with ubuntu 14 then? You cannot expect updated distro's to keep maintaining older software..
14:14 Gsham joined #git
14:14 Soni hmm are git hubs that forward git pushes to multiple git servers a thing yet?
14:15 tilerendering sitram : at least tell people where to get the files for the v1 version… this is just *AHHH*
14:15 tilerendering *headdesk* *facepalm* if you need some money, say it. but dont break existing installations like that
14:15 rbj__ joined #git
14:16 rbj__ left #git
14:16 osse the v1 files are in the repo
14:16 _ikke_ tilerendering: He did not break anything
14:17 rbjorklin joined #git
14:17 tilerendering _ikke_: ah yeah - then why are my /usr/share/gitolite commands missing?
14:17 raijin joined #git
14:17 tilerendering why is there no procedure described anywhere for people who want to stick with v1. why is there no way for ppl to just keep their old version
14:17 Tobbi joined #git
14:18 qqx tilerendering: That breakage seems to be attributable to Ubuntu.
14:18 _ikke_ tilerendering: You have to ask Ubuntu, not sitaram
14:18 rbjorklin Hi, what's the right approach when I have local commits on `master` but there are newer commits on `master` upstream? Is `git pull` and the following merge commit the recommended course of action?
14:18 tilerendering qqx, _ikke_ : if sitaram had made the v1 of gitolite still an available ubuntu package for 16.04 this wouldnt have happened.
14:18 osse I just want to ride my horse and carriage. Why did my coachman get a ticket?
14:18 _ikke_ tilerendering: sitaram is not maintaining packages, ubuntu is
14:19 tilerendering _ikke_: are you sure that this is only attributable to ubuntu? I dont think so.
14:19 _ikke_ tilerendering: software changes
14:19 cdleonard joined #git
14:20 _ikke_ you cannot expect everyone to keep maintining all versions of their software
14:21 osse thanks, obama
14:21 tilerendering I m not asking about maintaining
14:21 tilerendering I m asking about leaving the possibility
14:21 tilerendering if you break backwards compatibility, allow for deprecated versions to survive
14:21 * perlpilot is wondering what all this talk of v1 is ... gitolite is at v3 for 5 or so years
14:21 tilerendering this is just making me mad.
14:21 xall_ joined #git
14:22 _ikke_ tilerendering: You used a version of software distributed by ubuntu
14:22 tilerendering perlpilot: hm - strange.
14:22 _ikke_ they packaged it, and they decided to drop it
14:22 Ardethian\ joined #git
14:22 _ikke_ tilerendering: The source is still there
14:22 qqx tilerendering: Nothing prevents using deprecated versions. I have no idea why your Ubuntu upgrade caused the old version to be removed. It likely depended on older versions of some other software.
14:22 DieguezZ joined #git
14:22 ShekharReddy joined #git
14:23 nettoweb joined #git
14:23 qqx And getting it to work with the newer versions pulled in by the upgrade would have required at least some work. Which they likely wasn't worth it for an ancient version of gitolite.
14:23 nickabbey joined #git
14:25 nettoweb joined #git
14:29 Shashikant86 joined #git
14:30 tilerendering maybe
14:30 mkoskar joined #git
14:30 chriskos joined #git
14:30 tilerendering but if gitolite v1 is that old… maybe it was bad luck I had it installed.
14:30 tilerendering I could have gone with newer versions from the start
14:31 tilerendering well - 1 more lesson in deprecation.
14:32 Timvde joined #git
14:32 JeroenT joined #git
14:32 nettoweb joined #git
14:33 theoceaniscool joined #git
14:33 Snugglebash joined #git
14:33 suttonwilliamd joined #git
14:36 Soni left #git
14:36 JeroenT_ joined #git
14:37 JeroenT_ joined #git
14:37 JeroenT_ joined #git
14:37 holodoc joined #git
14:37 kpease joined #git
14:39 ikelso joined #git
14:40 AaronMT joined #git
14:40 GodGinrai joined #git
14:40 pietv joined #git
14:41 AaronMT joined #git
14:41 notebox joined #git
14:43 shinnya joined #git
14:44 TomyWork after doing "git pull -r" on my spare checkout, git status complains about missing files. how can that be? git version is 2.11.0
14:44 watabou joined #git
14:45 ngm joined #git
14:47 dminuoso TomyWork: By spare you mean sparse?
14:48 jimsio joined #git
14:48 finalbeta joined #git
14:50 TomyWork dminuoso yes, sorry
14:50 robattila256 joined #git
14:52 Spuri0us joined #git
14:53 TomyWork "git config core.sparsecheckout" says "true", "cat .git/info/sparse-checkout" says "/foo", but git status says certain files in /bar were deleted in the worktree
14:53 Ardethian joined #git
14:53 TomyWork i think those are the files that were changed since i last pulled.
14:54 TomyWork actually they were added
14:55 Levex joined #git
14:55 Snugglebash joined #git
14:55 Virox joined #git
14:56 Rodya_ joined #git
14:56 Guest9 joined #git
14:56 texinwien_ joined #git
14:57 GodGinrai joined #git
14:57 rivarun joined #git
14:59 TomyWork dminuoso any idea what i can do to solve the situation except re-cloning?
15:01 bigpic joined #git
15:02 bigpic when executing a `git pull` it’s pull down all updates from all branches not just the one i’m on
15:02 bigpic how do I change this?
15:02 bigpic I seam to remember a while back there was some change promoted via a setting that would control this behaviour
15:02 TomyWork bigpic how important is that to you?
15:03 hahuang61 joined #git
15:03 bigpic well I can’t pull the branch i’m on cause I’m getting an error on a totally different branch
15:03 bigpic error: Unable to append to .git/logs/refs/remotes/origin/memcached: Permission denied
15:03 bigpic error: Cannot update the ref 'refs/remotes/origin/memcached'.
15:04 TomyWork bigpic in general, there's not a big overhead, since branches in Git are, unlike in SVN, transferred as differences to other branches
15:04 bigpic pretty anoying
15:04 TomyWork bigpic maybe you should work on fixing that error then. that's not normal
15:04 raijin joined #git
15:04 TomyWork it's not SVN, it shouldn't error randomly :)
15:04 lohfu joined #git
15:05 TomyWork which OS are you on? if windows, are you using cygwin git, git for windows or some other client? or even multiple clients?
15:06 chriskos joined #git
15:07 bigpic it’s a file permissions issue
15:07 bigpic I pulled the repo as a different user when that memcached branch was created
15:07 bigpic not the current user doesn’t have access to it
15:07 TomyWork yeah, dont
15:07 bigpic It’s a simple fix
15:07 TomyWork yeah
15:07 TomyWork but the branch is not your only problem if you do that
15:08 bigpic what are the other side effects?
15:08 TomyWork permissions on everything other than branch refs and reflogs
15:09 Wulf4 joined #git
15:09 QwertyDragon_ joined #git
15:09 TomyWork the object storage, the index
15:09 TomyWork as i said, dont do that :)
15:09 zeroed joined #git
15:09 zeroed joined #git
15:09 pur3eval joined #git
15:09 TomyWork or deal with the consequences
15:10 bigpic i’ll keep that in mind
15:10 averell joined #git
15:10 heroux joined #git
15:13 mohabaks joined #git
15:13 Snugglebash joined #git
15:14 Snugglebash joined #git
15:16 Dougie187 joined #git
15:17 Anticom joined #git
15:18 Dougie187 left #git
15:18 xall joined #git
15:18 Snugglebash joined #git
15:19 Snugglebash joined #git
15:20 King_Hual joined #git
15:20 Dougie187 joined #git
15:21 denisMone joined #git
15:23 tmk joined #git
15:23 Wulf4 joined #git
15:24 ayogi joined #git
15:24 Snugglebash joined #git
15:24 Ardethian\ joined #git
15:28 duarteper joined #git
15:28 nettoweb joined #git
15:30 rharder joined #git
15:31 t0by joined #git
15:31 t0by joined #git
15:37 Shashikant86 joined #git
15:37 Dougie187 left #git
15:37 jstimm joined #git
15:37 JeroenT joined #git
15:38 cdg joined #git
15:39 Dougie187 joined #git
15:41 Murii_ joined #git
15:42 chriskos joined #git
15:42 xall joined #git
15:42 kristofferR joined #git
15:43 vuoto joined #git
15:45 watabou joined #git
15:45 thiago joined #git
15:46 mischat joined #git
15:47 mischat joined #git
15:47 tcorneli joined #git
15:48 durham joined #git
15:49 patarr joined #git
15:50 shgysk8zer0_ joined #git
15:52 Noldorin joined #git
15:53 eblip joined #git
15:55 solenodic joined #git
15:56 Ardethian joined #git
15:57 chardan joined #git
15:58 rharder joined #git
16:02 Levex joined #git
16:02 mizu_no_oto joined #git
16:04 rharder joined #git
16:05 mischat_ joined #git
16:06 mohabaks joined #git
16:06 Tobbi joined #git
16:06 grayjoc joined #git
16:06 marcogmonteiro joined #git
16:08 brent__ joined #git
16:08 levex_ joined #git
16:09 Derperperd joined #git
16:09 cdg_ joined #git
16:11 ResidentBiscuit joined #git
16:12 mischat joined #git
16:13 Guest74532 joined #git
16:14 Guest74532 joined #git
16:14 sylario joined #git
16:16 pijiu joined #git
16:19 dreiss joined #git
16:20 tmk joined #git
16:23 ilogger2 joined #git
16:24 jokke joined #git
16:25 DonRichie joined #git
16:25 pur3eval joined #git
16:25 _flow__ joined #git
16:26 theoceaniscool joined #git
16:27 Ardethian\ joined #git
16:27 heinrich5991 joined #git
16:27 bond joined #git
16:28 bjoe2k4 joined #git
16:28 jagob joined #git
16:28 jccn joined #git
16:30 Tobbi joined #git
16:31 elijah joined #git
16:32 basiclaser joined #git
16:32 jimklo joined #git
16:34 archer121_ joined #git
16:35 chriskos joined #git
16:35 sea-gull joined #git
16:35 LeBlaaanc joined #git
16:37 austin987 joined #git
16:39 pietv joined #git
16:40 rharder joined #git
16:42 nowhereman joined #git
16:44 cdg joined #git
16:44 sitaram tilerendering: v1?  I don't even know how v1 looks like anymore.  All I can say is that the "gitolite.conf file" should be upward compatible
16:44 swift1 joined #git
16:44 crose joined #git
16:45 sea-gull joined #git
16:46 watabou joined #git
16:46 jimklo joined #git
16:46 sitaram oh my
16:47 * sitaram just looked at the rest of the backlog
16:51 boombatower joined #git
16:52 WickedViking joined #git
16:53 matoro joined #git
16:54 QwertyDragon joined #git
16:54 WickedViking I'm trying to figure out how to create/use a git repo as a base template for new projects. I want the following behaviors. Create a new project using the latest master from the template project, ability to pull changes from the template project into the new project to update existing projects based on the template, the new project's commit history
16:54 WickedViking should not include all commits from the template project but rather just show that it was updated from that template project
16:55 WickedViking I have seen the git archive method, but that doesn't seem to lend itself to updating (rebasing?) from the template project
16:55 WickedViking same situation with checking out the template and deleting the .git directory
16:56 WickedViking I can do a git pull with --allow-unrelated-histories, however this merges the full commit history
16:56 GodGinrai joined #git
16:56 madewokherd joined #git
16:57 WickedViking I was thinking rebase, but have not managed to figure out how to rebase from another project.
16:57 WickedViking Anyone doing this or have any resources that might help me figure it out?
16:57 perlpilot WickedViking: have you seen http://git-template.readthedocs.io/en/latest/ ?
16:58 WickedViking I did see that, but I don't quite understand it
16:58 nicoulaj joined #git
16:58 dikiaap left #git
16:59 Snugglebash joined #git
16:59 Ardethian joined #git
16:59 WickedViking it also seems global
16:59 WickedViking I don't want every project to do this
17:00 WickedViking so basically, we have intranet apps, that should all be build on top of this base/template code
17:00 WickedViking we also have external projects that should not
17:00 j416 WickedViking: it sounds like you want a dependency manager
17:00 leeN joined #git
17:00 WickedViking kinda, yeah
17:00 j416 git isn't that
17:01 tang^ joined #git
17:01 j416 you can try to male
17:01 j416 bah
17:01 wiesel joined #git
17:02 j416 you can try to make it into one, but it likely won't be very nice
17:03 WickedViking ok, so, in simplest terms, i want to merge disparate repos
17:03 j416 if at all possible, I'd try to see if you can change your project structure and/or workflow instead
17:03 smccarthy joined #git
17:03 hahuang61 joined #git
17:03 thiago joined #git
17:04 j416 and then use the package manager that is commonly used for your environment to handle the dependencies
17:04 j416 if needed
17:05 smccarthy left #git
17:05 peterpp joined #git
17:06 jokke joined #git
17:06 imachuchu joined #git
17:06 quizzi joined #git
17:06 jimi_ joined #git
17:06 qqx Another option could be to have the dependent projects have the common code as a git submodule
17:08 rharder joined #git
17:08 WickedViking hmmmm
17:09 bjoe2k4 joined #git
17:09 ayogi joined #git
17:10 WickedViking submodule appears to require sub directoris
17:10 WickedViking directories
17:11 WickedViking this is the base of the project, managing framework, authentication, authorization, administration
17:11 WickedViking as well as some templating for the app
17:11 WickedViking I think I may just re-evaluate how I'm doing this
17:12 WickedViking perhaps something more along the lines of devops were there are initialization scripts and update scripts to fetch updates from the template repo and apply them to the current repo
17:15 WickedViking thanks for your time, back to the drawing board
17:16 chriskos joined #git
17:16 nixjdm joined #git
17:18 govg joined #git
17:21 seni joined #git
17:22 dc_ joined #git
17:24 Rodya_ joined #git
17:25 astrofog joined #git
17:27 crayon joined #git
17:29 Ardethian\ joined #git
17:31 nidr0x joined #git
17:31 spacelord_ joined #git
17:34 TomyLobo joined #git
17:34 chipotle joined #git
17:35 menip joined #git
17:36 sea-gull joined #git
17:36 eroux joined #git
17:39 dsantiago joined #git
17:44 Gsham joined #git
17:47 watabou joined #git
17:52 Tobbi joined #git
17:56 Darcidride joined #git
17:56 narendraj9 joined #git
17:56 sgen joined #git
17:57 peepsalot joined #git
17:57 robotroll joined #git
17:58 hobodave joined #git
17:58 Rodya_ joined #git
17:59 nettoweb joined #git
18:00 cdown joined #git
18:01 ShalokShalom joined #git
18:01 Ardethian joined #git
18:01 hahuang61 joined #git
18:03 Snugglebash joined #git
18:07 espindola joined #git
18:08 snits joined #git
18:08 Gsham joined #git
18:10 Levex joined #git
18:10 finalbeta joined #git
18:12 Snugglebash joined #git
18:12 rivarun joined #git
18:14 pur3eval joined #git
18:15 menip joined #git
18:16 nckpz joined #git
18:16 mgver joined #git
18:18 Vampire0_ joined #git
18:19 nickabbey joined #git
18:20 hashpuppy joined #git
18:21 dreiss joined #git
18:21 marcogmonteiro joined #git
18:22 altendky joined #git
18:23 sathed joined #git
18:23 m4sk1n joined #git
18:24 finalbeta joined #git
18:24 sathed joined #git
18:25 Eugene WickedViking - you might want `git checkout --orphan`
18:25 clemf joined #git
18:25 grayjoc joined #git
18:27 OverCoder joined #git
18:28 raynold joined #git
18:29 matsaman joined #git
18:30 miczac joined #git
18:30 Atemu joined #git
18:32 finalbeta joined #git
18:32 Ardethian\ joined #git
18:34 Timvde joined #git
18:35 crose joined #git
18:35 tyreld joined #git
18:36 e01 joined #git
18:36 e01 joined #git
18:37 dfas joined #git
18:38 miczac joined #git
18:38 joshszep joined #git
18:38 miczac joined #git
18:39 MacWinner joined #git
18:39 Levex joined #git
18:40 miczac joined #git
18:42 Timvde joined #git
18:42 miczac joined #git
18:42 overlord_tm joined #git
18:44 joshszep joined #git
18:45 joshszep joined #git
18:45 alexandre9099 joined #git
18:46 matoro joined #git
18:46 alexandre9099 hi, is it possible to have two sources for one git repo? for example i do a clone on x.com server but i want to also add y.com if x.com is not available, is that possible?
18:47 altendky joined #git
18:48 ToxicFrog alexandre9099: you can have as many remotes as you want
18:48 blackwind_123 joined #git
18:48 b100s joined #git
18:48 alexandre9099 ToxicFrog: the question is why
18:48 alexandre9099 *how
18:48 ToxicFrog I don't think you can automatically have it fail over to one if the other fails, though
18:48 Vampire0 alexandre9099, man git remote
18:48 gitinfo alexandre9099: the git-remote manpage is available at http://jk.gs/git-remote.html
18:48 watabou joined #git
18:48 alexandre9099 Vampire0: i'll check
18:50 jnavila joined #git
18:51 mkoskar joined #git
18:51 fahadash joined #git
18:51 LiftLeft joined #git
18:51 alexandre9099 git remote should give the url from the repo, right?
18:51 alexandre9099 on a repo i cloned from github it says "origin"
18:52 osse alexandre9099: git remote -v
18:52 alexandre9099 thanks :)
18:53 dodobrain joined #git
18:54 p4trix joined #git
18:54 spacelord_ joined #git
18:54 satifant joined #git
18:54 LaptopBrain joined #git
18:55 cagomez joined #git
18:55 cagomez does git checkout <somebranch> autocomplete the branch name if I only type the first few characters? and will it NOT create a new branch if it doesn't already exist?
18:55 vuoto joined #git
18:58 osse cagomez: whether it autocompletes is up to your shell, but maybe.  it will not create unless you also specify -b
18:58 theoceaniscool joined #git
18:59 dikiaap joined #git
18:59 matsaman cagomez: if you have the git completions sourced, and nothing is completed, yes, that would be tacit confirmation the branch doesn't exist
18:59 cagomez cool, just added this to my setup: https://gist.github.com/JuggoPop/10706934 . now it autocompletes
19:00 mkoskar joined #git
19:00 miczac joined #git
19:00 joki joined #git
19:00 matsaman https://git-scm.com/book/en/v1/Git-Basics-Tips-and-Tricks
19:02 Cogitabundus joined #git
19:04 vuoto joined #git
19:04 Ardethian joined #git
19:04 tmk joined #git
19:04 Rodya_ joined #git
19:05 Gsham joined #git
19:06 canuk joined #git
19:06 m0viefreak joined #git
19:06 miczac_ joined #git
19:09 Levex joined #git
19:10 Sasazuka joined #git
19:10 jimklo joined #git
19:11 matumbo joined #git
19:12 Snugglebash joined #git
19:13 Ramen left #git
19:13 Ramen joined #git
19:14 Ramen hi
19:14 Ramen when I do a sparce checkout does it still download the whole repo?  thanks!
19:14 pur3eval joined #git
19:14 ToxicFrog checkout never downloads anything
19:15 ToxicFrog And there's no such thing as a "sparse clone"
19:15 ToxicFrog Did you mean a shallow clone?
19:16 mgver joined #git
19:19 rudi_s --depth 1
19:19 DieguezZ joined #git
19:19 mda1 joined #git
19:21 Balliad joined #git
19:22 GodEater joined #git
19:22 GodEater joined #git
19:22 UrsoBranco joined #git
19:26 GodGinra1 joined #git
19:27 miczac joined #git
19:27 DBag joined #git
19:29 BSAlb joined #git
19:29 ocbtec joined #git
19:29 GodGinra1 joined #git
19:29 DBag hi. in my latest release there's a critical bug which I need to fix. my current build is a few commits ahead. how do I fix the error on that previous release?
19:30 DBag not sure if I'm clear here
19:30 DBag not so much experience with git apart from commit > push
19:31 sylario left #git
19:31 duderonomy joined #git
19:32 patarr_ joined #git
19:32 systemovich joined #git
19:34 Ardethian\ joined #git
19:35 Derperperd joined #git
19:35 BackEndCoder joined #git
19:36 nckpz joined #git
19:36 matoro joined #git
19:38 jnavila joined #git
19:39 vuoto joined #git
19:40 Levex joined #git
19:42 vuoto joined #git
19:44 Levex joined #git
19:44 publio joined #git
19:44 fhackdroid joined #git
19:46 dreiss joined #git
19:46 lmat I added a remote using git remote add -t b1 -t b1 origin;
19:46 lmat Now I would like to add another branch; how do I proceed?
19:49 tvl joined #git
19:49 uprego joined #git
19:50 watabou joined #git
19:51 uprego Is MARC failing or am I banned from the mailing list?
19:51 Ramen ToxicFrog: yeah can I do a shallow clone?
19:51 zeroed joined #git
19:51 zeroed joined #git
19:51 matsaman http://isup.me/marc.info
19:51 LeBlaaanc joined #git
19:52 Ramen ToxicFrog: well not really a shallow clone.... I want to clone a folder in my repo
19:52 matsaman gmane is failing, though
19:52 uprego I don't mean IDK if am banned from MARC, IDK if am banned from the mailing list.
19:53 uprego I sent out a message on 16:24CET on 24th jan, did you receive?
19:53 uprego It's not in the archive, but I received no error reply :8
19:53 pietv joined #git
19:53 mohabaks joined #git
19:53 kyan joined #git
19:54 lmat git remote set-branches [--add] <name> <branch>...
19:54 * lmat rtfm
19:54 uprego subject contains 'gitk' and 'stash'
19:54 Taikibansei joined #git
19:54 relipse joined #git
19:56 matsaman uprego: don't see anything at http://marc.info/?l=git&amp;r=8&amp;b=201701&amp;w=2 like that
19:56 uprego Aaahm yeah I know that, but does it exist in your inbox?
19:56 matoro joined #git
19:56 SwiftMatt joined #git
19:57 matsaman sorry not on the list
19:57 matsaman hate me some mailing lists
19:57 uprego Thanks anyway :).
19:57 relipse my virus scanner automatically deleted some files from my repo and I accidentally packed them into a commit. How do I restore the files that were deleted without losing the other changes in the commit
19:58 matsaman git checkout $(git rev-list -n 1 HEAD -- path/to/file)^ -- path/to/file
19:58 matsaman sounds like your virus scanner is dumb
19:59 uprego Or `git reset HEAD^` then `git checkout -- files/to/recover` then `git add changes/to/commit`.
19:59 uprego If you only did one commit.
20:00 Levex joined #git
20:01 cagomez joined #git
20:02 pijiu joined #git
20:03 Sasazuka joined #git
20:07 Ardethian joined #git
20:07 lohfu i want to commit all my binary files to my git repos, for ease of deploying. however, i don't want git to track changes to these, i only want git to store the latest version. at least of videos. is this possible?
20:07 lohfu i skimmed through https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#_binary_files
20:07 lohfu without finding out if this is possible
20:07 Perspicaciosity joined #git
20:07 thiago lohfu: !deploy
20:07 gitinfo lohfu: 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
20:08 thiago you should use git lfs
20:08 lohfu thiago: i use gitlab mainly for client projects... lfs is not available in the free version right?
20:09 thiago Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
20:09 thiago Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
20:09 thiago oops
20:09 thiago lohfu: don't know and not my problem...
20:10 thiago lohfu: Git is not a deployment tool. You're asking to do something it wasn't designed to do. So it's no wonder you're having problems.
20:10 clemf joined #git
20:10 clemf joined #git
20:11 lohfu not really having problems, but it felt like i was doing something wrong. and you confirmed that. will look into gitlabs lfs solutions. thanks for pointing me in the right direction.
20:14 systemovich joined #git
20:15 Guest30 joined #git
20:17 Shark13 joined #git
20:18 solenodic joined #git
20:19 madduck joined #git
20:21 cagomez joined #git
20:22 pbrewczynski joined #git
20:22 MeltedLux joined #git
20:22 Taikibansei joined #git
20:22 Mikerhinos joined #git
20:23 Rodya_ joined #git
20:25 anli joined #git
20:26 XenophonF joined #git
20:28 cdown joined #git
20:28 aidalgol joined #git
20:28 mohabaks_ joined #git
20:32 rivarun joined #git
20:33 clemf_ joined #git
20:34 LaptopBrain joined #git
20:37 gopar joined #git
20:37 Ardethian\ joined #git
20:38 groundup joined #git
20:39 shgysk8zer0_ joined #git
20:39 cbreak lfs?
20:39 cbreak I found it troublesome
20:39 Eugene Large Farty Smell
20:40 cbreak (using git lfs with bitbucket corporate)
20:40 cbreak especially on windows it makes a ton of problems
20:40 Vampire0_ joined #git
20:41 groundup How do I commit a submodule as the files, and not a "link"
20:42 Antimachine joined #git
20:42 _ikke_ You have to remove the link, and the git add submodule/
20:42 _ikke_ the / is signigicant
20:42 _ikke_ significant
20:42 groundup How do I remove the link?
20:43 _ikke_ git rm --cached submodule
20:43 WifiBrain joined #git
20:44 qqx uprego: I don't see that message in my mailbox for the git list.
20:44 Guest85 joined #git
20:46 anli_ joined #git
20:47 _ikke_ uprego: I have it
20:47 _ikke_ "Subject: Re: Proposal for an increased `gitk` cohesion with `git stash`."
20:47 _ikke_ https://public-inbox.org/git/B9F8449A-291C-4D7E-A5D2-165173E6E8DA@madiva.com/
20:47 Oatmeal joined #git
20:48 JanC_ joined #git
20:48 _ikke_ Though, I don't have the original
20:48 _ikke_ [not found] <CANidDKZRisodpQgqyYaG_tCi0+EyxYv+t8+Entp0joMSetd3oA@mail.gmail.com>
20:48 _ikke_ So that one seems missing indeed
20:49 _ikke_ (did it get greylisted?)
20:49 pR0Ps joined #git
20:49 qqx _ikke_: That message is from 14 Dec. uprego was asking about a message from 24 Jan.
20:50 _ikke_ Oh, was focussing more on the subject
20:51 uprego I must have get black listed for this message, I sent two more followups that don't get to marc. But anyway those are sent to Paul Mackerras so it's OK because he will use it if he sees it useful.
20:51 _ikke_ Why would you be blacklisted..
20:51 watabou joined #git
20:51 uprego Thank you!
20:52 uprego IDK but it's OK. The first message is missing too, but maybe that is because I had not joined the list yet.
20:52 _ikke_ Shouldn't matter
20:53 Tobbi joined #git
20:53 _ikke_ You are not required to subscribe
20:53 Sasazuka_ joined #git
20:53 nostrora joined #git
20:53 uprego But I use the OS X default client and gmail.com web app, maybe there is a black list for _rich_ mail clients.
20:54 _28_ria joined #git
20:54 qqx Yeah, the list tends to dislike messages that aren't plain text.
20:54 jimi_ joined #git
20:55 _ikke_ uprego: You have to send plain-text e-mails, but I believe you get a reply back when you send non-plain-text mails
20:55 _ikke_ http://vger.kernel.org/majordomo-info.html#subscription
20:55 tang^ joined #git
20:56 uprego Which is a decent ncurses mail client? I need to use both google IMAP, outlook IMAP, and other IMAP accounts, all at the same time.
20:56 _ikke_ I use mutt
20:56 qqx I also use mutt
20:56 sagerdearia joined #git
20:56 _ikke_ But only for mailinglists
20:57 uprego OK thanks again and sorry for off topic.
20:58 finalbeta joined #git
21:00 pur3eval joined #git
21:00 Rodya_ joined #git
21:01 finalbeta joined #git
21:02 ResidentBiscuit joined #git
21:09 Ardethian joined #git
21:11 irqq joined #git
21:12 dsdeiz joined #git
21:13 masuberu joined #git
21:14 NullableTruth joined #git
21:18 LaptopBrain joined #git
21:19 Sonderblade joined #git
21:19 cdg joined #git
21:20 nckpz joined #git
21:24 bauruine joined #git
21:25 Blendify joined #git
21:25 Blendify is there a command to list recent branches?
21:25 askb joined #git
21:26 thiago Blendify: branches don't have dates
21:26 thiago therefore, no
21:29 pR0Ps joined #git
21:29 bauruine joined #git
21:30 Atm0spher1c joined #git
21:31 Blendify thiago, branches that have been recently modified
21:32 Blendify recently committed to
21:32 Rodya_ joined #git
21:32 Derperperd joined #git
21:32 kadoban !lol or gitk --all should show you pretty easily
21:32 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
21:33 nostrora joined #git
21:33 matoro joined #git
21:33 shgysk8zer0_ joined #git
21:33 thiago you can list branches that have commits dated recently
21:33 thiago but dates are not monotonic. Anyone can choose any date.
21:34 thiago if you have reflog enabled, you can compare the branch state since the state the branch was at (say) last week
21:34 Nicmavr joined #git
21:34 Blendify I just want a list of the branches....
21:35 thiago git branch -a
21:36 Blendify thank you thiago
21:38 awer joined #git
21:38 awer how can you tell the repo you pulled in a while ago? i did a "git clone ..." but cant remeber what the repo is
21:39 awer is there a command to tel me that ?
21:39 uprego `git config --list` show origin URL.
21:39 awer thanks
21:40 kadoban git remote -v is more direct
21:40 Ardethian\ joined #git
21:40 awer uprego: thanks
21:41 awer kadoban: thanks as well
21:41 awer easy when you know how :-)
21:41 kadoban Tends to be, heh. Finding the right commands can be tricky.
21:42 _28_ria joined #git
21:43 Levex joined #git
21:43 Guest28671 joined #git
21:44 matsaman Blendify: git branch --sort=-committerdate ?
21:44 matsaman and here's the worst way you could do it =) git branch | rev | cut -d ' ' -f 1 | rev | while IFS='' read -r branch; do echo -e "$branch"' '"$(git show "$branch" | egrep -i '^date' | head -1)"; done
21:45 Blendify left #git
21:45 texasmynsted joined #git
21:45 Rodya_ joined #git
21:46 kadoban Huh, I didn't know about --sort, that's cool.
21:46 texasmynsted when I 'git branch —edit-description' for a branch, how do I push that to the mapped remote?
21:46 thiago ugh, don't parse git branch
21:46 thiago use git for-each-ref
21:47 kadoban texasmynsted: IIUC, branch descriptions aren't something you can push
21:47 notebox joined #git
21:47 Naan joined #git
21:47 nickabbey joined #git
21:50 matsaman 'git for-each-ref' doesn't produce that output =)
21:51 thiago it produces a different output, but it's more customiseable and it's meant to be parsed
21:51 Snugglebash joined #git
21:51 svm_invictvs joined #git
21:52 inflames joined #git
21:52 watabou joined #git
21:53 clemf joined #git
21:54 nettoweb joined #git
21:54 matsaman by default it looks like it couldn't be more not meant to be parsed, though =)
21:55 ShalokShalom left #git
21:56 jeffreylevesque joined #git
21:58 jtfidje joined #git
21:58 j7k6 joined #git
21:59 matsaman git for-each-ref --format='%(committerdate:iso8601) %(committerdate:relative) %(refname)' --sort -committerdate isn't the worst thing I've ever seen, but it's still pretty crufty, and requires learning all those variables
21:59 svm_invictvs joined #git
21:59 nettoweb joined #git
22:00 denisMone joined #git
22:01 pur3eval joined #git
22:02 brent__ joined #git
22:05 nettoweb1 joined #git
22:06 Darren_ joined #git
22:07 Taikibansei joined #git
22:07 NeverDie joined #git
22:07 BlackFox joined #git
22:08 cdg_ joined #git
22:08 BlackFox Greetings, I've got a bunch of git repositories around and I'm on Windows. Is there any sorta nice UI I could use to commit changes in all of them and push them at once?
22:08 BlackFox It's a project that's made up of several parts and I usually end up modifying those different parts over the day, then in the end I'm lazy to go to every folder and commandline it out
22:09 kadoban BlackFox: Sounds like you should just be commiting more often. It's not an end of the day activity.
22:10 BlackFox kadoban, the question is, how can I handle all of those repositories all at once?
22:10 BlackFox Without jumping around the filesystem
22:10 zoph make a shell script with n number of lines for each project to do commits
22:10 matsaman "git cluster"?
22:11 kadoban Don't. Handle one at a time, the same way you handle editing them.
22:12 Ardethian joined #git
22:12 theoceaniscool joined #git
22:13 BlackFox hmm
22:13 BlackFox kadoban, well, maybe there's some sort of a nice UI thing?
22:13 BlackFox I might just forget which repository I'm in right now and do a bad by accident
22:14 zoph bitbucket and github have GUIs but i think they're tied to their ecosystem
22:14 matsaman BlackFox: then you should fix your interface to be more informative
22:15 BlackFox matsaman, well, right now I'm just using a command line, the question is about whether there is any nice sorta UI
22:15 BlackFox Sadly I'm not using bitbucket nor github D:
22:15 zoph then you should just rig up a shell script for yourself
22:15 matsaman you want to switch from commandline to UI for this one thing?
22:16 ozmage joined #git
22:17 BlackFox Pretty much
22:17 ozmage joined #git
22:17 matsaman weird
22:17 BlackFox I wouldn't expect git to have any sorta nice management features for having multiple repositories built-in
22:18 matsaman not really its job, but
22:18 matsaman if I were you, if you're always in this situation
22:18 matsaman then add something to indicate the 'git status' of each repo you're concerned with to your prompt
22:18 BlackFox I'm probably gonna do some script which checks each repo for any sorta changes, then brings it all together into a nice message for me
22:18 matsaman someone had a super cute one here that just had a colored dot matching git status info, like a stop light
22:18 Hotspoter joined #git
22:19 BlackFox collect all outputs of git status and show the ones which aren't "no changes"
22:19 notebox joined #git
22:19 plasticle joined #git
22:20 staafl joined #git
22:21 BlackFox It's kind of amusing. A feature kind of like I want exists in Visual Studio, but it's not very good and in many ways worse than just going through all folders manually
22:22 matsaman git status -s | wc -l | egrep -q '^0$' || echo changes
22:23 DieguezZ joined #git
22:26 l4v2 joined #git
22:27 DolphinDream joined #git
22:31 cdown_ joined #git
22:33 thierryp joined #git
22:35 notebox joined #git
22:37 rivarun joined #git
22:38 notebox joined #git
22:42 dave0x6d joined #git
22:43 Ardethian\ joined #git
22:44 nettoweb joined #git
22:44 gopar joined #git
22:49 platzhirsch joined #git
22:50 codebam joined #git
22:51 pandbearit joined #git
22:51 Gsham joined #git
22:52 pandabearit_ joined #git
22:53 watabou joined #git
22:53 mischat joined #git
22:54 gopar joined #git
22:58 Derperperd joined #git
22:59 Cthalupa joined #git
22:59 patient0_ joined #git
23:01 fmeerkoetter joined #git
23:02 thierryp joined #git
23:02 ikelso joined #git
23:03 AprilKlio joined #git
23:03 jimklo joined #git
23:05 Derperperd joined #git
23:05 tvw joined #git
23:05 dsdeiz joined #git
23:05 dsdeiz joined #git
23:07 Vampire0 BlackFox, maybe you are after !repo or !gitslave
23:07 gitinfo BlackFox: Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. https://source.android.com/source/using-repo.html
23:07 gitinfo BlackFox: gitslave (http://gitslave.sf.net) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.
23:07 thierryp joined #git
23:08 BlackFox I'll check these out
23:08 thiago joined #git
23:11 nadley joined #git
23:12 raynold joined #git
23:12 hecliunyx joined #git
23:13 telephone joined #git
23:13 telephone joined #git
23:14 niax joined #git
23:15 dysfigured joined #git
23:15 Ardethian joined #git
23:18 Darcidride joined #git
23:19 HalfEatenPie joined #git
23:19 mischat joined #git
23:22 Darcidride joined #git
23:23 Derperperd joined #git
23:23 overlord_tm joined #git
23:29 j7k6_ joined #git
23:29 pR0Ps joined #git
23:31 ftoulemon joined #git
23:32 pur3eval joined #git
23:32 Zialus joined #git
23:32 parallel21 joined #git
23:32 Darcidride joined #git
23:32 tanuki joined #git
23:34 nikivi joined #git
23:34 alexandre9099 joined #git
23:35 inflames joined #git
23:38 Darcidride joined #git
23:38 jimi_ joined #git
23:38 DolphinDream joined #git
23:39 matoro joined #git
23:39 minn joined #git
23:41 justanotheruser joined #git
23:43 Ryanar joined #git
23:43 yqt joined #git
23:44 nunchuck joined #git
23:45 menip joined #git
23:46 Ardethian\ joined #git
23:48 ozmage_ joined #git
23:50 ozmage__ joined #git
23:51 pR0Ps joined #git
23:53 mda1_ joined #git
23:53 Oatmeal joined #git
23:54 watabou joined #git
23:57 pR0Ps joined #git
23:59 j7k6 joined #git

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