From: Junio C Hamano Date: Thu, 23 Aug 2007 00:25:09 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3-rc6-9-gaabb2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bdebabb5d714259fb5c60f5f85a0f13a06afe2eb;p=git.git Autogenerated HTML docs for v1.5.3-rc6-9-gaabb2 --- diff --git a/config.txt b/config.txt index 46f40ad4c..462595cf8 100644 --- a/config.txt +++ b/config.txt @@ -675,15 +675,11 @@ showbranch.default:: See gitlink:git-show-branch[1]. tar.umask:: - By default, gitlink: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 - gitlink: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 gitlink:git-checkout[1] would use. The default - value remains 0, which means world read-write. + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) and + gitlink:git-archive[1]. user.email:: Your email address to be recorded in any newly created commits. diff --git a/git-archive.html b/git-archive.html index f93361a51..402de7cee 100644 --- a/git-archive.html +++ b/git-archive.html @@ -388,16 +388,20 @@ path

CONFIGURATION

-

By default, file and directories modes are set to 0666 or 0777 in tar -archives. 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.

+
+
+tar.umask +
+
+

+ This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) for + details. +

+
+

EXAMPLES

@@ -454,7 +458,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d
diff --git a/git-archive.txt b/git-archive.txt index 4da07c158..f2080eb6a 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -72,16 +72,13 @@ zip CONFIGURATION ------------- -By default, file and directories modes are set to 0666 or 0777 in tar -archives. 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. +tar.umask:: + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) for + details. EXAMPLES -------- diff --git a/git-config.html b/git-config.html index 2c95d21de..a820b02d2 100644 --- a/git-config.html +++ b/git-config.html @@ -1772,15 +1772,11 @@ tar.umask

- By default, 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-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-checkout(1) would use. The default - value remains 0, which means world read-write. + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) and + git-archive(1).

@@ -1883,7 +1879,7 @@ transfer.unpackLimit diff --git a/git-rev-list.html b/git-rev-list.html index cef5df943..d474c77c3 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -679,9 +679,9 @@ this causes the output to have two extra lines of information taken from the reflog. By default, commit@{Nth} notation is used in the output. When the starting commit is specified as instead. Under --pretty=oneline, the commit message is -prefixed with this information on the same line.
-Cannot be combined with --reverse. +prefixed with this information on the same line.

+

Cannot be combined with --reverse.

--merge @@ -782,7 +782,7 @@ we are bisecting right now to bisect_all.

Output the commits in reverse order. - Cannot be combined with --walk-reflogs. + Cannot be combined with --walk-reflogs.

@@ -1144,7 +1144,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index cbbc23454..a0c611e74 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -298,8 +298,8 @@ used in the output. When the starting commit is specified as 'commit@{now}', output also uses 'commit@\{timestamp}' notation instead. Under '\--pretty=oneline', the commit message is prefixed with this information on the same line. -+ -Cannot be combined with --reverse. + +Cannot be combined with '\--reverse'. --merge:: @@ -375,7 +375,7 @@ By default, the commits are shown in reverse chronological order. --reverse:: Output the commits in reverse order. - Cannot be combined with --walk-reflogs. + Cannot be combined with '\--walk-reflogs'. Object Traversal ~~~~~~~~~~~~~~~~ diff --git a/git-svn.html b/git-svn.html index 0735891f4..f40dcc183 100644 --- a/git-svn.html +++ b/git-svn.html @@ -973,6 +973,33 @@ the user on the git side. git-svn does however follow copy history of the directory that it is tracking, however (much like how svn log works).

+

CAVEATS

+
+

For the sake of simplicity and interoperating with a less-capable system +(SVN), it is recommended that all git-svn users clone, fetch and dcommit +directly from the SVN server, and avoid all git-clone/pull/merge/push +operations between git repositories and branches. The recommended +method of exchanging code between git branches and users is +git-format-patch and git-am, or just dcommiting to the SVN repository.

+

