├── README.md
├── magit-cheatsheet.el
├── magit-cheatsheet.org
└── magit-cheatsheet.html


/README.md:
--------------------------------------------------------------------------------
 1 | This cheatsheet is for **version 1** of Magit and many things have
 2 | changed considerably in **version 2**, including the key bindings.  If
 3 | you are using version 2 (which you should), then instead head over to
 4 | the new [homepage](http://magit.vc), which among other things features
 5 | a [new manual](http://magit.vc/manual/magit) and a
 6 | [semi-official refcard](http://magit.vc/manual/magit-refcard.pdf.  If
 7 | you are updating from version 1 to 2, then you should also read the
 8 | [update instructions](http://magit.vc/manual/magit/Installation.html).
 9 | 
10 | Magit Cheatsheet
11 | ----------------
12 | magit is an emacs mode for git, and is crazy awesome. I've distilled the Magit User Manual into a command-centric cheatsheet for my own purposes. 
13 | 
14 | The upstream magit project updates itself every so often. If you catch it before I do, please fork and patch!
15 | 
16 | This project contains...
17 | 
18 | 1. The master org-mode file in case you feel like wrestling with org-mode's org-export-as-html and its weird set of quasi-controls in order to update the cheatsheet.
19 | 
20 | 2. The HTML output of exporting the current version of the org-mode file, so you can compare and contrast.
21 | 
22 | 3. A utility .el file. In order to get org-mode to export nicely, I had to add two user variables to my .emacs, along with a macro I used to quick-replace the TD elements with the classes they need. 
23 | 
24 | 
25 | 
26 | [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/daemianmack/magit-cheatsheet/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
27 | 
28 | 


--------------------------------------------------------------------------------
/magit-cheatsheet.el:
--------------------------------------------------------------------------------
 1 | ;; Assign CSS during export.
 2 | (setq org-export-html-style "<style type=\"text/css\">
 3 | 
 4 |   html {font-family: Times, serif; font-size: 90%;}
 5 |   .preamble {font-variant: italic; margin-bottom:40px;}
 6 |   .title {text-align: center;}
 7 | 
 8 |   h2 {margin-top:40px;
 9 |       margin-bottom:1px;
10 |       font-variant: small-caps;
11 |       background-color:#A65B5B;
12 |       color:#FFFFFF;
13 |       font-size:1.5em;
14 |       text-align:center;
15 |   }
16 | 
17 |   table {border: 0px solid transparent; width:100%;}
18 |   td {border-collapse:collapse; border: 1px solid #fff;}
19 |   td, th {vertical-align: top;}
20 |   td.command, td.description, td.notes {background-color: #F0E4E4;}
21 |   td.command, td.description {white-space: nowrap;}
22 |   td.command {font-family:monospace; font-size: 130%; font-weight: 600; width:10em;}
23 |   td.notes {color: #666; font-variant: italic;}
24 | 
25 | </style>")
26 | 
27 | 
28 | ;; Insert preamble pointing to the manual proper and my blogpost so
29 | ;; user can regenerate this however they like.
30 | (setq org-export-html-preamble "
31 | 
32 | <div class=\"preamble\">This is a distillation of the <a
33 | href=\"http://magit.github.com/magit/magit.html\">Magit user
34 | manual</a>, which has more detail than this quick cheatsheet
35 | provides. Read the user manual! Blogpost containing materials to
36 | regenerate this cheatsheet from scratch <a href="http://daemianmack.com/?p=84">here</a>.</div>
37 | 
38 | 
39 | ")
40 | 
41 | 
42 | ;; search-and-replace macro to assign necessary CSS classes to the TD
43 | ;; elements after export.
44 | (fset 'classify-tds
45 |    (lambda (&optional arg) "Keyboard macro." (interactive "p") (kmacro-exec-ring-item (quote ("^S<tr><td>^MD class=\"command\"^S<td>^MD class=\"description\"^S^SCD ^?D class=\"notes\"^A^N" 0 "%d")) arg)))
46 | 
47 | 
48 | 


--------------------------------------------------------------------------------
/magit-cheatsheet.org:
--------------------------------------------------------------------------------
  1 | #+TITLE:     Magit Cheatsheet
  2 | #+OPTIONS:   H:3 author:nil num:nil toc:t \n:t @:t ::nil |:t ^:t *:t TeX:t LaTeX:nil
  3 | #+COLUMNS:   %225ITEM %TAGS %PRIORITY %TODO
  4 | 
  5 | 
  6 | 
  7 | 
  8 | * Buffers
  9 | 
 10 | | M-x magit-status | Magit's status buffer  | The main entry point to Magit, and the context where the commands described in this cheatsheet are meant to be executed. Probably a good idea to bind magit-status to a key. |
 11 | | $                | magit-process buffer   | Behind-the-scenes. Displays the git command and its output.                                                                                                                                 |
 12 | | g                | reload status buffer   | Necessary to update an existing Magit status buffer after saving a file in emacs, or after making changes to repo outside of emacs.                                                         |
 13 | 
 14 | 
 15 | 
 16 | * Section Visibility
 17 | 
 18 | | TAB       | Toggle visibility of current section                                    |         |
 19 | | S-TAB     | Toggle visibility of current section and its children                   |         |
 20 | | 1,2,3,4   | Expand current section to the corresponding level of detail - 1, 2, 3 or 4 | e.g., 4 will show all detail for the current section. |
 21 | | M-1,2,3,4 | Expand all sections to the corresponding level of detail - 1, 2, 3 or 4 | e.g., M-4 will show all detail for the entire buffer. |
 22 | 
 23 | 
 24 | * Untracked Files
 25 | 
 26 | | s         | Add untracked file to staging area                  |         |
 27 | | i         | Add file to .gitignore                              |         |
 28 | | C-u i     | Prompt for file/directory to add to .gitignore      |         |
 29 | | I         | Add file to .git/info/exclude instead of .gitignore |         |
 30 | 
 31 | 
 32 | * Staging and Committing
 33 | 
 34 | | s         | Stage current hunk            | If point is in diff header, will stage all hunks belonging to current diff. If a region is active, only lines in that region will be staged. This is a distinct improvement on the conventional 'git add -p', the splitting mechanics of which are... 'imperfect'. |
 35 | | u         | Unstage current hunk          | As with s command, only in reverse: diff headers and regions provide a corresponding context to the unstage action.                                                                                                                                                |
 36 | | S         | Stage all hunks               |                                                                                                                                                                                                                                                                      |
 37 | | U         | Unstage all hunks             |                                                                                                                                                                                                                                                                      |
 38 | | k         | Discard uncommitted changes   | As with s command.                                                                                                                                                                                                                                                 |
 39 | | c         | Prepare for commit            | Pops up *magit-log-edit* buffer. to allow you to enter your commit message.                                                                                                                                                |
 40 | | C-c C-c   | Execute commit                | Actually triggers commit action. Fire this inside the *magit-log-edit* commit message buffer. To postpone the commit for later, just C-x b to a different buffer and come back to this buffer when you're ready,         |
 41 | | C-c C-a   | Make the next commit an amend |                                                                                                                                                                                                                                                                      |
 42 | 
 43 | 
 44 | * History
 45 | 
 46 | | l         | History                                             | Shows terse history for repository.                                                                                  |
 47 | | L         | Verbose history                                     |                                                                                                                        |
 48 | | C-u l     | History segment                                     | Will prompt for beginning and end points.                                                                            |
 49 | | RET       | Inspect commit                                      | Shows full information for commit and move point into the new buffer.                                                |
 50 | | a         | Stage current commit on your current branch         | Useful to cherrypick changes while browsing an alternative branch. Cherrypicked changes need to be committed manually. |
 51 | | A         | Commit current commit on your current branch        | As with 'a', but will automatically commit changes when there aren't any conflicts.                                    |
 52 | | C-w       | Copy sha1 of current commit into kill ring          |                                                                                                                        |
 53 | | =         | Show differences between current and marked commits |                                                                                                                        |
 54 | | ..        | Mark current commit                                 |                                                                                                                        |
 55 | | .         | Unmark current commit if marked                     |                                                                                                                        |
 56 | | C-u ..    | Unmark marked commit from anywhere                  |                                                                                                                        |
 57 | 
 58 | 
 59 | 
 60 | * Reflogs
 61 | 
 62 | | h         | Browse reflog from HEAD         | Reflog buffer works just like History buffer described above. |
 63 | | H         | Browse reflog from chosen point |                                                               |
 64 | 
 65 | 
 66 | 
 67 | * Diffing
 68 | 
 69 | | d         | Show changes between working tree and HEAD       |                                                                        |
 70 | | D         | Show changes between two arbitrary revisions     |                                                                        |
 71 | | a         | Apply current changes to working tree            | Change-selection works as described in 'Staging and Committing' above. |
 72 | | v         | Apply current changes to working tree in reverse |                                                                        |
 73 | 
 74 | 
 75 | * Tagging
 76 | 
 77 | | t         | Make lightweight tag  |                                                          |
 78 | | T         | Prepare annotated tag | Launches *magit-log-edit* buffer for writing annotation. |
 79 | | C-c C-c   | Commit annotated tag  | Actually triggers annotated tag action.                  |
 80 | 
 81 | 
 82 | 
 83 | * Resetting
 84 | 
 85 | | x         | Reset your current head to chosen revision                         | No changes will be made to working tree or staging area. Typing x while point is in a line describing a commit will offer this commit as the default revision to reset to. |
 86 | | X         | Reset working tree and staging area to most recent committed state | Destructive! Will discard all local modifications.                                                                                                                         |
 87 | 
 88 | 
 89 | 
 90 | * Stashing
 91 | 
 92 | | z         | Create new stash                    | Stashes are listed in the status buffer.                 |
 93 | | Z         | Create new stash and maintain state | Leaves current changes in working tree and staging area. |
 94 | | RET       | View stash                          |                                                          |
 95 | | a         | Apply stash                         |                                                          |
 96 | | A         | Pop stash                           |                                                          |
 97 | | k         | Drop stash                          |                                                          |
 98 | 
 99 | 
100 | 
101 | * Branching
102 | 
103 | | b         | Switch to different branch      | Current branch is indicated in header of status buffer. |
104 | | B         | Create and switch to new branch |                                                         |
105 | 
106 | 
107 | * Wazzup
108 | 
109 | | w         | Show summary of how other branches relate to current branch |         |
110 | | i         | Toggle ignore branch                                        |         |
111 | | C-u w     | Show all branches including ignored ones                    |         |
112 | 
113 | * Merging
114 | | m         | Initiate manual merge    | Applies all changes to working area and index, without committing.              |
115 | | M         | Initiate automatic merge | Applies all changes to working area and index. Commits changes immediately.     |
116 | 
117 | * Rebasing
118 | | R         | Initiate or continue a rebase         |                             |
119 | | E         | Initiate an interactive rebase        |                             |
120 | 
121 | * Rewriting
122 | | r s       | Start a rewrite                            |         |
123 | | v         | Revert a given commit                      |         |
124 | | r t       | Remove bookkeeping information from buffer |         |
125 | | r a       | Abort rewriting                       |                             |
126 | | r f       | Finish rewriting                      | Applies all unused commits. |
127 | | r *       | Toggle the * mark on a pending commit |                             |
128 | | r ..      | Toggle the . mark on a pending commit |                             |
129 | 
130 | * Pushing and Pulling
131 | | P         | git push                                | Uses default remote repository. |
132 | | C-u P     | git push to specified remote repository |                                 |
133 | | C-u C-u P | git push to specified remote as specified branch |                        |
134 | | f         | git remote update                       |                                 |
135 | | F         | git pull                                |                                 |
136 | 
137 | * Interfacing with Subversion
138 | | N r       | git svn rebase |         |
139 | | N c       | git svn dcommit |         |
140 | 


--------------------------------------------------------------------------------
/magit-cheatsheet.html:
--------------------------------------------------------------------------------
  1 | <?xml version="1.0" encoding="utf-8"?>
  2 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  3 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  4 | <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
  5 | <head>
  6 | <title>Magit Cheatsheet</title>
  7 | <!-- 2015-10-30 Fri 14:12 -->
  8 | <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
  9 | <meta  name="generator" content="Org-mode" />
 10 | <style type="text/css">
 11 |  <!--/*--><![CDATA[/*><!--*/
 12 |   html {font-family: Times, serif; font-size: 90%;}
 13 |   .preamble {font-variant: italic; margin-bottom:40px;}
 14 |   .title {text-align: center;}
 15 | 
 16 |   h2 {margin-top:40px;
 17 |       margin-bottom:1px;
 18 |       font-variant: small-caps;
 19 |       background-color:#A65B5B;
 20 |       color:#FFFFFF;
 21 |       font-size:1.5em;
 22 |       text-align:center;
 23 |   }
 24 | 
 25 |   table {border: 0px solid transparent; width:100%;}
 26 |   td {border-collapse:collapse; border: 1px solid #fff;}
 27 |   td, th {vertical-align: top;}
 28 |   td.command, td.description, td.notes {background-color: #F0E4E4;}
 29 |   td.command, td.description {white-space: nowrap;}
 30 |   td.command {font-family:monospace; font-size: 130%; font-weight: 600; width:10em;}
 31 |   td.notes {color: #666; font-variant: italic;}
 32 |   /*]]>*/-->
 33 | </style>
 34 | <script type="text/javascript">
 35 | /*
 36 | @licstart  The following is the entire license notice for the
 37 | JavaScript code in this tag.
 38 | 
 39 | Copyright (C) 2012-2013 Free Software Foundation, Inc.
 40 | 
 41 | The JavaScript code in this tag is free software: you can
 42 | redistribute it and/or modify it under the terms of the GNU
 43 | General Public License (GNU GPL) as published by the Free Software
 44 | Foundation, either version 3 of the License, or (at your option)
 45 | any later version.  The code is distributed WITHOUT ANY WARRANTY;
 46 | without even the implied warranty of MERCHANTABILITY or FITNESS
 47 | FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 48 | 
 49 | As additional permission under GNU GPL version 3 section 7, you
 50 | may distribute non-source (e.g., minimized or compacted) forms of
 51 | that code without the copy of the GNU GPL normally required by
 52 | section 4, provided you include this license notice and a URL
 53 | through which recipients can access the Corresponding Source.
 54 | 
 55 | 
 56 | @licend  The above is the entire license notice
 57 | for the JavaScript code in this tag.
 58 | */
 59 | <!--/*--><![CDATA[/*><!--*/
 60 |  function CodeHighlightOn(elem, id)
 61 |  {
 62 |    var target = document.getElementById(id);
 63 |    if(null != target) {
 64 |      elem.cacheClassElem = elem.className;
 65 |      elem.cacheClassTarget = target.className;
 66 |      target.className = "code-highlighted";
 67 |      elem.className   = "code-highlighted";
 68 |    }
 69 |  }
 70 |  function CodeHighlightOff(elem, id)
 71 |  {
 72 |    var target = document.getElementById(id);
 73 |    if(elem.cacheClassElem)
 74 |      elem.className = elem.cacheClassElem;
 75 |    if(elem.cacheClassTarget)
 76 |      target.className = elem.cacheClassTarget;
 77 |  }
 78 | /*]]>*///-->
 79 | </script>
 80 | </head>
 81 | <body>
 82 | 
 83 |   <div class="preamble">
 84 |     <h1 class="title">THIS CHEATSHEET IS OBSOLETE AS OF MAGIT V2</h2>
 85 |     <p>
 86 |       This cheatsheet is for <b>version 1</b> of Magit and many things
 87 |       have changed considerably in <b>version 2</b>, including the key
 88 |       bindings.  If you are using version 2 (which you should), then
 89 |       instead head over to the
 90 |       new <a href="http://magit.vc/">homepage</a>, which among other
 91 |       things features a <a href="http://magit.vc/manual/magit">new
 92 |         manual</a> and
 93 |       a <a href="http://magit.vc/manual/magit-refcard.pdf">semi-official
 94 |         refcard</a>.  If you are updating from version 1 to 2, then you
 95 |       should also read
 96 |       the <a href="http://magit.vc/manual/magit/Installation.html">update
 97 |         instructions</a>.
 98 |     </p>
 99 |   </div>
100 |   
101 | <div id="content">
102 | <h1 class="title">Magit Cheatsheet</h1>
103 | <div id="table-of-contents">
104 | <h2>Table of Contents</h2>
105 | <div id="text-table-of-contents">
106 | <ul>
107 | <li><a href="#sec-1">Buffers</a></li>
108 | <li><a href="#sec-2">Section Visibility</a></li>
109 | <li><a href="#sec-3">Untracked Files</a></li>
110 | <li><a href="#sec-4">Staging and Committing</a></li>
111 | <li><a href="#sec-5">History</a></li>
112 | <li><a href="#sec-6">Reflogs</a></li>
113 | <li><a href="#sec-7">Diffing</a></li>
114 | <li><a href="#sec-8">Tagging</a></li>
115 | <li><a href="#sec-9">Resetting</a></li>
116 | <li><a href="#sec-10">Stashing</a></li>
117 | <li><a href="#sec-11">Branching</a></li>
118 | <li><a href="#sec-12">Wazzup</a></li>
119 | <li><a href="#sec-13">Merging</a></li>
120 | <li><a href="#sec-14">Rebasing</a></li>
121 | <li><a href="#sec-15">Rewriting</a></li>
122 | <li><a href="#sec-16">Pushing and Pulling</a></li>
123 | <li><a href="#sec-17">Interfacing with Subversion</a></li>
124 | </ul>
125 | </div>
126 | </div>
127 | 
128 | 
129 | 
130 | 
131 | <div id="outline-container-sec-1" class="outline-2">
132 | <h2 id="sec-1">Buffers</h2>
133 | <div class="outline-text-2" id="text-1">
134 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
135 | 
136 | 
137 | <colgroup>
138 | <col  class="left" />
139 | 
140 | <col  class="left" />
141 | 
142 | <col  class="left" />
143 | </colgroup>
144 | <tbody>
145 | <tr>
146 | <td class="command">M-x magit-status</td>
147 | <td class="description">Magit's status buffer</td>
148 | <td class="notes">The main entry point to Magit, and the context where the commands described in this cheatsheet are meant to be executed. Probably a good idea to bind magit-status to a key.</td>
149 | </tr>
150 | 
151 | <tr>
152 | <td class="command">$</td>
153 | <td class="description">magit-process buffer</td>
154 | <td class="notes">Behind-the-scenes. Displays the git command and its output.</td>
155 | </tr>
156 | 
157 | <tr>
158 | <td class="command">g</td>
159 | <td class="description">reload status buffer</td>
160 | <td class="notes">Necessary to update an existing Magit status buffer after saving a file in emacs, or after making changes to repo outside of emacs.</td>
161 | </tr>
162 | </tbody>
163 | </table>
164 | </div>
165 | </div>
166 | 
167 | 
168 | 
169 | <div id="outline-container-sec-2" class="outline-2">
170 | <h2 id="sec-2">Section Visibility</h2>
171 | <div class="outline-text-2" id="text-2">
172 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
173 | 
174 | 
175 | <colgroup>
176 | <col  class="left" />
177 | 
178 | <col  class="left" />
179 | 
180 | <col  class="left" />
181 | </colgroup>
182 | <tbody>
183 | <tr>
184 | <td class="command">TAB</td>
185 | <td class="description">Toggle visibility of current section</td>
186 | <td class="notes">&#xa0;</td>
187 | </tr>
188 | 
189 | <tr>
190 | <td class="command">S-TAB</td>
191 | <td class="description">Toggle visibility of current section and its children</td>
192 | <td class="notes">&#xa0;</td>
193 | </tr>
194 | 
195 | <tr>
196 | <td class="command">1,2,3,4</td>
197 | <td class="description">Expand current section to the corresponding level of detail - 1, 2, 3 or 4</td>
198 | <td class="notes">e.g., 4 will show all detail for the current section.</td>
199 | </tr>
200 | 
201 | <tr>
202 | <td class="command">M-1,2,3,4</td>
203 | <td class="description">Expand all sections to the corresponding level of detail - 1, 2, 3 or 4</td>
204 | <td class="notes">e.g., M-4 will show all detail for the entire buffer.</td>
205 | </tr>
206 | </tbody>
207 | </table>
208 | </div>
209 | </div>
210 | 
211 | 
212 | <div id="outline-container-sec-3" class="outline-2">
213 | <h2 id="sec-3">Untracked Files</h2>
214 | <div class="outline-text-2" id="text-3">
215 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
216 | 
217 | 
218 | <colgroup>
219 | <col  class="left" />
220 | 
221 | <col  class="left" />
222 | 
223 | <col  class="left" />
224 | </colgroup>
225 | <tbody>
226 | <tr>
227 | <td class="command">s</td>
228 | <td class="description">Add untracked file to staging area</td>
229 | <td class="notes">&#xa0;</td>
230 | </tr>
231 | 
232 | <tr>
233 | <td class="command">i</td>
234 | <td class="description">Add file to .gitignore</td>
235 | <td class="notes">&#xa0;</td>
236 | </tr>
237 | 
238 | <tr>
239 | <td class="command">C-u i</td>
240 | <td class="description">Prompt for file/directory to add to .gitignore</td>
241 | <td class="notes">&#xa0;</td>
242 | </tr>
243 | 
244 | <tr>
245 | <td class="command">I</td>
246 | <td class="description">Add file to .git/info/exclude instead of .gitignore</td>
247 | <td class="notes">&#xa0;</td>
248 | </tr>
249 | </tbody>
250 | </table>
251 | </div>
252 | </div>
253 | 
254 | 
255 | <div id="outline-container-sec-4" class="outline-2">
256 | <h2 id="sec-4">Staging and Committing</h2>
257 | <div class="outline-text-2" id="text-4">
258 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
259 | 
260 | 
261 | <colgroup>
262 | <col  class="left" />
263 | 
264 | <col  class="left" />
265 | 
266 | <col  class="left" />
267 | </colgroup>
268 | <tbody>
269 | <tr>
270 | <td class="command">s</td>
271 | <td class="description">Stage current hunk</td>
272 | <td class="notes">If point is in diff header, will stage all hunks belonging to current diff. If a region is active, only lines in that region will be staged. This is a distinct improvement on the conventional 'git add -p', the splitting mechanics of which are&#x2026; 'imperfect'.</td>
273 | </tr>
274 | 
275 | <tr>
276 | <td class="command">u</td>
277 | <td class="description">Unstage current hunk</td>
278 | <td class="notes">As with s command, only in reverse: diff headers and regions provide a corresponding context to the unstage action.</td>
279 | </tr>
280 | 
281 | <tr>
282 | <td class="command">S</td>
283 | <td class="description">Stage all hunks</td>
284 | <td class="notes">&#xa0;</td>
285 | </tr>
286 | 
287 | <tr>
288 | <td class="command">U</td>
289 | <td class="description">Unstage all hunks</td>
290 | <td class="notes">&#xa0;</td>
291 | </tr>
292 | 
293 | <tr>
294 | <td class="command">k</td>
295 | <td class="description">Discard uncommitted changes</td>
296 | <td class="notes">As with s command.</td>
297 | </tr>
298 | 
299 | <tr>
300 | <td class="command">c</td>
301 | <td class="description">Prepare for commit</td>
302 | <td class="notes">Pops up <b>magit-log-edit</b> buffer. to allow you to enter your commit message.</td>
303 | </tr>
304 | 
305 | <tr>
306 | <td class="command">C-c C-c</td>
307 | <td class="description">Execute commit</td>
308 | <td class="notes">Actually triggers commit action. Fire this inside the <b>magit-log-edit</b> commit message buffer. To postpone the commit for later, just C-x b to a different buffer and come back to this buffer when you're ready,</td>
309 | </tr>
310 | 
311 | <tr>
312 | <td class="command">C-c C-a</td>
313 | <td class="description">Make the next commit an amend</td>
314 | <td class="notes">&#xa0;</td>
315 | </tr>
316 | </tbody>
317 | </table>
318 | </div>
319 | </div>
320 | 
321 | 
322 | <div id="outline-container-sec-5" class="outline-2">
323 | <h2 id="sec-5">History</h2>
324 | <div class="outline-text-2" id="text-5">
325 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
326 | 
327 | 
328 | <colgroup>
329 | <col  class="left" />
330 | 
331 | <col  class="left" />
332 | 
333 | <col  class="left" />
334 | </colgroup>
335 | <tbody>
336 | <tr>
337 | <td class="command">l</td>
338 | <td class="description">History</td>
339 | <td class="notes">Shows terse history for repository.</td>
340 | </tr>
341 | 
342 | <tr>
343 | <td class="command">L</td>
344 | <td class="description">Verbose history</td>
345 | <td class="notes">&#xa0;</td>
346 | </tr>
347 | 
348 | <tr>
349 | <td class="command">C-u l</td>
350 | <td class="description">History segment</td>
351 | <td class="notes">Will prompt for beginning and end points.</td>
352 | </tr>
353 | 
354 | <tr>
355 | <td class="command">RET</td>
356 | <td class="description">Inspect commit</td>
357 | <td class="notes">Shows full information for commit and move point into the new buffer.</td>
358 | </tr>
359 | 
360 | <tr>
361 | <td class="command">a</td>
362 | <td class="description">Stage current commit on your current branch</td>
363 | <td class="notes">Useful to cherrypick changes while browsing an alternative branch. Cherrypicked changes need to be committed manually.</td>
364 | </tr>
365 | 
366 | <tr>
367 | <td class="command">A</td>
368 | <td class="description">Commit current commit on your current branch</td>
369 | <td class="notes">As with 'a', but will automatically commit changes when there aren't any conflicts.</td>
370 | </tr>
371 | 
372 | <tr>
373 | <td class="command">C-w</td>
374 | <td class="description">Copy sha1 of current commit into kill ring</td>
375 | <td class="notes">&#xa0;</td>
376 | </tr>
377 | 
378 | <tr>
379 | <td class="command">=</td>
380 | <td class="description">Show differences between current and marked commits</td>
381 | <td class="notes">&#xa0;</td>
382 | </tr>
383 | 
384 | <tr>
385 | <td class="command">..</td>
386 | <td class="description">Mark current commit</td>
387 | <td class="notes">&#xa0;</td>
388 | </tr>
389 | 
390 | <tr>
391 | <td class="command">.</td>
392 | <td class="description">Unmark current commit if marked</td>
393 | <td class="notes">&#xa0;</td>
394 | </tr>
395 | 
396 | <tr>
397 | <td class="command">C-u ..</td>
398 | <td class="description">Unmark marked commit from anywhere</td>
399 | <td class="notes">&#xa0;</td>
400 | </tr>
401 | </tbody>
402 | </table>
403 | </div>
404 | </div>
405 | 
406 | 
407 | 
408 | <div id="outline-container-sec-6" class="outline-2">
409 | <h2 id="sec-6">Reflogs</h2>
410 | <div class="outline-text-2" id="text-6">
411 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
412 | 
413 | 
414 | <colgroup>
415 | <col  class="left" />
416 | 
417 | <col  class="left" />
418 | 
419 | <col  class="left" />
420 | </colgroup>
421 | <tbody>
422 | <tr>
423 | <td class="command">h</td>
424 | <td class="description">Browse reflog from HEAD</td>
425 | <td class="notes">Reflog buffer works just like History buffer described above.</td>
426 | </tr>
427 | 
428 | <tr>
429 | <td class="command">H</td>
430 | <td class="description">Browse reflog from chosen point</td>
431 | <td class="notes">&#xa0;</td>
432 | </tr>
433 | </tbody>
434 | </table>
435 | </div>
436 | </div>
437 | 
438 | 
439 | 
440 | <div id="outline-container-sec-7" class="outline-2">
441 | <h2 id="sec-7">Diffing</h2>
442 | <div class="outline-text-2" id="text-7">
443 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
444 | 
445 | 
446 | <colgroup>
447 | <col  class="left" />
448 | 
449 | <col  class="left" />
450 | 
451 | <col  class="left" />
452 | </colgroup>
453 | <tbody>
454 | <tr>
455 | <td class="command">d</td>
456 | <td class="description">Show changes between working tree and HEAD</td>
457 | <td class="notes">&#xa0;</td>
458 | </tr>
459 | 
460 | <tr>
461 | <td class="command">D</td>
462 | <td class="description">Show changes between two arbitrary revisions</td>
463 | <td class="notes">&#xa0;</td>
464 | </tr>
465 | 
466 | <tr>
467 | <td class="command">a</td>
468 | <td class="description">Apply current changes to working tree</td>
469 | <td class="notes">Change-selection works as described in 'Staging and Committing' above.</td>
470 | </tr>
471 | 
472 | <tr>
473 | <td class="command">v</td>
474 | <td class="description">Apply current changes to working tree in reverse</td>
475 | <td class="notes">&#xa0;</td>
476 | </tr>
477 | </tbody>
478 | </table>
479 | </div>
480 | </div>
481 | 
482 | 
483 | <div id="outline-container-sec-8" class="outline-2">
484 | <h2 id="sec-8">Tagging</h2>
485 | <div class="outline-text-2" id="text-8">
486 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
487 | 
488 | 
489 | <colgroup>
490 | <col  class="left" />
491 | 
492 | <col  class="left" />
493 | 
494 | <col  class="left" />
495 | </colgroup>
496 | <tbody>
497 | <tr>
498 | <td class="command">t</td>
499 | <td class="description">Make lightweight tag</td>
500 | <td class="notes">&#xa0;</td>
501 | </tr>
502 | 
503 | <tr>
504 | <td class="command">T</td>
505 | <td class="description">Prepare annotated tag</td>
506 | <td class="notes">Launches <b>magit-log-edit</b> buffer for writing annotation.</td>
507 | </tr>
508 | 
509 | <tr>
510 | <td class="command">C-c C-c</td>
511 | <td class="description">Commit annotated tag</td>
512 | <td class="notes">Actually triggers annotated tag action.</td>
513 | </tr>
514 | </tbody>
515 | </table>
516 | </div>
517 | </div>
518 | 
519 | 
520 | 
521 | <div id="outline-container-sec-9" class="outline-2">
522 | <h2 id="sec-9">Resetting</h2>
523 | <div class="outline-text-2" id="text-9">
524 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
525 | 
526 | 
527 | <colgroup>
528 | <col  class="left" />
529 | 
530 | <col  class="left" />
531 | 
532 | <col  class="left" />
533 | </colgroup>
534 | <tbody>
535 | <tr>
536 | <td class="command">x</td>
537 | <td class="description">Reset your current head to chosen revision</td>
538 | <td class="notes">No changes will be made to working tree or staging area. Typing x while point is in a line describing a commit will offer this commit as the default revision to reset to.</td>
539 | </tr>
540 | 
541 | <tr>
542 | <td class="command">X</td>
543 | <td class="description">Reset working tree and staging area to most recent committed state</td>
544 | <td class="notes">Destructive! Will discard all local modifications.</td>
545 | </tr>
546 | </tbody>
547 | </table>
548 | </div>
549 | </div>
550 | 
551 | 
552 | 
553 | <div id="outline-container-sec-10" class="outline-2">
554 | <h2 id="sec-10">Stashing</h2>
555 | <div class="outline-text-2" id="text-10">
556 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
557 | 
558 | 
559 | <colgroup>
560 | <col  class="left" />
561 | 
562 | <col  class="left" />
563 | 
564 | <col  class="left" />
565 | </colgroup>
566 | <tbody>
567 | <tr>
568 | <td class="command">z</td>
569 | <td class="description">Create new stash</td>
570 | <td class="notes">Stashes are listed in the status buffer.</td>
571 | </tr>
572 | 
573 | <tr>
574 | <td class="command">Z</td>
575 | <td class="description">Create new stash and maintain state</td>
576 | <td class="notes">Leaves current changes in working tree and staging area.</td>
577 | </tr>
578 | 
579 | <tr>
580 | <td class="command">RET</td>
581 | <td class="description">View stash</td>
582 | <td class="notes">&#xa0;</td>
583 | </tr>
584 | 
585 | <tr>
586 | <td class="command">a</td>
587 | <td class="description">Apply stash</td>
588 | <td class="notes">&#xa0;</td>
589 | </tr>
590 | 
591 | <tr>
592 | <td class="command">A</td>
593 | <td class="description">Pop stash</td>
594 | <td class="notes">&#xa0;</td>
595 | </tr>
596 | 
597 | <tr>
598 | <td class="command">k</td>
599 | <td class="description">Drop stash</td>
600 | <td class="notes">&#xa0;</td>
601 | </tr>
602 | </tbody>
603 | </table>
604 | </div>
605 | </div>
606 | 
607 | 
608 | 
609 | <div id="outline-container-sec-11" class="outline-2">
610 | <h2 id="sec-11">Branching</h2>
611 | <div class="outline-text-2" id="text-11">
612 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
613 | 
614 | 
615 | <colgroup>
616 | <col  class="left" />
617 | 
618 | <col  class="left" />
619 | 
620 | <col  class="left" />
621 | </colgroup>
622 | <tbody>
623 | <tr>
624 | <td class="command">b</td>
625 | <td class="description">Switch to different branch</td>
626 | <td class="notes">Current branch is indicated in header of status buffer.</td>
627 | </tr>
628 | 
629 | <tr>
630 | <td class="command">B</td>
631 | <td class="description">Create and switch to new branch</td>
632 | <td class="notes">&#xa0;</td>
633 | </tr>
634 | </tbody>
635 | </table>
636 | </div>
637 | </div>
638 | 
639 | 
640 | <div id="outline-container-sec-12" class="outline-2">
641 | <h2 id="sec-12">Wazzup</h2>
642 | <div class="outline-text-2" id="text-12">
643 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
644 | 
645 | 
646 | <colgroup>
647 | <col  class="left" />
648 | 
649 | <col  class="left" />
650 | 
651 | <col  class="left" />
652 | </colgroup>
653 | <tbody>
654 | <tr>
655 | <td class="command">w</td>
656 | <td class="description">Show summary of how other branches relate to current branch</td>
657 | <td class="notes">&#xa0;</td>
658 | </tr>
659 | 
660 | <tr>
661 | <td class="command">i</td>
662 | <td class="description">Toggle ignore branch</td>
663 | <td class="notes">&#xa0;</td>
664 | </tr>
665 | 
666 | <tr>
667 | <td class="command">C-u w</td>
668 | <td class="description">Show all branches including ignored ones</td>
669 | <td class="notes">&#xa0;</td>
670 | </tr>
671 | </tbody>
672 | </table>
673 | </div>
674 | </div>
675 | 
676 | <div id="outline-container-sec-13" class="outline-2">
677 | <h2 id="sec-13">Merging</h2>
678 | <div class="outline-text-2" id="text-13">
679 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
680 | 
681 | 
682 | <colgroup>
683 | <col  class="left" />
684 | 
685 | <col  class="left" />
686 | 
687 | <col  class="left" />
688 | </colgroup>
689 | <tbody>
690 | <tr>
691 | <td class="command">m</td>
692 | <td class="description">Initiate manual merge</td>
693 | <td class="notes">Applies all changes to working area and index, without committing.</td>
694 | </tr>
695 | 
696 | <tr>
697 | <td class="command">M</td>
698 | <td class="description">Initiate automatic merge</td>
699 | <td class="notes">Applies all changes to working area and index. Commits changes immediately.</td>
700 | </tr>
701 | </tbody>
702 | </table>
703 | </div>
704 | </div>
705 | 
706 | <div id="outline-container-sec-14" class="outline-2">
707 | <h2 id="sec-14">Rebasing</h2>
708 | <div class="outline-text-2" id="text-14">
709 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
710 | 
711 | 
712 | <colgroup>
713 | <col  class="left" />
714 | 
715 | <col  class="left" />
716 | 
717 | <col  class="left" />
718 | </colgroup>
719 | <tbody>
720 | <tr>
721 | <td class="command">R</td>
722 | <td class="description">Initiate or continue a rebase</td>
723 | <td class="notes">&#xa0;</td>
724 | </tr>
725 | 
726 | <tr>
727 | <td class="command">E</td>
728 | <td class="description">Initiate an interactive rebase</td>
729 | <td class="notes">&#xa0;</td>
730 | </tr>
731 | </tbody>
732 | </table>
733 | </div>
734 | </div>
735 | 
736 | <div id="outline-container-sec-15" class="outline-2">
737 | <h2 id="sec-15">Rewriting</h2>
738 | <div class="outline-text-2" id="text-15">
739 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
740 | 
741 | 
742 | <colgroup>
743 | <col  class="left" />
744 | 
745 | <col  class="left" />
746 | 
747 | <col  class="left" />
748 | </colgroup>
749 | <tbody>
750 | <tr>
751 | <td class="command">r s</td>
752 | <td class="description">Start a rewrite</td>
753 | <td class="notes">&#xa0;</td>
754 | </tr>
755 | 
756 | <tr>
757 | <td class="command">v</td>
758 | <td class="description">Revert a given commit</td>
759 | <td class="notes">&#xa0;</td>
760 | </tr>
761 | 
762 | <tr>
763 | <td class="command">r t</td>
764 | <td class="description">Remove bookkeeping information from buffer</td>
765 | <td class="notes">&#xa0;</td>
766 | </tr>
767 | 
768 | <tr>
769 | <td class="command">r a</td>
770 | <td class="description">Abort rewriting</td>
771 | <td class="notes">&#xa0;</td>
772 | </tr>
773 | 
774 | <tr>
775 | <td class="command">r f</td>
776 | <td class="description">Finish rewriting</td>
777 | <td class="notes">Applies all unused commits.</td>
778 | </tr>
779 | 
780 | <tr>
781 | <td class="command">r *</td>
782 | <td class="description">Toggle the * mark on a pending commit</td>
783 | <td class="notes">&#xa0;</td>
784 | </tr>
785 | 
786 | <tr>
787 | <td class="command">r ..</td>
788 | <td class="description">Toggle the . mark on a pending commit</td>
789 | <td class="notes">&#xa0;</td>
790 | </tr>
791 | </tbody>
792 | </table>
793 | </div>
794 | </div>
795 | 
796 | <div id="outline-container-sec-16" class="outline-2">
797 | <h2 id="sec-16">Pushing and Pulling</h2>
798 | <div class="outline-text-2" id="text-16">
799 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
800 | 
801 | 
802 | <colgroup>
803 | <col  class="left" />
804 | 
805 | <col  class="left" />
806 | 
807 | <col  class="left" />
808 | </colgroup>
809 | <tbody>
810 | <tr>
811 | <td class="command">P</td>
812 | <td class="description">git push</td>
813 | <td class="notes">Uses default remote repository.</td>
814 | </tr>
815 | 
816 | <tr>
817 | <td class="command">C-u P</td>
818 | <td class="description">git push to specified remote repository</td>
819 | <td class="notes">&#xa0;</td>
820 | </tr>
821 | 
822 | <tr>
823 | <td class="command">C-u C-u P</td>
824 | <td class="description">git push to specified remote as specified branch</td>
825 | <td class="notes">&#xa0;</td>
826 | </tr>
827 | 
828 | <tr>
829 | <td class="command">f</td>
830 | <td class="description">git remote update</td>
831 | <td class="notes">&#xa0;</td>
832 | </tr>
833 | 
834 | <tr>
835 | <td class="command">F</td>
836 | <td class="description">git pull</td>
837 | <td class="notes">&#xa0;</td>
838 | </tr>
839 | </tbody>
840 | </table>
841 | </div>
842 | </div>
843 | 
844 | <div id="outline-container-sec-17" class="outline-2">
845 | <h2 id="sec-17">Interfacing with Subversion</h2>
846 | <div class="outline-text-2" id="text-17">
847 | <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
848 | 
849 | 
850 | <colgroup>
851 | <col  class="left" />
852 | 
853 | <col  class="left" />
854 | 
855 | <col  class="left" />
856 | </colgroup>
857 | <tbody>
858 | <tr>
859 | <td class="command">N r</td>
860 | <td class="description">git svn rebase</td>
861 | <td class="notes">&#xa0;</td>
862 | </tr>
863 | 
864 | <tr>
865 | <td class="command">N c</td>
866 | <td class="description">git svn dcommit</td>
867 | <td class="notes">&#xa0;</td>
868 | </tr>
869 | </tbody>
870 | </table>
871 | </div>
872 | </div>
873 | </div>
874 | <div id="postamble" class="status">
875 | <p class="date">Created: 2015-10-30 Fri 14:12</p>
876 | <p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10)</p>
877 | <p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
878 | </div>
879 | </body>
880 | </html>
881 | 


--------------------------------------------------------------------------------