From: Junio C Hamano Date: Mon, 3 Dec 2007 09:57:55 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.7-994-g36863 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c99970a28e8702164d721f718aab95a0f23e1b4;p=git.git Autogenerated HTML docs for v1.5.3.7-994-g36863 --- diff --git a/config.txt b/config.txt index 39d1ef529..4124ad297 100644 --- a/config.txt +++ b/config.txt @@ -346,6 +346,13 @@ branch..mergeoptions:: option values containing whitespace characters are currently not supported. +branch..rebase:: + When true, rebase the branch on top of the fetched branch, + instead of merging the default branch from the default remote. + *NOTE*: this is a possibly dangerous operation; do *not* use + it unless you understand the implications (see gitlink:git-rebase[1] + for details). + clean.requireForce:: A boolean to make git-clean do nothing unless given -f or -n. Defaults to true. diff --git a/git-commit.html b/git-commit.html index 0283f709f..90b59cbc4 100644 --- a/git-commit.html +++ b/git-commit.html @@ -275,7 +275,7 @@ git-commit(1) Manual Page
git-commit [-a | --interactive] [-s] [-v] [-u] [(-c | -C) <commit> | -F <file> | -m <msg> | --amend] - [--no-verify] [-e] [--author <author>] + [--allow-empty] [--no-verify] [-e] [--author <author>] [--] [[-i | -o ]<file>…]

DESCRIPTION

@@ -409,6 +409,17 @@ that, you can recover from it with git-reset(1).

+--allow-empty +
+
+

+ Usually recording a commit that has the exact same tree as its + sole parent commit and the command prevents you from making such + a mistake. This option bypasses the safety, and is primarily + for use by foreign scm interface scripts. +

+
+
-e|--edit
@@ -704,7 +715,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index d4bfd49ce..a7ef71ff9 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git-commit' [-a | --interactive] [-s] [-v] [-u] [(-c | -C) | -F | -m | --amend] - [--no-verify] [-e] [--author ] + [--allow-empty] [--no-verify] [-e] [--author ] [--] [[-i | -o ]...] DESCRIPTION @@ -89,6 +89,12 @@ OPTIONS This option bypasses the pre-commit hook. See also link:hooks.html[hooks]. +--allow-empty:: + Usually recording a commit that has the exact same tree as its + sole parent commit and the command prevents you from making such + a mistake. This option bypasses the safety, and is primarily + for use by foreign scm interface scripts. + -e|--edit:: The message taken from file with `-F`, command line with `-m`, and from file with `-C` are usually used as the diff --git a/git-config.html b/git-config.html index 853dcb926..14615e116 100644 --- a/git-config.html +++ b/git-config.html @@ -283,7 +283,8 @@ git-config(1) Manual Page git-config [<file-option>] --unset-all name [value_regex] git-config [<file-option>] --rename-section old_name new_name git-config [<file-option>] --remove-section name -git-config [<file-option>] [-z|--null] -l | --list +git-config [<file-option>] [-z|--null] -l | --list +git-config [<file-option>] --get-color name [default]

DESCRIPTION

@@ -498,6 +499,17 @@ rather than from all available files.

contain line breaks.

+
+--get-color name default +
+
+

+ Find the color configured for name (e.g. color.diff.new) and + output it as the ANSI color escape sequence to the standard + output. The optional default parameter is used instead, if + there is no color configured for name. +

+

FILES

@@ -669,6 +681,15 @@ i.e. the one without a "for …" postfix, do something like this:

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

An example to use customized color from the configuration in your +script:

+
+
+
#!/bin/sh
+WS=$(git config --get-color color.diff.whitespace "blue reverse")
+RESET=$(git config --get-color "" "reset")
+echo "${WS}your whitespace color or blue reverse${RESET}"
+

CONFIGURATION FILE

@@ -1130,6 +1151,18 @@ branch.<name>.mergeoptions

+branch.<name>.rebase +
+
+

+ When true, rebase the branch <name> on top of the fetched branch, + instead of merging the default branch from the default remote. + NOTE: this is a possibly dangerous operation; do not use + it unless you understand the implications (see git-rebase(1) + for details). +

+
+
clean.requireForce
@@ -1971,7 +2004,7 @@ transfer.unpackLimit
diff --git a/git-config.txt b/git-config.txt index a592b61e2..764045078 100644 --- a/git-config.txt +++ b/git-config.txt @@ -20,6 +20,7 @@ SYNOPSIS 'git-config' [] --rename-section old_name new_name 'git-config' [] --remove-section name 'git-config' [] [-z|--null] -l | --list +'git-config' [] --get-color name [default] DESCRIPTION ----------- @@ -134,6 +135,12 @@ See also <>. output without getting confused e.g. by values that contain line breaks. +--get-color name default:: + + Find the color configured for `name` (e.g. `color.diff.new`) and + output it as the ANSI color escape sequence to the standard + output. The optional `default` parameter is used instead, if + there is no color configured for `name`. [[FILES]] FILES @@ -292,6 +299,15 @@ To add a new proxy, without altering any of the existing ones, use % git config core.gitproxy '"proxy-command" for example.com' ------------ +An example to use customized color from the configuration in your +script: + +------------ +#!/bin/sh +WS=$(git config --get-color color.diff.whitespace "blue reverse") +RESET=$(git config --get-color "" "reset") +echo "${WS}your whitespace color or blue reverse${RESET}" +------------ include::config.txt[] diff --git a/git-fast-export.html b/git-fast-export.html new file mode 100644 index 000000000..b8816345b --- /dev/null +++ b/git-fast-export.html @@ -0,0 +1,358 @@ + + + + + + +git-fast-export(1) + + + +

