JetBrains IDEs, I don’t remember the last time I used the CLI.
you have forgotten the face of your father
Linus Torvalds?
I was looking for this comment. PHP storm and git are like best friends. I very very rarely need to resort to the CLI and generally that’s for hard resetting after I screw something up
Good luck doing anything remotely complicated/useful in git with an IDE. You get a small fraction of what git can do with a tool that allows absolutely 0 scripting and automation.
It sounds like you don’t speak from experience. I have all the automation I need. It supports git hooks on top of IDE-only features like code checking.
If I have to fire up my CLI for some mass history rewriting (like changing an author for every commit), or when the repo breaks - so be it. But by not using the CLI I save my fingers and sanity, because committing a bunch of files is several click away with little to no room for error.
I can rebase, patch, drop, rename, merge, revert, cherry pick, and solve conflicts with a click of a button rather than remembering all the commands and whatnot.
I don’t understand git anyway
Well, you learn four commands and hope for the best.
fetch, reset --hard, checkout -b and cherry-pick?
:-D
More like clone, pull, commit, and push --force
>:-D
Nah,
rebase -i
,squash
,fsck
andreflog
Must be an interesting work if you never
add
,commit
orpush
.Edit: How the hell did you get the repo without
clone
?Pshaw, real programmers write out the contents of
.git
by hand.(Also, it was a joke, the last two commands I listed are ones you’ll ideally never need in your life)
I was scared of reflog too. Had to use it for the first time recently after I accidentally’d a branch that I hadn’t pushed to remote yet. I was so glad that I could recover it all in <5 commands.
reflog saved my life once after a stupid misshap.
All rebase are belong to us (onto, rebase, and ofc interactive) but what’s fsck (I don’t squash personally)?
Fsck is File System Check - realistically you should never need to use it.
Title text: If that doesn’t fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of ‘It’s really pretty simple, just think of branches as…’ and eventually you’ll learn the commands that will fix everything.
-
git pull
-
git add *
-
git commit -m “Some stuff”
-
git push
And occasionally when you mess up
-
git reflog
-
git reset HEAD@{n} (where n is where you wanna roll back to)
And occasionally if you mess up so hard you give up
- git reset --hard origin/main
And there you go. You are now a master at using git. Try not to mess up.
-
I really never understood why one would need a GUI for git except for visualizing branches.
I feel like I’m crazy seeing so many people using clicky buttons for tracking files. I need like 4 commands for 95% of what I do and the rest you look up.
You’re already programming! Just learn the tool!
And now there’s a github CLI tool? I hate to beat a dead horse but Microsoft pushing their extended version of an open source tool/protocol is literally the second step of their mantra.
FWIW not everyone using source control is a programmer. I’ve seen artists in game dev using GUI tools to pull new changes and push their assets.
Do you use the command line for everything? Do you edit with vim, view diffs with git diff, browse the web with links or lynx?
GUIs are useful tools. I’m happy with VSCode’s git integration. It’s just what I need for basic stuff like staging files and committing. I use the CLI whenever I want to do something like rebasing because I can type that command faster than I can figure out the GUI, but it would be stupid to artificially force myself to use the CLI for everything because of some kind of principal.
Yeah I actually just prefer the command line, I’ve never had to force myself to use it. I even tried using VSC for a bit recently but i couldn’t get myself to like it. I just use nvim with some plugins in a tmux session now and its productive as hell.
Of course I don’t browse the web with the command line. For merging branches, I always merge main into the working branch first, check conflict files, and go through the file finding the diffs and resolving them. I’ve used merge tools before that were sorta nice but I had my own issues with them.
Maybe it’s the type of programming I do. I don’t do any web stuff, so file count is down. For larger code bases I keep a non editor terminal up and will
grep -re
for word/phrase searching,find
to look for specific files, etc. I’ll occasionally use an IDE, typically eclipse based because embedded, but I don’t find myself missing the features they add.Of course I don’t browse the web with the command line.
That’s my point. Browsing the web with a command line tool is obnoxious - you use a GUI for tasks that you find easier/more pleasant to do with a GUI. The difference is where that line is. When I’m reviewing what work I’ve done and checking through my code for debugging statements and other cruft I don’t want to push, I prefer to have a nice tree view of my change set where I can click on an item, see what I’ve changed, select lines and stage them, select other lines and revert them, etc. I could do all of that with command line tools (though not that many have mouse support) but I already know how to do exactly what I want with VSC so why would I use anything else?
You’re already programming! Just learn the tool!
If someone is incapable of learning the tool, that’s an issue if they’re a developer. But your statement implies that everyone should use the CLI for everything. My point is that it’s a matter of preference. The CLI is not superior and GUIs aren’t superior. They’re both just tools and if you can get your job done quickly and efficiently, that’s all that should matter.
The CLI is scriptable/automatable and unambiguous when sharing instructions with coworkers. Both of these things make it very useful to know the commands. I do agree that it helps in some situations to visualize what is going on with a GUI/TUI though (neogit for nvim or magit for emacs are great if anyone is wondering), it can make things clearer at a glance.
I agree that it is a very useful skill to know how to use the CLI. I agree that every senior developer should know how and every junior should be capable of learning. I vehemently disagree that developers should use the CLI as their regular means of interacting with Git if that is not their preference.
I primarily use GitHub CLI to interact with the GitHub API, not Git. I don’t really see it as an extension of the Git CLI, which I use much more frequently. Everything you can do with it can also be done through their REST API.
I use it for things that aren’t really git features, like:
Syncing repository admin, pull request, and branch control settings across multiple repositories
Checking the status of self-hosted actions runners
Creating pull requests, auto-approving them
knowing how to program doesn’t mean u need to do things the hard way.
heck the whole point of programming is to make things easier and faster.
Checking the diff before commit, solve merge conflicts
Also if it’s well integrated into the IDE it feels less like using a separate tool. For 95% of what I do the ide/gui feels better (fetch, pull, push, commit, checkout, merge). Usually just 2-4 clicks and no need to type the branch name (ticket number and then some)
For Reflog, reset I use the terminal.
If I had to start github desktop or another seperate gui I would use the terminal that’s integrated into the IDE.
Maybe not a GUI but using a TUI (lazygit) I am certain that I can do everything faster than you could ever do using the CLI. Tbf if a GUI Tool had the same shortcuts it would also be faster.
Neither, I’m a lazygit fan
Yes, lazygit is fast as flash
using LazyGit in tmux has changed my workflow.
instead of:
git add . git commit -m 'foo' fg
i just:
g ac foo q
and it displays everything neatly
Edit: apparently greater/less than symbols dont render properly on lemmy. so imagine a few
(CR)
's and(C-b)
's sprinkled inCLI
Though I will admit it took me a while to get there
git add -i is where the true magic beginsTIL!
git log --graph --oneline --all
Magit
git-cola and my own gitea server, near perfection
You have my attention
Do they have a Linux client though?
sadly no and i don’t think it works through wine
but technically they have a mac client which is basically an expensive version of linux
Not really. It’s BSD, and even then the layout of the OS is quite far from BSD. Besides that you have a lot more technical stuff. Just use wine.
I feel those captions are the wrong way round
There are much better git UIs out there.
Definitely, last time I used github’s one it could barely do more than push and pull. I’ll almost always use a (good!) UI over the git CLI though.
No matter the GUI you use, you’re leaving a lot of useful functionality on the table. By their nature, you only get a small fraction of git’s features. There are many useful commands I use regularly that are impossible to replicate using GUIs.
It’s not like you lose access to the cli when you use a gui. I personally use both
Well one runs on Linux and the other doesn’t so…
They both do
Oh really? Well, I stand corrected then, nevermind
Removed by mod
Why am I not allowed to login to 2 GitHub remote at the same time? Answer me Microsoft