I’m wondering if you use any (graphical) clients to manage your Git, and if so, what client you use.
I myself have to use git professionally across all 3 major OS-es, and I currently use Sourcetree on Windows and macOS, and the Git tools built-in into IntelliJ on Linux.
Have given MaGit a try, but just couldn’t get all the shortcuts to stick in my mind.
Interested to hear your experiences!
I will install emacs on a machine just to use magit.
Off topic: day-after-day with these kinds of posts and especially the replies, I need Reddit less and less. That’s a very good thing.
Sorry, guess the replies are too tame. Let me help you with that.
Anything more than the
gitCLI is a joke. Real developers should know how to raw-dog that thing. If you’re not octopus merging your rebased branches to deploy to prod, you’re just not a real developer.(I use
gitui)Fair comment.
IANA developer at all. Mostly just keeping records of my dotfiles and odd bits I have playing with., and the experiments I try to run using branches. Sometimes I need a visual representation of the commits and hashes to make it easier to understand what I’m doing.
git is my only nemesis.
I have tortoise git on a windows machine and GitHub desktop on a Mac. I do some things from the command line when I’m not feeling lazy.
I’m an Emacs users, so unsurprisingly I use magit, but perhaps surprisingly I use it sparingly, using Emacs’s VC most of the time.
When I learned Git I think there were not decent tools, so I got used to the command line.
I occasionally use gitk for reviewing my commits- it’s nicer to see the files modified and be able to jump back and forth, although I get I could use
git log -pinstead.I’m an Emacs user, but I don’t use magit (!)
I like some of the graphical tools- some colleagues use Fork and I like it… but as I’ve already learned the CLI, I don’t see the point for me.
I could use learning some jj because it automates some of the most tedious parts of my workflow, but I’m getting too old.
Git cola
Git Graph VS Code extension
I’ve used source tree, gitkraken, etc. this simple extension is just as good. I spend most my day with it
Git Graph VS Code extension
I’ve used source tree, gitkraken, etc. this simple extension is just as good. I spend most my day with it
I use VSCode and SourceGit. SourceGit is similar to Fork (which I’ve used before), but it’s FOSS and cross-platform (Windows/macOS/Linux).
Tried idea community edition, honestly not bad, like vs code slightly more even tho with an extension or two you can make how they function very similar. Wanted to use idea because it matched the gtk theme, but if I was gonna use an extension for vs code like navigation might as well use vs code. Both easy to use with git as a dabbler.
vscode with edamagit and the cli
The cli because it is consistent everywhere and has all fearures
The only thing I’m missing in the CLI is easy picking and choosing which change to include in a commit on a more fine grained basis than files. I sometimes have a changed file and the changes fix different issues and thus should get separate commits but with the CLI I can’t easily select the changes to be staged. At least not AFAIK.
Edit: Richards law of posting something wrong to get fast correct answers seems to stay true, even on lemmy. Thanks for teaching me something today <3
Uhhh,
git add -p?the best git command
Hard agree haha, use this one constantly.
You can via git add -i foo.bar
I believe the only issue with that is that it can only go by hunks. If your changes are sufficiently far away, you can select them separately. But if you change one function that should be in patch a, and another function 5 lines down that should be in patch b, I think you’re screwed
That being said, this is all from memory, so don’t quote me on it
In interactive add mode you can use
sto split a hunk, andeto edit it. That’s usually enough for me to split things up.I usually use
git add -pto selectively stage hunks. But ingit add -iI think running thepatchcommand does the same thing to get into patch mode.If patch mode shows you a hunk, and you only want some of the lines you can press
sto split into smaller hunks. Then you’ll be prompted whether to add each smaller hunk separately.If you want to stage a change that is on the same line as a change you don’t want to stage, or on an adjacent line, then you need to use
eto edit the hunk. Git stages whatever changes are left when you’re done editing. The file in the working tree on disk is unchanged.
Same, because its UX is actually really good. Years ago when I was new to git, I tried to use Sourcetree to revert a merge commit, and it would just fail. When I tried it in the CLI, it still failed, but it told me how to fix it. (I needed to specify which parent)
That, plus it’s scriptable, plus I’m in the terminal a lot anyway. I’ll also use the IDE git client sometimes if that’s where I am at the moment.
CLI first here too, for the same reason.
I’m not above using an editor plugin if it’s simple and reliable and right there waiting, like VSCodium.
Jah, mein fearures
Lazygit.
It’s what I use when I need a bit of a UI for some things. I use the terminal mostly but Lazygit is great.
It just works really well. I don’t mind the terminal commands but lazygit makes using git just so much nicer
I mostly use
gitfrom the cli, but when I want to use a frontend, I uselazygit. (I just find it easier to use TUI for some things like only committing some of the changed files, squashing, or fixup commits.)It works great from neovim so I’ve been using it a lot more since.
I mostly use git from the console.
- git with a bunch of aliases for common operations and making the log pretty.
- gitk when I need a UI to browse the history
- kdiff3 as mergetool
Mostly Magit, some CLI
Same. Magit 99% of the time and CLI for the one percent where I need to run an obscure command. Magit is genuinely one of the best things in Emacs besides org mode.
Magit is fantastic!!
