From dcc22ee22803fe091761047d69d9252945b04a19 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 3 Nov 2006 02:40:13 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.3.3-gc954 --- git-clone.html | 5 ++++- git-clone.txt | 1 + git-diff-index.html | 6 +++--- git-diff-index.txt | 4 ++-- git-repo-config.html | 42 ++++++++++++++++++++++++++++-------------- git-repo-config.txt | 31 ++++++++++++++++++------------- 6 files changed, 56 insertions(+), 33 deletions(-) diff --git a/git-clone.html b/git-clone.html index ada479b1e..427705a29 100644 --- a/git-clone.html +++ b/git-clone.html @@ -376,6 +376,9 @@ branch you are currently working on. Remote branches other than

+--origin <name> +
+
-o <name>
@@ -516,7 +519,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index f973c6431..86060472a 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -75,6 +75,7 @@ OPTIONS this option is used, neither the `origin` branch nor the default `remotes/origin` file is created. +--origin :: -o :: Instead of using the branch name 'origin' to keep track of the upstream repository, use instead. Note diff --git a/git-diff-index.html b/git-diff-index.html index 28c555225..b7581bbc0 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1008,7 +1008,7 @@ contents (the ones I'd write with a "git-write-tree")

For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly -what you are going to commit is without having to write a new tree +what you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do

@@ -1024,7 +1024,7 @@ matches my working directory. But doing a "git-diff-index" does:

-100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c
-

You can trivially see that the above is a rename.

+

You can see easily that the above is a rename.

In fact, "git-diff-index --cached" should always be entirely equivalent to actually doing a "git-write-tree" and comparing that. Except this one is much nicer for the case where you just want to check where you are.

@@ -1099,7 +1099,7 @@ always have the special all-zero sha1. diff --git a/git-diff-index.txt b/git-diff-index.txt index 9cd43f105..2df581c2c 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt @@ -54,7 +54,7 @@ If '--cached' is specified, it allows you to ask: For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly -*what* you are going to commit is without having to write a new tree +*what* you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do git-diff-index --cached HEAD @@ -68,7 +68,7 @@ matches my working directory. But doing a "git-diff-index" does: -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c -You can trivially see that the above is a rename. +You can see easily that the above is a rename. In fact, "git-diff-index --cached" *should* always be entirely equivalent to actually doing a "git-write-tree" and comparing that. Except this one is much diff --git a/git-repo-config.html b/git-repo-config.html index 31fb042ca..aa53ec579 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -266,20 +266,20 @@ git-repo-config(1) Manual Page

NAME

git-repo-config - - Get and set options in .git/config + Get and set repository or global options.

SYNOPSIS

-
git-repo-config [type] name [value [value_regex]] -git-repo-config [type] --replace-all name [value [value_regex]] -git-repo-config [type] --get name [value_regex] -git-repo-config [type] --get-all name [value_regex] -git-repo-config [type] --unset name [value_regex] -git-repo-config [type] --unset-all name [value_regex] -git-repo-config -l | --list
+
git-repo-config [--global] [type] name [value [value_regex]] +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] +git-repo-config [--global] [type] --unset name [value_regex] +git-repo-config [--global] [type] --unset-all name [value_regex] +git-repo-config [--global] -l | --list

DESCRIPTION

@@ -320,12 +320,17 @@ the section or key is invalid,

  • -you try to unset an option which does not exist, or +you try to unset an option which does not exist,

  • -you try to unset/set an option for which multiple lines match. +you try to unset/set an option for which multiple lines match, or +

    +
    • +
  • +

    +you use --global option without $HOME being properly set.

    • @@ -370,11 +375,19 @@ you try to unset/set an option for which multiple lines match.

    +--global +
    +
    +

    + Use global ~/.gitconfig file rather than the repository .git/config. +

    +
    +
    --unset

    - Remove the line matching the key from .git/config. + Remove the line matching the key from config file.

    @@ -382,7 +395,7 @@ you try to unset/set an option for which multiple lines match.

    - Remove all matching lines from .git/config. + Remove all matching lines from config file.

    @@ -390,7 +403,7 @@ you try to unset/set an option for which multiple lines match.

    - List all variables set in .git/config. + List all variables set in config file.

    @@ -404,6 +417,7 @@ GIT_CONFIG

    Take the configuration from the given file instead of .git/config. + Using the "--global" option forces this to ~/.gitconfig.

    @@ -1078,7 +1092,7 @@ receive.denyNonFastforwads diff --git a/git-repo-config.txt b/git-repo-config.txt index 8a1ab61e9..8199615dd 100644 --- a/git-repo-config.txt +++ b/git-repo-config.txt @@ -3,19 +3,19 @@ git-repo-config(1) NAME ---- -git-repo-config - Get and set options in .git/config +git-repo-config - Get and set repository or global options. SYNOPSIS -------- [verse] -'git-repo-config' [type] name [value [value_regex]] -'git-repo-config' [type] --replace-all name [value [value_regex]] -'git-repo-config' [type] --get name [value_regex] -'git-repo-config' [type] --get-all name [value_regex] -'git-repo-config' [type] --unset name [value_regex] -'git-repo-config' [type] --unset-all name [value_regex] -'git-repo-config' -l | --list +'git-repo-config' [--global] [type] name [value [value_regex]] +'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] +'git-repo-config' [--global] [type] --unset name [value_regex] +'git-repo-config' [--global] [type] --unset-all name [value_regex] +'git-repo-config' [--global] -l | --list DESCRIPTION ----------- @@ -41,8 +41,9 @@ This command will fail if: . Can not write to .git/config, . no section was provided, . the section or key is invalid, -. you try to unset an option which does not exist, or -. you try to unset/set an option for which multiple lines match. +. you try to unset an option which does not exist, +. you try to unset/set an option for which multiple lines match, or +. you use --global option without $HOME being properly set. OPTIONS @@ -64,14 +65,17 @@ OPTIONS --get-regexp:: Like --get-all, but interprets the name as a regular expression. +--global:: + Use global ~/.gitconfig file rather than the repository .git/config. + --unset:: - Remove the line matching the key from .git/config. + Remove the line matching the key from config file. --unset-all:: - Remove all matching lines from .git/config. + Remove all matching lines from config file. -l, --list:: - List all variables set in .git/config. + List all variables set in config file. ENVIRONMENT @@ -79,6 +83,7 @@ ENVIRONMENT GIT_CONFIG:: Take the configuration from the given file instead of .git/config. + Using the "--global" option forces this to ~/.gitconfig. GIT_CONFIG_LOCAL:: Currently the same as $GIT_CONFIG; when Git will support global -- 2.26.2