gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Manual additions.

Browse source
This commit is contained in:
Marius Vollmer 2008-08-13 00:22:35 +03:00
parent 11689b7dc7
commit e4aceaf6b8
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
magit.texi
View file

@ -217,6 +217,11 @@ and staging area will match it. In other words, a hard reset will
throw away the history completely, which can be useful to abort highly
experimental changes (like merging a branch just to see what happens).
In particular, doing a hard reset to HEAD will have no effect on the
current head, but it will reset your working tree and staging area
back to the last comitted state. You can do this to abort a manual
merge, for example.
@node Branching Merging Rebasing Conflicts
@chapter Branching, Merging, Rebasing, and Conflicts