From: Junio C Hamano Date: Sat, 24 May 2008 01:12:30 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.5.1-382-g182f X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b713ff1cbf5b9979edaf2b85bfc568fbc37ec0d7;p=git.git Autogenerated HTML docs for v1.5.5.1-382-g182f --- diff --git a/config.txt b/config.txt index 217980f48..002a06689 100644 --- a/config.txt +++ b/config.txt @@ -523,8 +523,10 @@ color.status.:: one of `header` (the header text of the status message), `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), - or `untracked` (files which are not tracked by git). The values of - these variables may be specified as in color.branch.. + `untracked` (files which are not tracked by git), or + `nobranch` (the color the 'no branch' warning is shown in, defaulting + to red). The values of these variables may be specified as in + color.branch.. commit.template:: Specify a file to use as the template for new commit messages. @@ -815,6 +817,12 @@ instaweb.port:: The port number to bind the gitweb httpd to. See linkgit:git-instaweb[1]. +log.date:: + Set default date-time mode for the log command. Setting log.date + value is similar to using git log's --date option. The value is one of + following alternatives: {relative,local,default,iso,rfc,short}. + See linkgit:git-log[1]. + 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. diff --git a/git-config.html b/git-config.html index 31c130070..fd92c3f29 100644 --- a/git-config.html +++ b/git-config.html @@ -1434,8 +1434,10 @@ color.status.<slot> one of header (the header text of the status message), added or updated (files which are added but not committed), changed (files which are changed but not added in the index), - or untracked (files which are not tracked by git). The values of - these variables may be specified as in color.branch.<slot>. + untracked (files which are not tracked by git), or + nobranch (the color the no branch warning is shown in, defaulting + to red). The values of these variables may be specified as in + color.branch.<slot>.

@@ -1994,6 +1996,17 @@ instaweb.port

+log.date +
+
+

+ Set default date-time mode for the log command. Setting log.date + value is similar to using git log's --date option. The value is one of + following alternatives: {relative,local,default,iso,rfc,short}. + See git-log(1). +

+
+
log.showroot
@@ -2561,7 +2574,7 @@ web.browser diff --git a/git-log.html b/git-log.html index 45ab542d2..753c77bc6 100644 --- a/git-log.html +++ b/git-log.html @@ -871,12 +871,13 @@ people using 80-column terminals.

---date={relative,local,default,iso,rfc} +--date={relative,local,default,iso,rfc,short}

Only takes effect for dates shown in human-readable format, such - as when using "--pretty". + as when using "--pretty". log.date config variable sets a default + value for log command's --date option.

--date=relative shows dates relative to the current time, e.g. "2 hours ago".

@@ -1942,7 +1943,7 @@ reversible operation.

diff --git a/git-push.html b/git-push.html index cd77cd3bc..1f20f9f34 100644 --- a/git-push.html +++ b/git-push.html @@ -315,16 +315,17 @@ to fast forward the remote ref that matches <dst> (or, if no <dst> w specified, the same ref that <src> referred to locally). If the optional leading plus + is used, the remote ref is updated even if it does not result in a fast forward update.

-

Note: If no explicit refspec is found, (that is neither -on the command line nor in any Push line of the -corresponding remotes file---see below), then "matching" heads are -pushed: for every head that exists on the local side, the remote side is -updated if a head of the same name already exists on the remote side.

tag <tag> means the same as refs/tags/<tag>:refs/tags/<tag>.

A parameter <ref> without a colon pushes the <ref> from the source repository to the destination repository under the same name.

Pushing an empty <src> allows you to delete the <dst> ref from the remote repository.

+

The special refspec : (or +: to allow non-fast forward updates) +directs git to push "matching" heads: for every head that exists on +the local side, the remote side is updated if a head of the same name +already exists on the remote side. This is the default operation mode +if no explicit refspec is found (that is neither on the command line +nor in any Push line of the corresponding remotes file---see below).

--all @@ -732,7 +733,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-push.txt b/git-push.txt index f06d94e31..0cc44d799 100644 --- a/git-push.txt +++ b/git-push.txt @@ -46,12 +46,6 @@ specified, the same ref that referred to locally). If the optional leading plus `+` is used, the remote ref is updated even if it does not result in a fast forward update. + -Note: If no explicit refspec is found, (that is neither -on the command line nor in any Push line of the -corresponding remotes file---see below), then "matching" heads are -pushed: for every head that exists on the local side, the remote side is -updated if a head of the same name already exists on the remote side. -+ `tag ` means the same as `refs/tags/:refs/tags/`. + A parameter without a colon pushes the from the source @@ -59,6 +53,13 @@ repository to the destination repository under the same name. + Pushing an empty allows you to delete the ref from the remote repository. ++ +The special refspec `:` (or `+:` to allow non-fast forward updates) +directs git to push "matching" heads: for every head that exists on +the local side, the remote side is updated if a head of the same name +already exists on the remote side. This is the default operation mode +if no explicit refspec is found (that is neither on the command line +nor in any Push line of the corresponding remotes file---see below). \--all:: Instead of naming each ref to push, specifies that all diff --git a/git-repack.html b/git-repack.html index 7280681ff..305b07818 100644 --- a/git-repack.html +++ b/git-repack.html @@ -272,7 +272,7 @@ git-repack(1) Manual Page

SYNOPSIS

-

git-repack [-a] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]

+

git-repack [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]

DESCRIPTION

@@ -304,6 +304,23 @@ engines, disk storage, etc.

+-A +
+
+

+ Same as -a, but any unreachable objects in a previous + pack become loose, unpacked objects, instead of being + left in the old pack. Unreachable objects are never + intentionally added to a pack, even when repacking. + When used with -d, this option + prevents unreachable objects from being immediately + deleted by way of being left in the old pack and then + removed. Instead, the loose unreachable objects + will be pruned according to normal expiry rules + with the next git-gc(1). +

+
+
-d
@@ -346,7 +363,10 @@ engines, disk storage, etc.

Do not update the server information with - git update-server-info. + git update-server-info. This option skips + updating local catalog files needed to publish + this repository (or a direct copy of it) + over HTTP or FTP. See .

@@ -423,7 +443,7 @@ that way can try to use older git with it).

diff --git a/git-repack.txt b/git-repack.txt index 3d957492f..f81a6607d 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -8,7 +8,7 @@ git-repack - Pack unpacked objects in a repository SYNOPSIS -------- -'git-repack' [-a] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N] +'git-repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N] DESCRIPTION ----------- @@ -37,6 +37,18 @@ OPTIONS leaves behind, but `git fsck --full` shows as dangling. +-A:: + Same as `-a`, but any unreachable objects in a previous + pack become loose, unpacked objects, instead of being + left in the old pack. Unreachable objects are never + intentionally added to a pack, even when repacking. + When used with '-d', this option + prevents unreachable objects from being immediately + deleted by way of being left in the old pack and then + removed. Instead, the loose unreachable objects + will be pruned according to normal expiry rules + with the next linkgit:git-gc[1]. + -d:: After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. @@ -55,8 +67,11 @@ OPTIONS linkgit:git-pack-objects[1]. -n:: - Do not update the server information with - `git update-server-info`. + Do not update the server information with + `git update-server-info`. This option skips + updating local catalog files needed to publish + this repository (or a direct copy of it) + over HTTP or FTP. See gitlink:git-update-server-info[1]. --window=[N], --depth=[N]:: These two options affect how the objects contained in the pack are diff --git a/git-rev-list.html b/git-rev-list.html index 7a19b6dda..6f67fc417 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -401,12 +401,13 @@ people using 80-column terminals.

---date={relative,local,default,iso,rfc} +--date={relative,local,default,iso,rfc,short}

Only takes effect for dates shown in human-readable format, such - as when using "--pretty". + as when using "--pretty". log.date config variable sets a default + value for log command's --date option.

--date=relative shows dates relative to the current time, e.g. "2 hours ago".

@@ -1224,7 +1225,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-show.html b/git-show.html index fdf0ab6c7..6024c1c6c 100644 --- a/git-show.html +++ b/git-show.html @@ -761,7 +761,6 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

Documentation

Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.org>.

-

This manual page is a stub. You can help the git documentation by expanding it.

GIT

@@ -769,7 +768,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

diff --git a/git-show.txt b/git-show.txt index dccf0e20e..29ed0acc6 100644 --- a/git-show.txt +++ b/git-show.txt @@ -79,8 +79,6 @@ Documentation ------------- Documentation by David Greaves, Petr Baudis and the git-list . -This manual page is a stub. You can help the git documentation by expanding it. - GIT --- Part of the linkgit:git[7] suite diff --git a/rev-list-options.txt b/rev-list-options.txt index ce6a1017a..dfcef79a6 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -13,10 +13,11 @@ include::pretty-options.txt[] Synonym for `--date=relative`. ---date={relative,local,default,iso,rfc}:: +--date={relative,local,default,iso,rfc,short}:: Only takes effect for dates shown in human-readable format, such - as when using "--pretty". + as when using "--pretty". `log.date` config variable sets a default + value for log command's --date option. + `--date=relative` shows dates relative to the current time, e.g. "2 hours ago".