git-svn: update documentation for multi-{init|fetch}

[git.git] / Documentation / git-show-branch.txt

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 7b1a9c98756bdc362a244827da601042ee290a43..912e15bcba54d28d7e4f71ffd3f9da923f2a6385 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -3,14 +3,15 @@ git-show-branch(1)
 
 NAME
 ----
 
 NAME
 ----

-git-show-branch - Show branches and their commits.
+git-show-branch - Show branches and their commits

 
 SYNOPSIS
 --------
 [verse]
 
 SYNOPSIS
 --------
 [verse]

-git-show-branch [--all] [--heads] [--tags] [--topo-order] [--current]
-       [--more=<n> | --list | --independent | --merge-base]
-       [--no-name | --sha1-name] [<rev> | <glob>]...
+'git-show-branch' [--all] [--remotes] [--topo-order] [--current]
+               [--more=<n> | --list | --independent | --merge-base]
+               [--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
+'git-show-branch' --reflog[=<n>] <ref>

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -37,9 +38,11 @@ OPTIONS
        branches under $GIT_DIR/refs/heads/topic, giving
        `topic/*` would show all of them.
 
        branches under $GIT_DIR/refs/heads/topic, giving
        `topic/*` would show all of them.
 

---all --heads --tags::
-       Show all refs under $GIT_DIR/refs, $GIT_DIR/refs/heads,
-       and $GIT_DIR/refs/tags, respectively.
+-r|--remotes::
+       Show the remote-tracking branches.
+
+-a|--all::
+       Show both remote-tracking branches and local branches.

 
 --current::
        With this option, the command includes the current
 
 --current::
        With this option, the command includes the current


@@ -52,6 +55,11 @@ OPTIONS
         appear in topological order (i.e., descendant commits
         are shown before their parents).
 
         appear in topological order (i.e., descendant commits
         are shown before their parents).
 

+--sparse::
+       By default, the output omits merges that are reachable
+       from only one tip being shown.  This option makes them
+       visible.
+

 --more=<n>::
        Usually the command stops output upon showing the commit
        that is the common ancestor of all the branches.  This
 --more=<n>::
        Usually the command stops output upon showing the commit
        that is the common ancestor of all the branches.  This


@@ -81,6 +89,18 @@ OPTIONS
        of "master"), name them with the unique prefix of their
        object names.
 
        of "master"), name them with the unique prefix of their
        object names.
 

+--topics::
+       Shows only commits that are NOT on the first branch given.
+       This helps track topic branches by hiding any commit that
+       is already in the main line of development.  When given
+       "git show-branch --topics master topic1 topic2", this
+       will show the revisions given by "git rev-list {caret}master
+       topic1 topic2"
+
+--reflog[=<n>] <ref>::
+       Shows <n> most recent ref-log entries for the given ref.
+
+

 Note that --more, --list, --independent and --merge-base options
 are mutually exclusive.
 
 Note that --more, --list, --independent and --merge-base options
 are mutually exclusive.
 


@@ -141,7 +161,7 @@ it, having the following in the configuration file may help:
 
 ------------
 
 
 ------------
 

-With this,`git show-branch` without extra parameters would show
+With this, `git show-branch` without extra parameters would show

 only the primary branches.  In addition, if you happen to be on
 your topic branch, it is shown as well.
 
 only the primary branches.  In addition, if you happen to be on
 your topic branch, it is shown as well.