From 17f7533bf6fb3aed9eedfd0b736ad4fb1c5781e5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 19 Dec 2006 00:54:46 +0000 Subject: [PATCH] Autogenerated man pages for v1.4.4.2-g8336 --- man1/git-repo-config.1 | 8 +++++++- man1/git-show-branch.1 | 40 +++++++++++++++------------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index 3e178f855..56021cfb4 100644 --- a/man1/git-repo-config.1 +++ b/man1/git-repo-config.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REPO\-CONFIG" "1" "12/16/2006" "" "" +.TH "GIT\-REPO\-CONFIG" "1" "12/19/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -202,6 +202,12 @@ The syntax is fairly flexible and permissive; whitespaces are mostly ignored. Th external = "/usr/local/bin/gnu\-diff \-u" renames = true .fi +.sp +.nf +[branch "devel"] + remote = origin + merge = refs/heads/devel +.fi .SS "Variables" Note that this list is non\-comprehensive and not necessarily complete. For command\-specific variables, you will find a more detailed description in the appropriate manual page. You will find a description of non\-core porcelain configuration variables in the respective porcelain documentation. .TP diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index a23e53eb3..f8bf5a8c3 100644 --- a/man1/git-show-branch.1 +++ b/man1/git-show-branch.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SHOW\-BRANCH" "1" "10/03/2006" "" "" +.TH "GIT\-SHOW\-BRANCH" "1" "12/19/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,25 +14,21 @@ git\-show\-branch \- Show branches and their commits .nf \fIgit\-show\-branch\fR [\-\-all] [\-\-heads] [\-\-tags] [\-\-topo\-order] [\-\-current] [\-\-more= | \-\-list | \-\-independent | \-\-merge\-base] - [\-\-no\-name | \-\-sha1\-name] [ | ]\&... + [\-\-no\-name | \-\-sha1\-name] [\-\-topics] [ | ]\&... .fi .SH "DESCRIPTION" Shows the commit ancestry graph starting from the commits named with s or s (or all refs under $GIT_DIR/refs/heads and/or $GIT_DIR/refs/tags) semi\-visually. -.sp + It cannot show more than 29 branches and commits at a time. -.sp + It uses showbranch.default multi\-valued configuration items if no nor is given on the command line. -.sp .SH "OPTIONS" .TP -Arbitrary extended SHA1 expression (see -git\-rev\-parse) that typically names a branch HEAD or a tag. +Arbitrary extended SHA1 expression (see git\-rev\-parse) that typically names a branch HEAD or a tag. .TP -A glob pattern that matches branch or tag names under $GIT_DIR/refs. For example, if you have many topic branches under $GIT_DIR/refs/heads/topic, giving -topic/* -would show all of them. +A glob pattern that matches branch or tag names under $GIT_DIR/refs. For example, if you have many topic branches under $GIT_DIR/refs/heads/topic, giving topic/* would show all of them. .TP \-\-all \-\-heads \-\-tags Show all refs under $GIT_DIR/refs, $GIT_DIR/refs/heads, and $GIT_DIR/refs/tags, respectively. @@ -50,13 +46,10 @@ By default, the output omits merges that are reachable from only one tip being s Usually the command stops output upon showing the commit that is the common ancestor of all the branches. This flag tells the command to go more common commits beyond that. When is negative, display only the s given, without showing the commit ancestry tree. .TP \-\-list -Synonym to -\-\-more=\-1 +Synonym to \-\-more=\-1 .TP \-\-merge\-base -Instead of showing the commit list, just act like the -\fIgit\-merge\-base \-a\fR -command, except that it can accept more than two heads. +Instead of showing the commit list, just act like the \fIgit\-merge\-base \-a\fR command, except that it can accept more than two heads. .TP \-\-independent Among the s given, display only the ones that cannot be reached from any other . @@ -66,16 +59,18 @@ Do not show naming strings for each commit. .TP \-\-sha1\-name Instead of naming the commits using the path to reach them from heads (e.g. "master~2" to mean the grandparent of "master"), name them with the unique prefix of their object names. +.TP +\-\-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 ^master topic1 topic2" + Note that \-\-more, \-\-list, \-\-independent and \-\-merge\-base options are mutually exclusive. -.sp .SH "OUTPUT" Given N , the first N lines are the one\-line description from their commit message. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk * character while other heads are prefixed with a ! character. -.sp + Following these N lines, one\-line log for each commit is displayed, indented N places. If a commit is on the I\-th branch, the I\-th indentation character shows a + sign; otherwise it shows a space. Merge commits are denoted by a \- sign. Each commit shows a short name that can be used as an extended SHA1 to name that commit. -.sp + The following example shows three branches, "master", "fixes" and "mhf": .sp -.sp .nf $ git show\-branch master fixes mhf * [master] Add 'git show\-branch'. @@ -95,24 +90,19 @@ $ git show\-branch master fixes mhf *++ [master] Add 'git show\-branch'. .fi These three branches all forked from a common commit, [master], whose commit message is "Add \fIgit show\-branch\fR. "fixes" branch adds one commit \fIIntroduce "reset type"\fR. "mhf" branch has many other commits. The current branch is "master". -.sp .SH "EXAMPLE" If you keep your primary branches immediately under $GIT_DIR/refs/heads, and topic branches in subdirectories of it, having the following in the configuration file may help: .sp -.sp .nf [showbranch] default = \-\-topo\-order default = heads/* .fi 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. -.sp .SH "AUTHOR" Written by Junio C Hamano -.sp .SH "DOCUMENTATION" Documentation by Junio C Hamano. -.sp .SH "GIT" Part of the \fBgit\fR(7) suite -.sp + -- 2.26.2