Manual fixes.

This commit is contained in:
Marius Vollmer 2008-08-17 02:59:15 +03:00
parent bc8269606b
commit a21e998bac

View file

@ -31,8 +31,10 @@ as an extension to Emacs.
* Introduction:: * Introduction::
* Status:: * Status::
* History:: * History::
* Diffing::
* Resetting:: * Resetting::
* Branching and Merging:: * Branching::
* Merging::
* Rebasing:: * Rebasing::
* Pushing and Pulling:: * Pushing and Pulling::
@end menu @end menu
@ -211,15 +213,15 @@ Type @kbd{X} to reset your working tree and staging area to the most
recently committed state. This will discard your local modifications, recently committed state. This will discard your local modifications,
so be careful. so be careful.
@node Branching and Merging @node Branching
@chapter Branching and Merging @chapter Branching
The current branch is indicated in the header of the status buffer. The current branch is indicated in the header of the status buffer.
You can switch to a different branch by typing @kbd{b}. This will You can switch to a different branch by typing @kbd{b}. This will
immediately checkout the branch into your working copy, so you immediately checkout the branch into your working copy, so you
shouldn't have any local modifications when switching branches. shouldn't have any local modifications when switching branches.
Similar to @kbs{x}, typing @kbd{b} while point is at a commit Similar to @kbd{x}, typing @kbd{b} while point is at a commit
description will offer that commit as the default to switch to. description will offer that commit as the default to switch to.
This will result in a detached head. This will result in a detached head.