:PROPERTIES: :ID: 2ab0fa3f-8ac6-4af2-8cd4-1dd490fb19c3 :END: #+title: Emacs Magit #+filetags: :emacs:git:guide: * Magit Key Guide (Quick Reference) ** Open Magit - C-x g :: Open Magit status buffer ** Staging & Unstaging - s :: Stage (file or hunk) - u :: Unstage - S :: Stage all - U :: Unstage all ** Committing - c c :: Commit - C-c C-c :: Confirm commit (in commit buffer) - c a :: Amend last commit ** Branching - b b :: Switch branch - b c :: Create new branch - b m :: Merge into current - b M :: Rebase onto another branch ** Push / Pull - P u :: Push to upstream - F u :: Pull from upstream - f u :: Fetch from upstream ** Logs & Diffs - l l :: Show log for current branch - d :: Show diff (between commits, etc.) - RET :: View diff at point ** Help & Dispatch - ? :: Show help for current buffer - x :: Open Magit dispatch menu (magit-dispatch) - ! :: Run Git command (rebase, cherry-pick, etc.) ** Other Essentials - k :: Discard changes (careful) - q :: Quit Magit buffer