mirror of
https://github.com/git/git
synced 2024-09-06 00:18:22 +00:00
Merge branch 'ma/doc-folder-to-directory'
Consistently use 'directory', not 'folder', to call the filesystem entity that collects a group of files and, eh, directories. * ma/doc-folder-to-directory: gitweb.txt: change "folder" to "directory" gitignore.txt: change "folder" to "directory" git-multi-pack-index.txt: change "folder" to "directory"
This commit is contained in:
commit
fc0c491f65
|
@ -99,13 +99,13 @@ associated `.keep` file will not be selected for the batch to repack.
|
|||
EXAMPLES
|
||||
--------
|
||||
|
||||
* Write a MIDX file for the packfiles in the current .git folder.
|
||||
* Write a MIDX file for the packfiles in the current `.git` directory.
|
||||
+
|
||||
-----------------------------------------------
|
||||
$ git multi-pack-index write
|
||||
-----------------------------------------------
|
||||
|
||||
* Write a MIDX file for the packfiles in the current .git folder with a
|
||||
* Write a MIDX file for the packfiles in the current `.git` directory with a
|
||||
corresponding bitmap.
|
||||
+
|
||||
-------------------------------------------------------------
|
||||
|
@ -118,7 +118,7 @@ $ git multi-pack-index write --preferred-pack=<pack> --bitmap
|
|||
$ git multi-pack-index --object-dir <alt> write
|
||||
-----------------------------------------------
|
||||
|
||||
* Verify the MIDX file for the packfiles in the current .git folder.
|
||||
* Verify the MIDX file for the packfiles in the current `.git` directory.
|
||||
+
|
||||
-----------------------------------------------
|
||||
$ git multi-pack-index verify
|
||||
|
|
|
@ -155,7 +155,7 @@ accessed from the index or a tree versus from the filesystem.
|
|||
EXAMPLES
|
||||
--------
|
||||
|
||||
- The pattern `hello.*` matches any file or folder
|
||||
- The pattern `hello.*` matches any file or directory
|
||||
whose name begins with `hello.`. If one wants to restrict
|
||||
this only to the directory and not in its subdirectories,
|
||||
one can prepend the pattern with a slash, i.e. `/hello.*`;
|
||||
|
|
|
@ -547,7 +547,7 @@ like this:
|
|||
# make the front page an internal rewrite to the gitweb script
|
||||
RewriteRule ^/$ /cgi-bin/gitweb.cgi [QSA,L,PT]
|
||||
|
||||
# look for a public_git folder in unix users' home
|
||||
# look for a public_git directory in unix users' home
|
||||
# http://git.example.org/~<user>/
|
||||
RewriteRule ^/\~([^\/]+)(/|/gitweb.cgi)?$ /cgi-bin/gitweb.cgi \
|
||||
[QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]
|
||||
|
|
Loading…
Reference in a new issue