X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/16d69115caef1a194384f0f0f668e6789b838909..3ce5fec2ef4154369653a41eb7692aca25878298:/Documentation/tutorial.txt diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 2b8e4e7..5d2e50a 100644 --- 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. @@ -123,18 +123,22 @@ You can view modified files that have already been saved into a patch: stg files The 'stg refresh' command automatically notes changes to files that -already exist in the working directory, but you have to tell StGIT -explicitly if you add, remove, or rename files. -To record the addition or deletion of files in your new patch: +already exist in the working directory (it also notices if you remove +them), but you have to tell StGIT explicitly if you add or rename a +file: - stg add [*] - stg rm [*] + git add new-file -To record the renaming of a file in your new patch, issue both of these -commands: +to add a file, and + + mv old-file new-file + git add new-file + +or simply + + git mv old-file new-file - stg rm - stg add +to move a file. Stack manipulation: managing multiple patches