Remove --undo flags from stg commands and docs

[stgit] / Documentation / tutorial.txt

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 6eaa623..472a5c3 100644 (file)
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -32,7 +32,7 @@ Repository initialisation
 -------------------------
 
 In stand-alone mode, StGIT is used in conjunction with a GIT repository
-that is already initialised (using 'git-init-db'). StGIT cannot be used
+that is already initialised (using 'git init'). StGIT cannot be used
 outside of a GIT repository.
 Any branch in a GIT repository may be managed by StGIT. Each branch
 managed by StGIT contains an independent series of StGIT patches.
@@ -178,7 +178,9 @@ patches in a stack.
 During a push operation, merge conflicts can occur (especially if you
 are changing the order of the patches in your stack). If the push causes
 merge conflicts, they need to be fixed and 'stg resolved' run (see
-below). A 'push' operation can also be reverted with 'stg push --undo'.
+below). A 'push' operation can also be reverted with 'stg undo' (you
+will need to give it the --hard flag, since the conflicting push will
+have left your work tree dirty).
 A few more stack basics; to rename a patch:
 
   stg rename <old-name> <new-name>