From: Junio C Hamano Date: Fri, 24 Nov 2006 12:11:02 +0000 (+0000) Subject: Autogenerated man pages for v1.4.4.1-g634b8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=930dafe21337f6d43fb2e2273436b2e21a944fbc;p=git.git Autogenerated man pages for v1.4.4.1-g634b8 --- diff --git a/man1/git-branch.1 b/man1/git-branch.1 index fb9f382f1..5dffa7793 100755 --- a/man1/git-branch.1 +++ b/man1/git-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\-BRANCH" "1" "10/03/2006" "" "" +.TH "GIT\-BRANCH" "1" "11/24/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,12 +12,12 @@ git\-branch \- List, create, or delete branches. .SH "SYNOPSIS" .sp .nf -\fIgit\-branch\fR [\-r] +\fIgit\-branch\fR [\-r] [\-a] \fIgit\-branch\fR [\-l] [\-f] [] \fIgit\-branch\fR (\-d | \-D) \&... .fi .SH "DESCRIPTION" -With no arguments given (or just \-r) a list of available branches will be shown, the current branch will be highlighted with an asterisk. +With no arguments given a list of existing branches will be shown, the current branch will be highlighted with an asterisk. Option \-r causes the remote\-tracking branches to be listed, and option \-a shows both. .sp In its second form, a new branch named will be created. It will start out with a head equal to the one given as . If no is given, the branch will be created with a head equal to that of the currently checked out branch. .sp @@ -38,7 +38,10 @@ Create the branch's ref log. This activates recording of all changes to made the Force the creation of a new branch even if it means deleting a branch that already exists with the same name. .TP \-r -List only the "remote" branches. +List the remote\-tracking branches. +.TP +\-a +List both remote\-tracking branches and local branches. .TP The name of the branch to create or delete. The new branch name must pass all checks defined by diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index 81798b51d..d97e7c244 100755 --- 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" "11/08/2006" "" "" +.TH "GIT\-REPO\-CONFIG" "1" "11/24/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -391,6 +391,12 @@ Character encoding the commit messages are stored in; git itself does not care p \fBgit\-mailinfo\fR(1). Defaults to \fIutf\-8\fR. .TP +log.showroot +If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like +\fBgit\-log\fR(1) +or +\fBgit\-whatchanged\fR(1), which normally hide the root commit will now show it. True by default. +.TP merge.summary Whether to include summaries of merged commits in newly created merge commit messages. False by default. .TP