X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/368a44c3761d46b5a085215a9ed6878da4e84fa6..b7e3c8c0b4cc0469eeb00ef00cfcf02528faed90:/Documentation/tutorial.txt diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 5899c38..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 - stg rm - stg add + git mv old-file new-file + +to move a file. Stack manipulation: managing multiple patches @@ -387,9 +391,6 @@ Layout of the .git directory heads/ master - the master commit id ... - bases/ - master - the bottom id of the stack (to get a big diff) - ... tags/ ... branches/