Magit

Overview

Magit is the integrated Git Package for Emacs. You can use the full Git functionalty from inside Emacs.

Content

Basic Commands

• C-x g - open the status buffer
• g - refresh the status buffer
• cursor on commit - RET - show commit details
• q - quit Magit buffer
• cursor on commit - d - d - show dif of commit

Init Git Project

• in a non-git project dir → C-x g
  • choose dir to create project from

Connect to a existing Repository

• in Magit status buffer (C-x g)
  • M - open Remotes buffer
  • a - add Remote
  • choose name (origin)
  • add URL from GitHub or other service
• now you can Fetch from the Remote Repo
  • F - for Fetch Buffer
• or Push directly to it
  • P - open Push Buffer

Adding and Commiting

• call / refresh the status buffer
  • C-x g - open status buffer
  • g - refresh the status buffer
• stage changes
  • cursor on change - s - stage a single change
  • S - stage all changes
  • cursor on staged change - u - unstage single change
  • U - unstage all changes
• commit changes
  • c c - commit changes
  • add description
    • first line: headline
    • third line: description
  • C-c C-c - finish commit

Push Changes to Repository

• P - open push buffer

Branching

Create a new branch

• b - open branch overview
  • n - for new branch
  • choose a branch from which you want to create a new branch
  • give it a name
• b l - checkout new branch

Merging

• go to branch you want to merge to
  • b - open branch overview
  • l - choose local branch
• open merge overview m
  • m - choose branch to merge from

Pulling

• F - open pull overview

Stashing

• z - stash menu

Checkout

Checkout Commit

• l l - go to log menu on current branch
• set cursor on commit you want to checkout
• b b and choos commit id

Footer

Links

• Magit Website