X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a1d6a0811bac0329f50ffa4742cf7894390104bf..c20b20a50d7111ccb2d9cf1624823656a2c0a312:/Documentation/stg.txt diff --git a/Documentation/stg.txt b/Documentation/stg.txt index fc8fd7c..4cdff53 100644 --- a/Documentation/stg.txt +++ b/Documentation/stg.txt @@ -63,8 +63,8 @@ Tracking branch:: final sequence of patches, and not the messy sequence of edits that produced them. + -Commands of interest in this workflow are e.g. stgsublink:rebase[] and -stgsublink:mail[]. +Commands of interest in this workflow are e.g. linkstgsub:rebase[] and +linkstgsub:mail[]. Development branch:: @@ -77,10 +77,10 @@ Development branch:: immortalized every misstep you made on your way to the right solution. + -Commands of interest in this workflow are e.g. stgsublink:uncommit[], +Commands of interest in this workflow are e.g. linkstgsub:uncommit[], which can be used to move the patch stack base downwards -- i.e., turn Git commits into StGit patches after the fact -- and -stgsublink:commit[], its inverse. +linkstgsub:commit[], its inverse. For more information, see htmllink:tutorial.html[the tutorial]. @@ -111,7 +111,7 @@ stack base (the commit just below the bottommost patch); so, +abranch:$${base}$$+ is the base of the stack in branch +abranch+. If you need to pass a given StGit reference to a Git command, -stglink:id[] will convert it to a Git commit id for you. +linkstg:id[] will convert it to a Git commit id for you. OPTIONS -------