Hacker News Board Hacker News, browsed like a classic message board
Live data from Hacker News

New in Git: switch and restore

banterly.net

Post reply on HN
Print view View original

361–370 of 550 posts

Re: New in Git: switch and restore

#361

Post by nicoburns »

agilob wrote: post #353
LambdaComplex wrote: post #344

Earlier quoted context omitted.

What was their justification for being like that? Sometimes I read these things and end up saying to myself "Wow, that company just literally hates being productive"

>What was their justification for being like that? The more tools people are allowed to install and use, the less standardised software development. Meanwhile we didn't even have common source code formatting pattern and single Java class could be formatted with tabs, 2 spaces and 4 spaces.

Not necessarily. On my team at work we have people using Sublime Text, VS Code and vim, but all 3 (+ our CI) plug into ESLint and TypeScript for ensuring style coherence.

Re: New in Git: switch and restore

#362

Post by MarkSweep »

einherjae wrote: post #348
MarkSweep wrote: post #293

Earlier quoted context omitted.

What about staging lines to the index? I tried ‘git add -i’, but it feels pretty clunky compared to selecting some lines with a mouse in git-gui.

git add -p

Oh thanks, that works fairly well. I still prefer git-gui for this, but this will work nicely when I'm ssh-ed into a machine with no GUI.

Re: New in Git: switch and restore

#363

Post by krainboltgreene »

ozim wrote: post #175
lisper wrote: post #94

Earlier quoted context omitted.

> Other than that, I recommend that people learn to use git properly. Sorry to be harsh here, but that is completely useless advice. It's a tautology. Of course people should learn to use git "properly". What's the alternative, that they should learn to use it improperly? Everyone should learn to use everything properly. It's like telling someone dealing with a crisis that they should "take appropriate action", as if…

By "properly" - I mean not messing up your own or others work in unpredictable ways. My dev team uses git properly. They are not some masters in a way that they know each command by heart. They often use visual tools or what is built into IDE. We just have general guidelines and everyone knows how to do basic moves like "get code from remote", "merge others work into your local changes". We had people who always have…

> By "properly" - I mean not messing up your own or others work in unpredictable ways.

The parent's point still stands: No one is out there choosing to use git in "unpredictable" ways.

Re: New in Git: switch and restore

#364

Post by cratermoon »

ketzu wrote: post #220
gavinray wrote: post #102

Earlier quoted context omitted.

Eh, that term seems to have fallen out of favor compared to when I was a growing up but I don't think it necessarily has a negative connotation. I remember being in programming and software related IRCs at 10-11 years old having no earthly clue what in the fuck I was doing, asking adults questions and getting called a "noob". Well, yeah, it was true. (I also made damn sure they had no idea I was a child.) They could…

My personal experience around noob is covered by the ones I found on ~~most~~ edit: the most high search-ranked online explanations: Mostly negatively conotated, deregatory version of newbie. Often associated with people not sufficiently able to learn or at least not learning on their own. Examples: * https://en.wiktionary.org/wiki/noob * https://www.etymonline.com/word/noob Examples not containing the negative conno…

I've been around long enough and in enough circles that I have seen 'noob' go from mildly chiding to full-on insult. It used to be that in some communities, being referred to as a noob was a sort of "hey check out the new guy" ribbing. A noob was just someone starting out, a neophyte. It was the impatient and rude who later decided that being a noob was a bad thing.

Re: New in Git: switch and restore

#365

Post by solarkraft »

tkuraku wrote: post #145

I think sublime merge is pretty close to the optimal git GUI, https://www.sublimemerge.com/ . It uses standard git commands and terminology and allows you to add custom git commands to the GUI. Unlike Sourcetree is cross platform for Windows/Linux/Mac and includes a merge tool. I think command line git and Sublime Merge git translate back and pretty easily.

I tried to use it and ended up back with Fork for some reason. I think basic tasks like merging were unnecessarily cumbersome and reliability wasn’t perfect.

Re: New in Git: switch and restore

#366

Post by erik_seaberg »

akx wrote: post #206

These features were introduced in 2019 (and have been featured in git's help texts since). Serious question - Why is it that they're called new two years later? Is it that no one cares to read git's prompts or release notes?

It might take five years for a change like this to show up on every box you log into, depending on how much your org relies on LTS releases to avoid randomly breaking stuff.

Re: New in Git: switch and restore

#367

Post by ozim »

krainboltgreene wrote: post #363
ozim wrote: post #175

Earlier quoted context omitted.

By "properly" - I mean not messing up your own or others work in unpredictable ways. My dev team uses git properly. They are not some masters in a way that they know each command by heart. They often use visual tools or what is built into IDE. We just have general guidelines and everyone knows how to do basic moves like "get code from remote", "merge others work into your local changes". We had people who always have…

> By "properly" - I mean not messing up your own or others work in unpredictable ways. The parent's point still stands: No one is out there choosing to use git in "unpredictable" ways.

No, if you have modicum of abstract thinking and spend up to 30 mins daily using GIT you don't use git in "unpredictable ways".

If someone is a software developer, for me basic requirement is having possibility to understand this.

Re: New in Git: switch and restore

#368

Post by mattrighetti »

aetherspawn wrote: post #73

A lot of comments along the lines of ‘why do people use instead of learning the commands’. For me, I used to use the terminal git, and I still do occasionally. But I use Sourcetree now for most things because I make less mistakes seeing the tree visually all the time. My job isn’t to use git, it’s to write specialist software. If I get the software written and the customer is happy, it doesn’t matter whether I use or…

Using git from cli is like driving a Ferrari in a road with 30km/h speed limit

Re: New in Git: switch and restore

#369

Post by alkonaut »

> with git checkout you can create and switch to the new branch in one command using the -b flag: git checkout -b new_branch

> You can do the same with the new one, but the flag is -c: git switch -c new_branch

It's like they had a design meeting where they discussed this and said "so I propose switch -b newbranch to create and switch to a new branch" and the objection was "nah that would make it consistent with checkout, which is against the project policy"

Re: New in Git: switch and restore

#370

Post by cratermoon »

Yea, all of us who have used git and learned to live with its quirks (and probably have Stockholm Syndrome from it) can chuckle a bit, but much of the git cli is a dumpster fire from the "principle of least astonishment" user perspective. The affordances in some cases are terrible.

Ever drive a car that had every function ever on one stalk? The one that's the turn signal also has the cruise control, radio, lights, wipers, and blinker fluid. Much of git is like that – context-sensitive.

I can't really fault the programmers, they (he) had a certain mental model and translated that concretely to commands. Except that the internal abstractions of how get works are orthogonal to tasks and use cases of users.

Post reply on HN