- Talk - lists.gtalug.org

What good is GIT's "index"?
by D. Hugh Redelmeier 16 Mar '19

16 Mar '19

I use git regularly. I'll admit that I use it in a stylized way. The index only seems to add confusion and complication. Is it actually useful? Background: Git has a hierarchy of copies of the object under management: - the working tree. This is the one that you actually edit and use - the index (which lives inside the .git subdirectory of the working tree) - the repository (which also lives inside the .git subdirectory) After this comes a federation of other repositories. These relationships are chosen and configured by whoever manages the local repository. In the simplest non-trivial case, there is a single "upstream" "remote" repository. I'll explain part of my workflow - to show how the index is used - to invite suggestions on improving it In my workflow, the index is almost always identical to the repository. I almost never use "git add" (which affects the index but not the repo). I almost always use "git commit -a" which updates both the index and the repo at the same time. The only time I use the index explicitly is when there is a merge conflict. And that's not by choice: the workflow required to resolve a conflict seems to require the index. Since I don't get a lot of merge conflicts, I don't get a lot of experience dealing with them. Often during development I want to bring my repo up to date with the upstream repo. Here's the procedure I follow: If I have uncommitted changes the the working tree, save them in the stash: git stash If I have local committed changes: # get upstream commits into our repo, index, and working tree: git pull --rebase If this results in merge conflicts: edit each conflicted file to resolve the problem "git add" each such file At this point, the index differs from the repo! "git commit" the resolution If I did not have local uncommitted changes, this will do and cannot result in merge conflicts: git pull If I started out with uncommitted changes (i.e. I stashed them): git stash pop If this results in merge conflicts: edit each conflicted file to resolve the problem "git add" each such file At this point, the index differs from the repo! "git reset" sets the index back to the repo (the conflict resolution remains in the working tree) Done: upstream commits are now in the local repo, the index, and the working tree. If you want to, commit any local changes. If you want to, push local commits upstream.

2 1

Re: [GTALUG] GTALUG
by Karen Lewellen 14 Mar '19

14 Mar '19

Can someone explain the rules about private contacts without permission? It seems those on moderation are simply trying to force their case privately. On Thu, 14 Mar 2019, ted leslie wrote: > I got booted (life time) as you may know. I found your posts > in the archive. > First, I am NOT trying to get back into the TLUG, i have been in for 19 > years or so > and for reasons not related to today, it is not an issue to be out of it. > > I first would like to state that i used the word "snowflake gen", > and to, I believe everyone, "gen" is a abbrv for generation, i.e. gen-x > intel next gen chip, etc, gen is NOT abbrev for gender, and Alex took it > that way. > To the degree SFG is really a derogative term? it wasn't 2 years ago. > I grew up in the 80's, the decade of the hair-band when we were all > supposed to be > screwed .. i was paraphrasing but the worst I can be accused of is > generation degrading! > I have blond hair, I have to hear "blond jokes" :) > > What Alex doesn't understand is that , as JBP preaches, its > equality of opportunity for the genders, not equality of outcome, equality > of outcome is > insane. 50/50 army soldiers, 50/50 nurses, 50/50 ditch-diggers, ????? > > I don't even have a problem IN TIME if education see 100% female > participants, if > nature, evolution or creation thinking see it that way over a reasonable > period of time, > but in 15 years? I like Ted Turner, don't believe men should be heads of > state, its mean, > but it will save a load of lives! > The society quake of such a quick shift, and relating to topic of > employment, and disruption > in trades and in general the world, is enormous. > The thinking which is not mentioned as often, is the guy who drove the van > and killed > people, who wrote he was avoided (or some such thing) by women, and he > went/was > nihilistic .. disruptive society bring that, if in 15-30 years there is > 80/20 split of F/M, that would > spell out the nihilist male (many) from daily repeating that terror, day in > and day out, > its a major imbalance of society. As JBP says, "that's not good"! > > JBP has a lot to say about it, and I can't do it justice but I am making it > a point to try (in life) > He was villified by _some_ womans groups early on in 2017, now he gets > invited to speak to > them in his same positive manner, because woman do not want equality of > outcome, > they want equality of opportunity, and there is a night and day difference. > And no one wants a disrupted society that is going against the grain, to > cause a > bunch of nihilistic males, who can't adapt to that change sanely. > > I am glad this topic of discussion carried on a bit in this way for reasons > that may become apparent at some later time. > If anyone gets a chance to talk to Alex, please tell him: > 1) gen= generation. (obviously) > 2) his slander of me, do to that, did go to the archives, so if my name is > googled this comes up, i told him to remove it or allow two sided of the > story. Why do I want to sue tlug/alex? i don't but he has to choose one or > the other. He removes, fine, he allows me to submit a brief my side > of story, and JBP gets some more followers and the world will be a bit > better for it :) I have a felling Alex is not for debates and exchange of > info, so hopefully he just drops the whole thing > > The topic went off topic, but I think my Harper comments were right on at > least what was still being discussed. Outsourcing to India is a sore topic, > a 80/20 split in 15 years, much sorer topic for employment for many, and > many other things. It would appear my current JBP "mandate" had me all to > happily segway onto that second section of my email, to my sincere apology, > more for the off-topic, and less so for the gen!=gender issue , which you > can pass on to Alex or board if you have chance. [but again have no > interest to return to the board, I don't blame him for jumping, I do blame > him for not wanting to at least discuss, even a bit] And there are some > who emailed me after that did also argue the case to Alex, and I certainly > didn't ask them to do that, so good on them. > > And apologies if this is an interruption, or a read, that you don't get > that 100 seconds back in your life. Now I have to get back to doing my JBP > home work , and finish reading Gulag Archipelago :) (argh, but I am > serious). > But seriously, I am grateful the conversation did carry on, at least a > little bit by y'all. > > -tl >

