From 7d23f5e7a7c3d63a342a4c00caeca4ab11d30d17 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 16 Dec 2006 07:44:04 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4.2-g82dca --- config.txt | 11 +++++++---- core-tutorial.html | 17 +++++----------- core-tutorial.txt | 16 ++++----------- diff-options.txt | 5 +++++ git-commit.html | 10 +++++++++- git-commit.txt | 3 +++ git-diff-files.html | 12 ++++++++++- git-diff-index.html | 12 ++++++++++- git-diff-stages.html | 12 ++++++++++- git-diff-tree.html | 12 ++++++++++- git-diff.html | 18 +++++++++++++---- git-diff.txt | 6 +++--- git-repo-config.html | 33 +++++++++++++++++++++++++------ git-repo-config.txt | 14 ++++++++++++- git-reset.html | 4 ++-- git-reset.txt | 2 +- git-show.html | 47 ++++++++++++++++++++++++++++++++++++-------- git-show.txt | 40 ++++++++++++++++++++++++++++++------- tutorial-2.html | 44 +++++++++++++++++++++++++---------------- tutorial-2.txt | 41 ++++++++++++++++++++++++-------------- tutorial.html | 4 ++-- tutorial.txt | 2 +- 22 files changed, 265 insertions(+), 100 deletions(-) diff --git a/config.txt b/config.txt index a3587f839..ceac54b02 100644 --- a/config.txt +++ b/config.txt @@ -79,8 +79,11 @@ core.logAllRefUpdates:: file is automatically created for branch heads. This information can be used to determine what commit - was the tip of a branch "2 days ago". This value is - false by default (no automated creation of log files). + was the tip of a branch "2 days ago". + + This value is true by default in a repository that has + a working directory associated with it, and false by + default in a bare repository. core.repositoryFormatVersion:: Internal variable identifying the repository format and layout @@ -166,8 +169,8 @@ color.status:: color.status.:: Use customized color for status colorization. `` is one of `header` (the header text of the status message), - `updated` (files which are updated but not committed), - `changed` (files which are changed but not updated in the index), + `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.diff.. diff --git a/core-tutorial.html b/core-tutorial.html index 88c3e5c7c..8927cbb74 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -319,7 +319,7 @@ $ git-init-db

to which git will reply

-
defaulting to local storage area
+
Initialized empty Git repository in .git/

which is just git's way of saying that you haven't been doing anything strange, and that it will have created a local .git directory setup for @@ -598,16 +598,9 @@ all with a sequence of simple shell commands:

$ commit=$(echo 'Initial commit' | git-commit-tree $tree) $ git-update-ref HEAD $commit -

which will say:

-
-
-
Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb
-
-

just to warn you about the fact that it created a totally new commit -that is not related to anything else. Normally you do this only once -for a project ever, and all later commits will be parented on top of an -earlier commit, and you'll never see this "Committing initial tree" -message ever again.

+

In this case this creates a totally new commit that is not related to +anything else. Normally you do this only once for a project ever, and +all later commits will be parented on top of an earlier commit.

Again, normally you'd never actually do this by hand. There is a helpful script called git commit that will do all of this for you. So you could have just written git commit @@ -2011,7 +2004,7 @@ to follow, not easier.

diff --git a/core-tutorial.txt b/core-tutorial.txt index 47505aa20..5ea611748 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -57,7 +57,7 @@ $ git-init-db to which git will reply ---------------- -defaulting to local storage area +Initialized empty Git repository in .git/ ---------------- which is just git's way of saying that you haven't been doing anything @@ -336,17 +336,9 @@ $ commit=$(echo 'Initial commit' | git-commit-tree $tree) $ git-update-ref HEAD $commit ------------------------------------------------ -which will say: - ----------------- -Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb ----------------- - -just to warn you about the fact that it created a totally new commit -that is not related to anything else. Normally you do this only *once* -for a project ever, and all later commits will be parented on top of an -earlier commit, and you'll never see this "Committing initial tree" -message ever again. +In this case this creates a totally new commit that is not related to +anything else. Normally you do this only *once* for a project ever, and +all later commits will be parented on top of an earlier commit. Again, normally you'd never actually do this by hand. There is a helpful script called `git commit` that will do all of this for you. So diff --git a/diff-options.txt b/diff-options.txt index 9cdd171af..f12082e13 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -21,6 +21,11 @@ deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. +--shortstat:: + Output only the last line of the --stat format containing total + number of modified files, as well as number of added and deleted + lines. + --summary:: Output a condensed summary of extended header information such as creations, renames and mode changes. diff --git a/git-commit.html b/git-commit.html index b163557de..087aa3ef7 100644 --- a/git-commit.html +++ b/git-commit.html @@ -438,6 +438,14 @@ that, you can recover from it with git-reset(1).

+-q|--quiet +
+
+

+ Supress commit summary message. +

+
+
--
@@ -571,7 +579,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 97d66ef4d..0b74cd708 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -113,6 +113,9 @@ but can be used to amend a merge commit. as well. This is usually not what you want unless you are concluding a conflicted merge. +-q|--quiet:: + Supress commit summary message. + \--:: Do not interpret any more arguments as options. diff --git a/git-diff-files.html b/git-diff-files.html index 923f62932..abcc5c864 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -338,6 +338,16 @@ same as "git-diff-index" and "git-diff-tree".

+--shortstat +
+
+

+ Output only the last line of the --stat format containing total + number of modified files, as well as number of added and deleted + lines. +

+
+
--summary
@@ -974,7 +984,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 66c5d9506..8b4c6a016 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -339,6 +339,16 @@ entries in the index are compared.

+--shortstat +
+
+

+ Output only the last line of the --stat format containing total + number of modified files, as well as number of added and deleted + lines. +

+
+
--summary
@@ -1064,7 +1074,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index 34b70dcbd..8c5fdb0f5 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -336,6 +336,16 @@ unmerged index file.

+--shortstat +
+
+

+ Output only the last line of the --stat format containing total + number of modified files, as well as number of added and deleted + lines. +

+
+
--summary
@@ -948,7 +958,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index 2b08f43a1..bd0a9bfd2 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -341,6 +341,16 @@ git-diff-tree(1) Manual Page

+--shortstat +
+
+

+ Output only the last line of the --stat format containing total + number of modified files, as well as number of added and deleted + lines. +

+
+
--summary
@@ -1256,7 +1266,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 8538378eb..bb0816db1 100644 --- a/git-diff.html +++ b/git-diff.html @@ -272,7 +272,7 @@ git-diff(1) Manual Page

SYNOPSIS

-

git-diff [ --diff-options ] <tree-ish>{0,2} [<path>…]

+

git-diff [ --diff-options ] <tree-ish>{0,2} [--] [<path>…]

DESCRIPTION

@@ -303,7 +303,7 @@ tree and the index file, or the index file and the working tree.

-git-diff [--options] <commit> — [<path>…] +git-diff [--options] <commit> [--] [<path>…]

@@ -315,7 +315,7 @@ tree and the index file, or the index file and the working tree.

-git-diff [--options] <commit> <commit> — [<path>…] +git-diff [--options] <commit> <commit> [--] [<path>…]

@@ -385,6 +385,16 @@ any <tree-ish>.

+--shortstat +
+
+

+ Output only the last line of the --stat format containing total + number of modified files, as well as number of added and deleted + lines. +

+
+
--summary
@@ -805,7 +815,7 @@ output diff in reverse. diff --git a/git-diff.txt b/git-diff.txt index 127d68c96..10fdf88dc 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- -'git-diff' [ --diff-options ] {0,2} [...] +'git-diff' [ --diff-options ] {0,2} [--] [...] DESCRIPTION ----------- @@ -30,7 +30,7 @@ tree and the index file, or the index file and the working tree. would want comparison with the latest commit, so if you do not give , it defaults to HEAD. -'git-diff' [--options] -- [...]:: +'git-diff' [--options] [--] [...]:: This form is to view the changes you have in your working tree relative to the named . You can @@ -38,7 +38,7 @@ tree and the index file, or the index file and the working tree. branch name to compare with the tip of a different branch. -'git-diff' [--options] -- [...]:: +'git-diff' [--options] [--] [...]:: This form is to view the changes between two , for example, tips of two branches. diff --git a/git-repo-config.html b/git-repo-config.html index bdeb43ebb..dd411c633 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -274,6 +274,7 @@ git-repo-config(1) Manual Page
git-repo-config [--global] [type] name [value [value_regex]] +git-repo-config [--global] [type] --add name value git-repo-config [--global] [type] --replace-all name [value [value_regex]] git-repo-config [--global] [type] --get name [value_regex] git-repo-config [--global] [type] --get-all name [value_regex] @@ -286,7 +287,8 @@ git-repo-config(1) Manual Page

You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped.

-

If you want to set/unset an option which can occur on multiple +

Multiple lines can be added to an option by using the --add option. +If you want to update or unset an option which can occur on multiple lines, a POSIX regexp value_regex needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do not match the regex, just @@ -348,6 +350,15 @@ you use --global option without $HOME being properly set.

+--add +
+
+

+ Adds a new line to the option without altering any existing + values. This is the same as providing ^$ as the value_regex. +

+
+
--get
@@ -539,6 +550,11 @@ i.e. the one without a "for …" postfix, do something like this:

% git repo-config section.key value '[!]'
+

To add a new proxy, without altering any of the existing ones, use

+
+
+
% git repo-config core.gitproxy '"proxy" for example.com'
+

CONFIGURATION FILE

@@ -643,8 +659,13 @@ core.logAllRefUpdates 
This information can be used to determine what commit
-was the tip of a branch "2 days ago".  This value is
-false by default (no automated creation of log files).
+was the tip of a branch "2 days ago". +
+
+
+
This value is true by default in a repository that has
+a working directory associated with it, and false by
+default in a bare repository.
@@ -800,8 +821,8 @@ color.status.<slot>

Use customized color for status colorization. <slot> is one of header (the header text of the status message), - updated (files which are updated but not committed), - changed (files which are changed but not updated in the index), + 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.diff.<slot>.

@@ -1140,7 +1161,7 @@ receive.denyNonFastForwards diff --git a/git-repo-config.txt b/git-repo-config.txt index 5bede9ac2..b379ec507 100644 --- a/git-repo-config.txt +++ b/git-repo-config.txt @@ -10,6 +10,7 @@ SYNOPSIS -------- [verse] 'git-repo-config' [--global] [type] name [value [value_regex]] +'git-repo-config' [--global] [type] --add name value 'git-repo-config' [--global] [type] --replace-all name [value [value_regex]] 'git-repo-config' [--global] [type] --get name [value_regex] 'git-repo-config' [--global] [type] --get-all name [value_regex] @@ -23,7 +24,8 @@ You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped. -If you want to set/unset an option which can occur on multiple +Multiple lines can be added to an option by using the '--add' option. +If you want to update or unset an option which can occur on multiple lines, a POSIX regexp `value_regex` needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do *not* match the regex, just @@ -53,6 +55,10 @@ OPTIONS Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex). +--add:: + Adds a new line to the option without altering any existing + values. This is the same as providing '^$' as the value_regex. + --get:: Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not @@ -194,6 +200,12 @@ To actually match only values with an exclamation mark, you have to % git repo-config section.key value '[!]' ------------ +To add a new proxy, without altering any of the existing ones, use + +------------ +% git repo-config core.gitproxy '"proxy" for example.com' +------------ + include::config.txt[] diff --git a/git-reset.html b/git-reset.html index 2fbdefa45..d9a2baa37 100644 --- a/git-reset.html +++ b/git-reset.html @@ -304,7 +304,7 @@ the undo in the history.

Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed - files "Updated but not checked in", as git-status(1) would + files "Added but not yet committed", as git-status(1) would put it.

@@ -566,7 +566,7 @@ At this point the index file still has all the WIP changes you diff --git a/git-reset.txt b/git-reset.txt index 73a0ffc41..4a4ceb620 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -31,7 +31,7 @@ OPTIONS --soft:: Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed - files "Updated but not checked in", as gitlink:git-status[1] would + files "Added but not yet committed", as gitlink:git-status[1] would put it. --hard:: diff --git a/git-show.html b/git-show.html index 7822cc26f..d02b8a7b4 100644 --- a/git-show.html +++ b/git-show.html @@ -266,21 +266,24 @@ git-show(1) Manual Page

NAME

git-show - - Show one commit with difference it introduces + Show various types of objects

SYNOPSIS

-

git-show <option>…

+

git-show [options] <object>…

DESCRIPTION

-

Shows commit log and textual diff for a single commit. The -command internally invokes git-rev-list piped to -git-diff-tree, and takes command line options for both of -these commands. It also presents the merge commit in a special -format as produced by git-diff-tree --cc.

+

Shows one or more objects (blobs, trees, tags and commits).

+

For commits it shows the log message and textual diff. It also +presents the merge commit in a special format as produced by +git-diff-tree --cc.

+

For tags, it shows the tag message and the referenced objects.

+

For trees, it shows the names (equivalent to git-ls-tree(1) +with --name-only).

+

For plain blobs, it shows the plain contents.

This manual page describes only the most frequently used options.

OPTIONS

@@ -426,6 +429,34 @@ simplification into account.

+

EXAMPLES

+
+
+
+git show v1.0.0 +
+
+

+ Shows the tag v1.0.0. +

+
+
+ +
+
+

+ Shows the tree pointed to by the tag v1.0.0. +

+
+
+

git show next~10:Documentation/README + Shows the contents of the file Documentation/README as + they were current in the 10th last commit of the branch + next.

+

git show master:Makefile master:t/Makefile + Concatenates the contents of said Makefiles in the head + of the branch master.

+

Author

Written by Linus Torvalds <torvalds@osdl.org> and @@ -442,7 +473,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-show.txt b/git-show.txt index 4c880a871..98dea6125 100644 --- a/git-show.txt +++ b/git-show.txt @@ -3,20 +3,27 @@ git-show(1) NAME ---- -git-show - Show one commit with difference it introduces +git-show - Show various types of objects SYNOPSIS -------- -'git-show'