Documentation: Rename link macros

[stgit] / stgit / commands / branch.py

diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index ef71547..8748c0a 100644 (file)
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -20,7 +20,7 @@ from stgit.argparse import opt
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.out import *
-from stgit import stack, git, basedir
+from stgit import argparse, stack, git, basedir
 from stgit.lib import log
 
 help = 'Branch operations: switch, list, create, rename, delete, ...'
@@ -45,26 +45,27 @@ within a git repository.
 'stg branch' <branch>::
         Switch to the given branch."""
 
+args = [argparse.all_branches]
 options = [
     opt('-l', '--list', action = 'store_true',
         short = 'List the branches contained in this repository', long = """
         List each branch in the current repository, followed by its
         branch description (if any). The current branch is prefixed
         with '>'. Branches that have been initialized for StGit (with
-        stglink:init[]) are prefixed with 's'. Protected branches are
+        linkstg:init[]) are prefixed with 's'. Protected branches are
         prefixed with 'p'."""),
     opt('-c', '--create', action = 'store_true',
         short = 'Create (and switch to) a new branch', long = """
         Create (and switch to) a new branch. The new branch is already
         initialized as an StGit patch stack, so you do not have to run
-        stglink:init[] manually. If you give a committish argument,
+        linkstg:init[] manually. If you give a committish argument,
         the new branch is based there; otherwise, it is based at the
         current HEAD.
 
         StGit will try to detect the branch off of which the new
         branch is forked, as well as the remote repository from which
         that parent branch is taken (if any), so that running
-        stglink:pull[] will automatically pull new commits from the
+        linkstg:pull[] will automatically pull new commits from the
         correct branch. It will warn if it cannot guess the parent
         branch (e.g. if you do not specify a branch name as
         committish)."""),