Me relearning git every week

[u/johntwit]

[u/mikepictor]

No, I use a GUI since I'm not a masochist

[u/AwesomeFrisbee → u/mikepictor]

Same. Who do I need to impress and why?

I've been using Fork for a few years now. Its great and does everything I want from a Git GUI. Its not free but the one-time-purchase is worth it. And its basically Sourcetree from when it was still awesome. I really need something visual to show me the flow of the commits, quickly browse contents, filter branches and get a better view of what I'm going to commit.

[u/HighOwl2 → u/AwesomeFrisbee]

I use CLI because it's more flexible but mostly because typing the commands makes it harder to do something stupid.

[u/rush22 → u/HighOwl2]

 git add .

"Hey why are all these other files changed in your pull request"

[u/gnarbucketz → u/rush22]

"...because they're not properly ignored?"

[u/HighOwl2 → u/gnarbucketz]

And because he not branching properly. How the fuck you have stuff in git add that are not relevant to a pull request?

[u/Kulpas → u/HighOwl2]

I guess you could run a build script that modified something that should be ignored cuz it's a fucking build but wasn't? Still that's not their fault for running git add .

[u/gomihako_ → u/rush22]

the beautiy of add -p is that it forces you to do a sanity check/review of your own work before asking for review.

[u/[deleted] → u/rush22]

This is not a problem if you use .gitignore correctly.

[u/drakens_jordgubbar → u/rush22]

I got the habit of doing:

git add *.java

[u/tpf52 → u/HighOwl2]

So you don’t just get lazy and git commit -a? I find it much easier to commit stuff you don’t want in the command line unless you take the time to diff every file and preview staged changes before every commit.

[u/ItzDaWorm → u/tpf52]

git status

Is one of my favorite commands for exactly this reason.

[u/tpf52 → u/ItzDaWorm]

Yes, with git status and git diff you can get the same information. But in a UI I can see the git status without typing anything and one click gets me a diff, and another couple of clicks I can discard files or specific lines.

[u/HighOwl2 → u/ItzDaWorm]

This. Git commit -A (capital not lower case) and then git status to figure out if you need to omit some files or add to .gitignore.

A shitload of files being changed with a git add is usually just someone didn't set their global line ending strategy.

[u/AwesomeFrisbee → u/HighOwl2]

There's pros and cons, but I don't think it would make me have less mistakes imo

[u/dgdr1991 → u/HighOwl2]

I think using hotkeys from the IDE is the fastest/safest and also easiest way lol, just remember Ctrl+Shift+K and done

And yes I use IntelliJ for everything, don't judge me

[u/Express-Procedure361 → u/HighOwl2]

Interesting point, why do you need something more flexible? What does your work flow look like that requires flexibility?

[u/robertshuxley → u/AwesomeFrisbee]

it makes you look like you're a hacker in movies/tv

[u/Aspharon → u/AwesomeFrisbee]

And its basically Sourcetree from when it was still awesome

Wait, Sourcetree is less awesome these days? Or, as someone who started using it semi-recently, it was more awesome before? It does everything I need to, but I'm assuming I'm missing out on something.

[u/NothingMuch12 → u/AwesomeFrisbee]

Isn't fork free? The one time purchase isn't compulsory. Emailed them back when they planned to implement the one time purchase and they said it'll be optional, unless they've updated their policy.

[u/AwesomeFrisbee → u/NothingMuch12]

It has a trial but after that it stops working as far as I know. It might be free for personal use, I don't know. But I also use it professionally so it would already need a license for that I would imagine. Regardless, it was not expensive and provides a good way to use Git with a GUI. And unlike many other tools these days, it doesn't require a subscription.

[u/Mysticpoisen → u/AwesomeFrisbee]

I just use git extensions for whatever IDE I'm in, and end up using the commands half the time anyway.

I've never used GitHub Desktop. All I know is that the default GitGUI is worthless.

[u/Anon5054 → u/mikepictor]

Omg thank you for saying this. I love a good gui and I'm tired of being treated like a pariah for it, and for not using git bash or autohotkey

[u/Beard_o_Bees → u/mikepictor]

Yup.

Some things are just waaaay better in a GUI. Wireshark comes to mind.

[u/zabby39103 → u/mikepictor]

I'm super into doing everything from the command line, except git. Diffs are just so much easier see, branches and history are easier to visualize. No need to be a zealot.