SYNOPSIS

+
+

git-fast-export [options] | git-fast-import

+
+

DESCRIPTION

+
+

This program dumps the given revisions in a form suitable to be piped +into git-fast-import(1).

+

You can use it as a human readable bundle replacement (see +git-bundle(1)), or as a kind of an interactive +git-filter-branch(1).

+
+

OPTIONS

+
+
+
+--progress=<n> +
+
+

+ Insert progress statements every <n> objects, to be shown by + git-fast-import(1) during import. +

+
+
+--signed-tags=(ignore|warn|strip|abort) +
+
+

+ Specify how to handle signed tags. Since any transformation + after the export can change the tag names (which can also happen + when excluding revisions) the signatures will not match. +

+

When asking to abort (which is the default), this program will die +when encountering a signed tag. With strip, the tags will be made +unsigned, with ignore, they will be silently ignored (i.e. not exported) +and with warn, they will be exported, but you will see a warning.

+
+
+
+

EXAMPLES

+
+
+
+
$ git fast-export --all | (cd /empty/repository && git fast-import)
+
+

This will export the whole repository and import it into the existing +empty repository. Except for reencoding commits that are not in +UTF-8, it would be a one-to-one mirror.

+
+
+
$ git fast-export master~5..master |
+        sed "s|refs/heads/master|refs/heads/other|" |
+        git fast-import
+
+

This makes a new branch called other from master~5..master +(i.e. if master has linear history, it will take the last 5 commits).

+

Note that this assumes that none of the blobs and commit messages +referenced by that revision range contains the string +refs/heads/master.

+
+

Limitations

+
+

Since git-fast-import(1) cannot tag trees, you will not be +able to export the linux-2.6.git repository completely, as it contains +a tag referencing a tree instead of a commit.

+
+

Author

+
+

Written by Johannes E. Schindelin <johannes.schindelin@gmx.de>.

+
+

Documentation

+
+

Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.

+
+

GIT

+
+

Part of the git(7) suite

+
+ + + diff --git a/git-fast-export.txt b/git-fast-export.txt new file mode 100644 index 000000000..073ff7f12 --- /dev/null +++ b/git-fast-export.txt @@ -0,0 +1,83 @@ +git-fast-export(1) +================== + +NAME +---- +git-fast-export - Git data exporter + + +SYNOPSIS +-------- +'git-fast-export [options]' | 'git-fast-import' + +DESCRIPTION +----------- +This program dumps the given revisions in a form suitable to be piped +into gitlink:git-fast-import[1]. + +You can use it as a human readable bundle replacement (see +gitlink:git-bundle[1]), or as a kind of an interactive +gitlink:git-filter-branch[1]. + + +OPTIONS +------- +--progress=:: + Insert 'progress' statements every objects, to be shown by + gitlink:git-fast-import[1] during import. + +--signed-tags=(ignore|warn|strip|abort):: + Specify how to handle signed tags. Since any transformation + after the export can change the tag names (which can also happen + when excluding revisions) the signatures will not match. ++ +When asking to 'abort' (which is the default), this program will die +when encountering a signed tag. With 'strip', the tags will be made +unsigned, with 'ignore', they will be silently ignored (i.e. not exported) +and with 'warn', they will be exported, but you will see a warning. + + +EXAMPLES +-------- + +------------------------------------------------------------------- +$ git fast-export --all | (cd /empty/repository && git fast-import) +------------------------------------------------------------------- + +This will export the whole repository and import it into the existing +empty repository. Except for reencoding commits that are not in +UTF-8, it would be a one-to-one mirror. + +----------------------------------------------------- +$ git fast-export master~5..master | + sed "s|refs/heads/master|refs/heads/other|" | + git fast-import +----------------------------------------------------- + +This makes a new branch called 'other' from 'master~5..master' +(i.e. if 'master' has linear history, it will take the last 5 commits). + +Note that this assumes that none of the blobs and commit messages +referenced by that revision range contains the string +'refs/heads/master'. + + +Limitations +----------- + +Since gitlink:git-fast-import[1] cannot tag trees, you will not be +able to export the linux-2.6.git repository completely, as it contains +a tag referencing a tree instead of a commit. + + +Author +------ +Written by Johannes E. Schindelin . + +Documentation +-------------- +Documentation by Johannes E. Schindelin . + +GIT +--- +Part of the gitlink:git[7] suite diff --git a/git-prune.html b/git-prune.html index 23c6013a2..e4f66ba61 100644 --- a/git-prune.html +++ b/git-prune.html @@ -272,7 +272,7 @@ git-prune(1) Manual Page

SYNOPSIS

-

git-prune [-n] [--] [<head>…]

+

git-prune [-n] [--expire <expire>] [--] [<head>…]

DESCRIPTION

@@ -305,6 +305,14 @@ running git prune-packed.

+--expire <time> +
+
+

+ Only expire loose objects older than <time>. +

+
+
<head>…
@@ -340,7 +348,7 @@ borrows from your repository via its
diff --git a/git-prune.txt b/git-prune.txt index 0ace233d1..9835bdb87 100644 --- a/git-prune.txt +++ b/git-prune.txt @@ -8,7 +8,7 @@ git-prune - Prune all unreachable objects from the object database SYNOPSIS -------- -'git-prune' [-n] [--] [...] +'git-prune' [-n] [--expire ] [--] [...] DESCRIPTION ----------- @@ -31,6 +31,9 @@ OPTIONS \--:: Do not interpret any more arguments as options. +\--expire