4 3

Western Digital's open source RISC-V core
by D. Hugh Redelmeier 14 Mar '19

14 Mar '19

I assume that you can put this on a FPGA, as Chris Tyler talked about on Tuesday. I haven't checked this. I think that it is in verilog, but I'm not sure. <https://github.com/westerndigitalcorporation/swerv_eh1> There's also an emulator: <https://github.com/westerndigitalcorporation/swerv-ISS> I have no idea if there is MMU support in the core (needed for reasonable Linux).

5 4

Shuah Khan becomes the third Linux Foundation Fellow
by Russell Reiter 13 Mar '19

13 Mar '19

Interesting to read a bit on her perspective. You need an anchor project to get your teeth into and a mentor. "She started to work in 2011 on the mainstreaming of Android code back into Linux in her spare time. Unlike some people, she found the Linux kernel developer community to be very welcoming. "I thought that it's the right place, the right fit for me," Khan told ZDNet." https://www.zdnet.com/article/shuah-khan-becomes-the-third-linux-foundation…

1 0

Re: [GTALUG] Gender discrimination
by Karen Lewellen 13 Mar '19

13 Mar '19

My comment was in reply to malgosia, which I do not believe is your name? On Wed, 13 Mar 2019, Dave Cramer wrote: > It most certainly was. > > Exactly what did I say that was offensive ? > > Dave Cramer > > > On Wed, 13 Mar 2019 at 18:20, Karen Lewellen <klewellen(a)shellworld.net> > wrote: > >> Perhaps because it is not present? >> Karen >> >> >> On Wed, 13 Mar 2019, Dave Cramer wrote: >> >>> Karen, >>> >>> Apparently sarcasm doesn't come through email very well. >>> >>> Dave Cramer >>> >>> >>> On Wed, 13 Mar 2019 at 18:01, Karen Lewellen via talk <talk(a)gtalug.org> >>> wrote: >>> >>>> What makes it universally fun to sensor people? you indicate you know >> it >>>> is fun...why? >>>> I point that out because as your example illustrates generalizations >> tend >>>> to make no sense, and fun must be at least understandable as fun no? >>>> Kare >>>> >>>> >>>> >>>> On Wed, 13 Mar 2019, Malgosia Askanas via talk wrote: >>>> >>>>> So let me understand this. If a woman (me, for example) would bemoan >>>> the >>>>> fact that 80% of participants in a certain field of endeavor are male, >>>> that's >>>>> not gender discrimination, right? (I assume it isn't, since it goes on >>>> all >>>>> the time in all kinds of media, without any visible censorship.) But >> if >>>> a >>>>> man bemoans the fact that 80% of participants in (another) field of >>>> endeavor >>>>> are female, that's gender discrimination? To my mind, labeling the >>>> latter as >>>>> "gender discrimination seems like... gender discrimination. Or is it >>>> that, >>>>> by definition, censoring a man cannot possibly be gender >> discrimination? >>>>> I know it is fun to censor people, but isn't it *more* fun to do it for >>>>> reasons that make sense? >>>>> >>>>> -malgosia >>>>> --- >>>>> Talk Mailing List >>>>> talk(a)gtalug.org >>>>> https://gtalug.org/mailman/listinfo/talk >>>>> >>>>> >>>> --- >>>> Talk Mailing List >>>> talk(a)gtalug.org >>>> https://gtalug.org/mailman/listinfo/talk >>>> >>> >> >

1 0

Re: [GTALUG] Gender discrimination
by Karen Lewellen 13 Mar '19

13 Mar '19

Perhaps because it is not present? Karen On Wed, 13 Mar 2019, Dave Cramer wrote: > Karen, > > Apparently sarcasm doesn't come through email very well. > > Dave Cramer > > > On Wed, 13 Mar 2019 at 18:01, Karen Lewellen via talk <talk(a)gtalug.org> > wrote: > >> What makes it universally fun to sensor people? you indicate you know it >> is fun...why? >> I point that out because as your example illustrates generalizations tend >> to make no sense, and fun must be at least understandable as fun no? >> Kare >> >> >> >> On Wed, 13 Mar 2019, Malgosia Askanas via talk wrote: >> >>> So let me understand this. If a woman (me, for example) would bemoan >> the >>> fact that 80% of participants in a certain field of endeavor are male, >> that's >>> not gender discrimination, right? (I assume it isn't, since it goes on >> all >>> the time in all kinds of media, without any visible censorship.) But if >> a >>> man bemoans the fact that 80% of participants in (another) field of >> endeavor >>> are female, that's gender discrimination? To my mind, labeling the >> latter as >>> "gender discrimination seems like... gender discrimination. Or is it >> that, >>> by definition, censoring a man cannot possibly be gender discrimination? >>> I know it is fun to censor people, but isn't it *more* fun to do it for >>> reasons that make sense? >>> >>> -malgosia >>> --- >>> Talk Mailing List >>> talk(a)gtalug.org >>> https://gtalug.org/mailman/listinfo/talk >>> >>> >> --- >> Talk Mailing List >> talk(a)gtalug.org >> https://gtalug.org/mailman/listinfo/talk >> >

1 0

Gender discrimination
by Malgosia Askanas 13 Mar '19

13 Mar '19

So let me understand this. If a woman (me, for example) would bemoan the fact that 80% of participants in a certain field of endeavor are male, that's not gender discrimination, right? (I assume it isn't, since it goes on all the time in all kinds of media, without any visible censorship.) But if a man bemoans the fact that 80% of participants in (another) field of endeavor are female, that's gender discrimination? To my mind, labeling the latter as "gender discrimination seems like... gender discrimination. Or is it that, by definition, censoring a man cannot possibly be gender discrimination? I know it is fun to censor people, but isn't it *more* fun to do it for reasons that make sense? -malgosia

4 3

Boeing India software engineers
by Gary 13 Mar '19

13 Mar '19

I must complement Boeing management for the huge sums that they save on salaries by shifting software engineering to India. Gleaned from the URL below I take it that the average Boeing software engineer in India makes 26,930 rupees/month, which is about $500 Canadian and that makes an annual salary of $6,000 per year. My hats off to management for achieving these enormous cost savings. Not to be left behind in an uncompetitive position, our Canadian companies, too, are making great strides in reigning in costs by shifting work offshore. https://www.indeed.co.in/cmp/Boeing/salaries /gary

18 46

Where are we eating this evening? EOM
by Ivan Avery Frey 12 Mar '19

12 Mar '19

2 2

Rogers "Anyplace TV" does not support Firefox
by D. Hugh Redelmeier 12 Mar '19

12 Mar '19

Why would that be? It claims to support MS Edge, IE 11, Chrome, and Safari. I don't have Chrome on my desktop because it is closed source.

16 24