summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>2005-12-08 23:28:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 23:50:14 (GMT)
commitd4ce5f7e508c0a52aea2938cf2f7e25bf62eec3a (patch)
treeeaee4952908006b3041b5abd7178bb1caf65a4d8
parent674b28085e89c3be37d07063b253069101669b55 (diff)
downloadgit-d4ce5f7e508c0a52aea2938cf2f7e25bf62eec3a.zip
git-d4ce5f7e508c0a52aea2938cf2f7e25bf62eec3a.tar.gz
git-d4ce5f7e508c0a52aea2938cf2f7e25bf62eec3a.tar.bz2
Add documentation for the --topo-order option to git-show-branch.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-show-branch.txt8
-rw-r--r--show-branch.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 304101d..ffe64d8 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -7,7 +7,7 @@ git-show-branch - Show branches and their commits.
SYNOPSIS
--------
-'git-show-branch [--all] [--heads] [--tags] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [<rev> | <glob>]...'
+'git-show-branch [--all] [--heads] [--tags] [--topo-order] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [<rev> | <glob>]...'
DESCRIPTION
-----------
@@ -35,6 +35,12 @@ OPTIONS
Show all refs under $GIT_DIR/refs, $GIT_DIR/refs/heads,
and $GIT_DIR/refs/tags, respectively.
+--topo-order::
+ By default, the branches and their commits are shown in
+ reverse chronological order. This option makes them
+ appear in topological order (i.e., descendant commits
+ are shown before their parents).
+
--more=<n>::
Usually the command stops output upon showing the commit
that is the common ancestor of all the branches. This
diff --git a/show-branch.c b/show-branch.c
index 3cb335d..ab158eb 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -5,7 +5,7 @@
#include "refs.h"
static const char show_branch_usage[] =
-"git-show-branch [--all] [--heads] [--tags] [--more=count | --list | --independent | --merge-base ] [<refs>...]";
+"git-show-branch [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [<refs>...]";
#define UNINTERESTING 01