From 75cc4c91e042ed3ab841e5e50cac5a974bfd5f4e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 24 Jul 2006 08:25:03 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.2-rc1-g0d51 --- config.txt | 15 +++++++++++++++ git-cvsexportcommit.html | 13 +++++++++++-- git-cvsexportcommit.txt | 8 ++++++-- git-repo-config.html | 27 ++++++++++++++++++++++++++- git-tar-tree.html | 17 +++++++++++++++-- git-tar-tree.txt | 15 ++++++++++++++- 6 files changed, 87 insertions(+), 8 deletions(-) diff --git a/config.txt b/config.txt index 0b434c1f1..9d08dfced 100644 --- a/config.txt +++ b/config.txt @@ -193,6 +193,10 @@ merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. +pack.window:: + The size of the window used by gitlink:git-pack-objects[1] when no + window size is given on the command line. Defaults to 10. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. @@ -208,6 +212,17 @@ showbranch.default:: The default set of branches for gitlink:git-show-branch[1]. See gitlink:git-show-branch[1]. +tar.umask:: + By default, git-link:git-tar-tree[1] sets file and directories modes + to 0666 or 0777. While this is both useful and acceptable for projects + such as the Linux Kernel, it might be excessive for other projects. + With this variable, it becomes possible to tell + git-link:git-tar-tree[1] to apply a specific umask to the modes above. + The special value "user" indicates that the user's current umask will + be used. This should be enough for most projects, as it will lead to + the same permissions as git-link:git-checkout[1] would use. The default + value remains 0, which means world read-write. + user.email:: Your email address to be recorded in any newly created commits. Can be overridden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL' diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index c069a6620..e23b12ecd 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -272,7 +272,7 @@ git-cvsexportcommit(1) Manual Page

SYNOPSIS

-

git-cvsexportcommit [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

+

git-cvsexportcommit [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

DESCRIPTION

@@ -309,6 +309,15 @@ should the changeset be done against.

+-a +
+
+

+ Add authorship information. Adds Author line, and Committer (if + different from Author) to the message. +

+
+
-f
@@ -377,7 +386,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 27ac72d98..092d0d673 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -8,7 +8,7 @@ git-cvsexportcommit - Export a commit to a CVS checkout SYNOPSIS -------- -'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION @@ -36,9 +36,13 @@ OPTIONS commit if any hunks fail to apply or there were other problems. -p:: - Be pedantic (paranoid) when applying patches. Invokes patch with + Be pedantic (paranoid) when applying patches. Invokes patch with --fuzz=0 +-a:: + Add authorship information. Adds Author line, and Committer (if + different from Author) to the message. + -f:: Force the merge even if the files are not up to date. diff --git a/git-repo-config.html b/git-repo-config.html index ae7a84646..15bdeb4ac 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -836,6 +836,15 @@ merge.summary

+pack.window +
+
+

+ The size of the window used by git-pack-objects(1) when no + window size is given on the command line. Defaults to 10. +

+
+
pull.octopus
@@ -871,6 +880,22 @@ showbranch.default

+tar.umask +
+
+

+ By default, sets file and directories modes + to 0666 or 0777. While this is both useful and acceptable for projects + such as the Linux Kernel, it might be excessive for other projects. + With this variable, it becomes possible to tell + to apply a specific umask to the modes above. + The special value "user" indicates that the user's current umask will + be used. This should be enough for most projects, as it will lead to + the same permissions as would use. The default + value remains 0, which means world read-write. +

+
+
user.email
@@ -924,7 +949,7 @@ imap diff --git a/git-tar-tree.html b/git-tar-tree.html index 977049948..3c847e708 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html @@ -317,7 +317,20 @@ It can be extracted using git-get-tar-commit-id.

-

Examples

+

CONFIGURATION

+
+

By default, file and directories modes are set to 0666 or 0777. It is +possible to change this by setting the "umask" variable in the +repository configuration as follows :

+
+
+
umask = 002     ;# group friendly
+
+

The special umask value "user" indicates that the user's current umask +will be used instead. The default value remains 0, which means world +readable/writable files and directories.

+
+

EXAMPLES

@@ -371,7 +384,7 @@ git tar-tree --remote=example.com:git.git v1.4.0 >git-1.4.0.tar
diff --git a/git-tar-tree.txt b/git-tar-tree.txt index f2675c419..7a99acf2e 100644 --- a/git-tar-tree.txt +++ b/git-tar-tree.txt @@ -37,7 +37,20 @@ OPTIONS Instead of making a tar archive from local repository, retrieve a tar archive from a remote repository. -Examples +CONFIGURATION +------------- +By default, file and directories modes are set to 0666 or 0777. It is +possible to change this by setting the "umask" variable in the +repository configuration as follows : + +[tar] + umask = 002 ;# group friendly + +The special umask value "user" indicates that the user's current umask +will be used instead. The default value remains 0, which means world +readable/writable files and directories. + +EXAMPLES -------- git tar-tree HEAD junk | (cd /var/tmp/ && tar xf -):: -- 2.26.2