From 0d8f074c5acb03ee33fcb21f769d26b14917565d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 3 Nov 2006 02:40:25 +0000 Subject: [PATCH] Autogenerated man pages for v1.4.3.3-gc954 --- man1/git-clone.1 | 4 ++-- man1/git-diff-index.1 | 6 +++--- man1/git-repo-config.1 | 36 +++++++++++++++++++++--------------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/man1/git-clone.1 b/man1/git-clone.1 index b87190134..6d939e595 100755 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CLONE" "1" "10/03/2006" "" "" +.TH "GIT\-CLONE" "1" "11/03/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -61,7 +61,7 @@ branch nor the default remotes/origin file is created. .TP -\-o +\-\-origin , \-o Instead of using the branch name \fIorigin\fR to keep track of the upstream repository, use instead. Note that the shorthand name stored in diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index 0032ec129..828b6b10d 100755 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-INDEX" "1" "10/27/2006" "" "" +.TH "GIT\-DIFF\-INDEX" "1" "11/03/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -439,7 +439,7 @@ If \fI\-\-cached\fR is specified, it allows you to ask: show me the differences between HEAD and the current index contents (the ones I'd write with a "git\-write\-tree") .fi -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 \fBwhat\fR you are going to commit is without having to write a new tree object and compare it that way, and to do that, you just do +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 \fBwhat\fR 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 .sp .sp .nf @@ -453,7 +453,7 @@ torvalds@ppc970:~/git> git\-diff\-index \-\-cached HEAD \-100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git\-commit.c .fi -You can trivially see that the above is a rename. +You can see easily that the above is a rename. .sp In fact, "git\-diff\-index \-\-cached" \fBshould\fR 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. .sp diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index cb8b48c2d..daa116c5e 100755 --- a/man1/git-repo-config.1 +++ b/man1/git-repo-config.1 @@ -2,23 +2,23 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REPO\-CONFIG" "1" "11/02/2006" "" "" +.TH "GIT\-REPO\-CONFIG" "1" "11/03/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -git\-repo\-config \- Get and set options in .git/config +git\-repo\-config \- Get and set repository or global options. .SH "SYNOPSIS" .sp .nf -\fIgit\-repo\-config\fR [type] name [value [value_regex]] -\fIgit\-repo\-config\fR [type] \-\-replace\-all name [value [value_regex]] -\fIgit\-repo\-config\fR [type] \-\-get name [value_regex] -\fIgit\-repo\-config\fR [type] \-\-get\-all name [value_regex] -\fIgit\-repo\-config\fR [type] \-\-unset name [value_regex] -\fIgit\-repo\-config\fR [type] \-\-unset\-all name [value_regex] -\fIgit\-repo\-config\fR \-l | \-\-list +\fIgit\-repo\-config\fR [\-\-global] [type] name [value [value_regex]] +\fIgit\-repo\-config\fR [\-\-global] [type] \-\-replace\-all name [value [value_regex]] +\fIgit\-repo\-config\fR [\-\-global] [type] \-\-get name [value_regex] +\fIgit\-repo\-config\fR [\-\-global] [type] \-\-get\-all name [value_regex] +\fIgit\-repo\-config\fR [\-\-global] [type] \-\-unset name [value_regex] +\fIgit\-repo\-config\fR [\-\-global] [type] \-\-unset\-all name [value_regex] +\fIgit\-repo\-config\fR [\-\-global] \-l | \-\-list .fi .SH "DESCRIPTION" 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. @@ -43,10 +43,13 @@ no section was provided, the section or key is invalid, .TP 5. -you try to unset an option which does not exist, or +you try to unset an option which does not exist, .TP 6. -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 +.TP +7. +you use \-\-global option without $HOME being properly set. .SH "OPTIONS" .TP \-\-replace\-all @@ -61,18 +64,21 @@ Like get, but does not fail if the number of values for the key is not exactly o \-\-get\-regexp Like \-\-get\-all, but interprets the name as a regular expression. .TP +\-\-global +Use global ~/.gitconfig file rather than the repository .git/config. +.TP \-\-unset -Remove the line matching the key from .git/config. +Remove the line matching the key from config file. .TP \-\-unset\-all -Remove all matching lines from .git/config. +Remove all matching lines from config file. .TP \-l, \-\-list -List all variables set in .git/config. +List all variables set in config file. .SH "ENVIRONMENT" .TP GIT_CONFIG -Take the configuration from the given file instead of .git/config. +Take the configuration from the given file instead of .git/config. Using the "\-\-global" option forces this to ~/.gitconfig. .TP GIT_CONFIG_LOCAL Currently the same as $GIT_CONFIG; when Git will support global configuration files, this will cause it to take the configuration from the global configuration file in addition to the given file. -- 2.26.2