Running git-merge or git-pull is NOT recommended on a branch you +plan to dcommit from. Subversion does not represent merges in any +reasonable or useful fashion; so users using Subversion cannot see any +merges you've made. Furthermore, if you merge or pull from a git branch +that is a mirror of an SVN branch, dcommit may commit to the wrong +branch.

+

git-clone does not clone branches under the refs/remotes/ hierarchy or +any git-svn metadata, or config. So repositories created and managed with +using git-svn should use rsync(1) for cloning, if cloning is to be done +at all.

+

Since dcommit uses rebase internally, any git branches you git-push to +before dcommit on will require forcing an overwrite of the existing ref +on the remote repository. This is generally considered bad practice, +see the git-push(1) documentation for details.

+

Do not use the --amend option of git-commit(1) on a change you've +already dcommitted. It is considered bad practice to --amend commits +you've already pushed to a remote repository for other users, and +dcommit with SVN is analogous to that.

+

BUGS

We ignore all SVN properties except svn:executable. Any unhandled @@ -1023,7 +1050,7 @@ should be manually entered with a text-editor or using

diff --git a/git-svn.txt b/git-svn.txt index 816340b94..fbc58871f 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -479,6 +479,38 @@ the user on the git side. git-svn does however follow copy history of the directory that it is tracking, however (much like how 'svn log' works). +CAVEATS +------- + +For the sake of simplicity and interoperating with a less-capable system +(SVN), it is recommended that all git-svn users clone, fetch and dcommit +directly from the SVN server, and avoid all git-clone/pull/merge/push +operations between git repositories and branches. The recommended +method of exchanging code between git branches and users is +git-format-patch and git-am, or just dcommiting to the SVN repository. + +Running 'git-merge' or 'git-pull' is NOT recommended on a branch you +plan to dcommit from. Subversion does not represent merges in any +reasonable or useful fashion; so users using Subversion cannot see any +merges you've made. Furthermore, if you merge or pull from a git branch +that is a mirror of an SVN branch, dcommit may commit to the wrong +branch. + +'git-clone' does not clone branches under the refs/remotes/ hierarchy or +any git-svn metadata, or config. So repositories created and managed with +using git-svn should use rsync(1) for cloning, if cloning is to be done +at all. + +Since 'dcommit' uses rebase internally, any git branches you git-push to +before dcommit on will require forcing an overwrite of the existing ref +on the remote repository. This is generally considered bad practice, +see the git-push(1) documentation for details. + +Do not use the --amend option of git-commit(1) on a change you've +already dcommitted. It is considered bad practice to --amend commits +you've already pushed to a remote repository for other users, and +dcommit with SVN is analogous to that. + BUGS ---- diff --git a/git-svnimport.html b/git-svnimport.html index 532c06442..14f2b941a 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -368,6 +368,14 @@ incremental SVN imports.

+-u +
+
+

+ Replace underscores in tag names with periods. +

+
+
-I <ignorefile_name>
@@ -534,7 +542,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-svnimport.txt b/git-svnimport.txt index e97d15e8f..71aad8b45 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt @@ -68,6 +68,9 @@ When importing incrementally, you might need to edit the .git/svn2git file. Prepend 'rX: ' to commit messages, where X is the imported subversion revision. +-u:: + Replace underscores in tag names with periods. + -I :: Import the svn:ignore directory property to files with this name in each directory. (The Subversion and GIT ignore diff --git a/git-tar-tree.html b/git-tar-tree.html index e26799f50..b9d0f5285 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html @@ -321,16 +321,20 @@ It can be extracted using git-get-tar-commit-id.

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 is 002, which means group -readable/writable files and directories.

+
+
+tar.umask +
+
+

+ This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) for + details. +

+
+

EXAMPLES

@@ -395,7 +399,7 @@ git tar-tree HEAD:Documentation/ git-docs > git-1.4.0-docs.tar
diff --git a/git-tar-tree.txt b/git-tar-tree.txt index 2d01d9666..434607bfb 100644 --- a/git-tar-tree.txt +++ b/git-tar-tree.txt @@ -42,16 +42,13 @@ OPTIONS 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 is 002, which means group -readable/writable files and directories. +tar.umask:: + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) for + details. EXAMPLES --------