dr_renormalizer, 4 months ago

@inthehands I'm not a software dev, or even a heavy-user of git (by which I mean doing things like rebasing and dealing with merge conflicts), but I've been using Magit on #Emacs: https://emacsair.me/2017/09/01/magit-walk-through/

It's made using git very simple for me. I generally just update notes and dotfiles, and my workflow is something like:

• Do "M-x magit" (which I've bound to my "F6" key)
• Enter the path to the repository I'm interested in, and get a magit buffer
• Scroll to the files listed under the "Unstaged changes" headline
• Hit "S" on the ones I want to stage for a commit (or I can even just select individual changes within a single file that I want to stage)
• Scroll to "Stage changes", remove unwanted changes in the commit if necessary (by hitting "S") and then committing the changes by doing "C-c C-c"
• Typing out a commit message and doing "C-c C-c" again
• Hitting "P" to push my changes to my chosen remote.

You can also do things like "magit-log" within a file etc.

#magit

daniel, 4 months ago

@inthehands im a big fan of Tower. It’s mac-native, it’s really well crafted, and it’s fast and clean. It’s a paid app, but there’s a free trial and I believe it’s worth every cent https://www.git-tower.com/mac

natknight, 4 months ago

@inthehands I've had good experience with Magit in Emacs (though it's sometimes VERY slow) and Sourcetree.

https://magit.vc/
https://www.sourcetreeapp.com/

finestructure, 4 months ago

@inthehands Try @fork_dev. You can select line ranges and stage/unstage them by hitting return. Not sure if that meets your requirements, because return is technically a button 😅

Fork is the best git client I’ve ever used, by far.

ParadeGrotesque, 4 months ago

@inthehands

If you live on the command line, I also recommend tig, that you can install with your favourite packaging system for MacOS.

pkgsrc has it, and MacBrew as well:

https://pkgsrc.se/devel/tig
https://formulae.brew.sh/formula/tig

ParadeGrotesque, 4 months ago

@inthehands

I have used SourceTree with some success in the past - I do not know if it fits your needs though...

https://www.sourcetreeapp.com/