Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Manual fixes.

  • Loading branch information...
commit a21e998bac99338242c4225b929fd236d28199eb 1 parent bc82696
Marius Vollmer authored

Showing 1 changed file with 6 additions and 4 deletions. Show diff stats Hide diff stats

  1. +6 4 magit.texi
10 magit.texi
@@ -31,8 +31,10 @@ as an extension to Emacs.
31 31 * Introduction::
32 32 * Status::
33 33 * History::
  34 +* Diffing::
34 35 * Resetting::
35   -* Branching and Merging::
  36 +* Branching::
  37 +* Merging::
36 38 * Rebasing::
37 39 * Pushing and Pulling::
38 40 @end menu
@@ -211,15 +213,15 @@ Type @kbd{X} to reset your working tree and staging area to the most
211 213 recently committed state. This will discard your local modifications,
212 214 so be careful.
213 215
214   -@node Branching and Merging
215   -@chapter Branching and Merging
  216 +@node Branching
  217 +@chapter Branching
216 218
217 219 The current branch is indicated in the header of the status buffer.
218 220 You can switch to a different branch by typing @kbd{b}. This will
219 221 immediately checkout the branch into your working copy, so you
220 222 shouldn't have any local modifications when switching branches.
221 223
222   -Similar to @kbs{x}, typing @kbd{b} while point is at a commit
  224 +Similar to @kbd{x}, typing @kbd{b} while point is at a commit
223 225 description will offer that commit as the default to switch to.
224 226 This will result in a detached head.
225 227

0 comments on commit a21e998

Please sign in to comment.
Something went wrong with that request. Please try again.