From fe9acab71e9360742448deb57e6ae021f9ac66d5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 24 Nov 2006 12:10:55 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4.1-g634b8 --- config.txt | 6 ++++++ git-branch.html | 20 +++++++++++++++----- git-branch.txt | 11 ++++++++--- git-repo-config.html | 13 ++++++++++++- 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/config.txt b/config.txt index 9d3c71c3b..909076281 100644 --- a/config.txt +++ b/config.txt @@ -219,6 +219,12 @@ i18n.commitEncoding:: browser (and possibly at other places in the future or in other porcelains). See e.g. gitlink:git-mailinfo[1]. Defaults to 'utf-8'. +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 gitlink:git-log[1] or gitlink:git-whatchanged[1], which + normally hide the root commit will now show it. True by default. + merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. diff --git a/git-branch.html b/git-branch.html index eb0169370..65e7a370d 100644 --- a/git-branch.html +++ b/git-branch.html @@ -273,14 +273,16 @@ git-branch(1) Manual Page

SYNOPSIS

-
git-branch [-r] +
git-branch [-r] [-a] git-branch [-l] [-f] <branchname> [<start-point>] git-branch (-d | -D) <branchname>…

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.

In its second form, a new branch named <branchname> will be created. It will start out with a head equal to the one given as <start-point>. If no <start-point> is given, the branch will be created with a head @@ -331,7 +333,15 @@ has a ref log then the ref log will also be deleted.

- List only the "remote" branches. + List the remote-tracking branches. +

+
+
+-a +
+
+

+ List both remote-tracking branches and local branches.

@@ -421,7 +431,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index d43ef1dec..537676081 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -8,14 +8,16 @@ git-branch - List, create, or delete branches. SYNOPSIS -------- [verse] -'git-branch' [-r] +'git-branch' [-r] [-a] 'git-branch' [-l] [-f] [] 'git-branch' (-d | -D) ... DESCRIPTION ----------- -With no arguments given (or just `-r`) a list of available branches +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. In its second form, a new branch named will be created. It will start out with a head equal to the one given as . @@ -45,7 +47,10 @@ OPTIONS a branch that already exists with the same name. -r:: - List only the "remote" branches. + List the remote-tracking branches. + +-a:: + List both remote-tracking branches and local branches. :: The name of the branch to create or delete. diff --git a/git-repo-config.html b/git-repo-config.html index 5dd623426..6c0011bd3 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -899,6 +899,17 @@ i18n.commitEncoding

+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 git-log(1) or git-whatchanged(1), which + normally hide the root commit will now show it. True by default. +

+
+
merge.summary
@@ -1106,7 +1117,7 @@ receive.denyNonFastForwards
-- 2.26.2