stg – Manage stacks of patches using the Git content tracker Synopsisstg [–version | –help] stg [–help <command> | <command> –help] stg <command> [COMMAND OPTIONS] [ARGS]DescriptionStGit (Stacked Git) is an application that provides a convenient way to maintain a patch stack on top of a Git branch: • The topmost (most recent) commits of a…
stg-unhide – Unhide a hidden patch Synopsisstg unhide [options] [–] <patch-range>DescriptionUnhide a hidden range of patches so that they are shown in the plain stg series command output. Options-b BRANCH, –branch BRANCH Use BRANCH instead of the default branch.StgitPart of the StGit suite – see stg(1)
stg-undo – Undo the last operation Synopsisstg undoDescriptionReset the patch stack to the previous state. Consecutive invocations of "stg undo" will take you ever further into the past. Options-n N, –number N Undo the last N commands. –hard Discard changes in your index/worktree.StgitPart of the StGit suite – see stg(1)
stg-uncommit – Turn regular git commits into StGit patches Synopsisstg uncommit [–] <patch-name-1> [<patch-name-2> …] stg uncommit -n NUM [–] [<prefix>] stg uncommit -t <committish> [-x]DescriptionTake one or more git commits at the base of the current stack and turn them into StGIT patches. The new patches are created as applied patches at the bottom…
stg-top – Print the name of the top patch Synopsisstg topDescriptionPrint the name of the current (topmost) patch. Options-b BRANCH, –branch BRANCH Use BRANCH instead of the default branch.StgitPart of the StGit suite – see stg(1)
stg-sync – Synchronise patches with a branch or a series Synopsisstg sync [options] [–] [<patch1>] [<patch2>] [<patch3>..<patch4>]DescriptionFor each of the specified patches perform a three-way merge with the same patch in the specified branch or series. The command can be used for keeping patches on several branches in sync. Note that the operation may fail…
stg-squash – Squash two or more patches into one Synopsisstg squash [options] [–] <patches>DescriptionSquash two or more patches, creating one big patch that contains all their changes. In more detail: 1. Pop all the given patches, plus any other patches on top of them.2. Push the given patches in the order they were given on…
stg-sink – Send patches deeper down the stack Synopsisstg sink [-t <target patch>] [-n] [–] [<patches>]DescriptionThis is the opposite operation of stg-float(1): move the specified patches down the stack. It is for example useful to group stable patches near the bottom of the stack, where they are less likely to be impacted by the push…
stg-show – Show the commit corresponding to a patch Synopsisstg show [options] [–] [<patch1>] [<patch2>] [<patch3>..<patch4>]DescriptionShow the commit log and the diff corresponding to the given patches. The output is similar to that generated by git show. Options-b BRANCH, –branch BRANCH Use BRANCH instead of the default branch. -a, –applied Show the applied patches. -u,…
stg-series – Print the patch series Synopsisstg series [options] [–] [<patch-range>]DescriptionShow all the patches in the series, or just those in the given range, ordered from top to bottom. The applied patches are prefixed with a + (except the current patch, which is prefixed with a >), the unapplied patches with a -, and the…
stg-reset – Reset the patch stack to an earlier state Synopsisstg reset [options] [–] [<state> [<patchnames>]]DescriptionReset the patch stack to an earlier state. If no state is specified, reset only the changes in the worktree. The state is specified with a commit id from a stack log; "stg log" lets you view this log, and…
stg-repair – Fix StGit metadata if branch was modified with git commands Synopsisstg repairDescriptionIf you modify an StGit stack (branch) with some git commands — such as commit, pull, merge, and rebase — you will leave the StGit metadata in an inconsistent state. In that situation, you have two options: 1. Use "stg undo" to…
stg-rename – Rename a patch Synopsisstg rename [options] [–] [oldpatch] <newpatch>DescriptionRename <oldpatch> into <newpatch> in a series. If <oldpatch> is not given, the top-most patch will be renamed. Options-b BRANCH, –branch BRANCH use BRANCH instead of the default one.StgitPart of the StGit suite – see stg(1)
stg-refresh – Generate a new commit for the current patch Synopsisstg refresh [options] [–] [<files or dirs>]DescriptionInclude the latest work tree and index changes in the current patch. This command generates a new git commit object for the patch; the old commit is no longer visible. Refresh will warn if the index is dirty, and…
stg-redo – Undo the last undo operation Synopsisstg redoDescriptionIf the last command was an undo, reset the patch stack to the state it had before the undo. Consecutive invocations of "stg redo" will undo the effects of consecutive invocations of "stg undo". It is an error to run "stg redo" if the last command was…
stg-rebase – Move the stack base to another point in history Synopsisstg rebase [options] [–] <new-base-id>DescriptionPop all patches from current stack, move the stack base to the given <new-base-id> and push the patches back. If you experience merge conflicts, resolve the problem and continue the rebase by executing the following sequence: $ git add –update…
stg-push – Push one or more patches onto the stack Synopsisstg push [options] [–] [<patch1>] [<patch2>] [<patch3>..<patch4>]DescriptionPush one or more patches (defaulting to the first unapplied one) onto the stack. The push operation allows patch reordering by commuting them with the three-way merge algorithm. If there are conflicts while pushing a patch, those conflicts are…
stg-pull – Pull changes from a remote repository Synopsisstg pull [options] [–] [<repository>]DescriptionPull the latest changes from the given remote repository (defaulting to branch.<name>.remote, or origin if not set). This command works by popping all the patches from the stack, pulling the changes in the parent repository, setting the base of the stack to the…
stg-publish – Push the stack changes to a merge-friendly branch Synopsisstg publish [options] [–] [branch]DescriptionThis command commits a set of changes on a separate (called public) branch based on the modifications of the given or current stack. The history of the public branch is not re-written, making it merge-friendly and feasible for publishing. The heads…
stg-prev – Print the name of the previous patch Synopsisstg prevDescriptionPrint the name of the previous patch. Options-b BRANCH, –branch BRANCH Use BRANCH instead of the default branch.StgitPart of the StGit suite – see stg(1)