dr_renormalizer,

@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

  • All
  • Subscribed
  • Moderated
  • Favorites
  • random
  • ngwrru68w68
  • rosin
  • GTA5RPClips
  • osvaldo12
  • love
  • Youngstown
  • slotface
  • khanakhh
  • everett
  • kavyap
  • mdbf
  • DreamBathrooms
  • thenastyranch
  • magazineikmin
  • megavids
  • InstantRegret
  • normalnudes
  • tacticalgear
  • cubers
  • ethstaker
  • modclub
  • cisconetworking
  • Durango
  • anitta
  • Leos
  • tester
  • provamag3
  • JUstTest
  • All magazines