From 1caaf47fc4409328ee5086d389322ea8829cdff8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 31 Dec 2006 08:29:35 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0-rc0-g2708 --- config.txt | 14 +++++++------- git-fetch.html | 17 +++++++++-------- git-pull.html | 17 +++++++++-------- git-push.html | 17 +++++++++-------- git-repo-config.html | 21 +++++++++------------ git-repo-config.txt | 5 ++++- urls.txt | 23 ++++++++++++++++------- 7 files changed, 63 insertions(+), 51 deletions(-) diff --git a/config.txt b/config.txt index 178e0e1e2..2f4fc2525 100644 --- a/config.txt +++ b/config.txt @@ -82,13 +82,13 @@ core.logAllRefUpdates:: only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/" file is automatically created for branch heads. - - This information can be used to determine what commit - was the tip of a branch "2 days ago". - - This value is true by default in a repository that has - a working directory associated with it, and false by - default in a bare repository. ++ +This information can be used to determine what commit +was the tip of a branch "2 days ago". ++ +This value is true by default in a repository that has +a working directory associated with it, and false by +default in a bare repository. core.repositoryFormatVersion:: Internal variable identifying the repository format and layout diff --git a/git-fetch.html b/git-fetch.html index 021522b7c..93806b28e 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -556,7 +556,7 @@ identical to the last three above, respectively:

In addition to the above, as a short-hand, the name of a file in $GIT_DIR/remotes directory can be given; the named file should be in the following format:

-
+
URL: one of the above URL format
 Push: <refspec>
@@ -570,11 +570,12 @@ respectively.  Multiple Push: and Pull: lines may
 be specified for additional branch mappings.

 
Or, equivalently, in the $GIT_DIR/config (note the use
 of fetch instead of Pull:):

-

+

 

-
url = <url>
-push = <refspec>
-fetch = <refspec>

+
[remote "<remote>"]
+        url = <url>
+        push = <refspec>
+        fetch = <refspec>

 

 
The name of a file in $GIT_DIR/branches directory can be
 specified as an older notation short-hand; the named
@@ -584,13 +585,13 @@ name of remote head (URL fragment notation).
 $GIT_DIR/branches/<remote> file that stores a <url>
 without the fragment is equivalent to have this in the
 corresponding file in the $GIT_DIR/remotes/ directory.

-

+

 

 
URL: <url>
 Pull: refs/heads/master:<remote>

 

 
while having <url>#<head> is equivalent to

-

+

 

 
URL: <url>
 Pull: refs/heads/<head>:<remote>

@@ -615,7 +616,7 @@ Junio C Hamano <junkio@cox.net>

 

 
 
diff --git a/git-pull.html b/git-pull.html
index 10171f38b..a518025cc 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -600,7 +600,7 @@ identical to the last three above, respectively:

 
In addition to the above, as a short-hand, the name of a
 file in $GIT_DIR/remotes directory can be given; the
 named file should be in the following format:

-

+

 

 
URL: one of the above URL format
 Push: <refspec>
@@ -614,11 +614,12 @@ respectively.  Multiple Push: and Pull: lines may
 be specified for additional branch mappings.

 
Or, equivalently, in the $GIT_DIR/config (note the use
 of fetch instead of Pull:):

-

+

 

-
url = <url>
-push = <refspec>
-fetch = <refspec>

+
[remote "<remote>"]
+        url = <url>
+        push = <refspec>
+        fetch = <refspec>

 

 
The name of a file in $GIT_DIR/branches directory can be
 specified as an older notation short-hand; the named
@@ -628,13 +629,13 @@ name of remote head (URL fragment notation).
 $GIT_DIR/branches/<remote> file that stores a <url>
 without the fragment is equivalent to have this in the
 corresponding file in the $GIT_DIR/remotes/ directory.

-

+

 

 
URL: <url>
 Pull: refs/heads/master:<remote>

 

 
while having <url>#<head> is equivalent to

-

+

 

 
URL: <url>
 Pull: refs/heads/<head>:<remote>

@@ -817,7 +818,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

 

 
 
diff --git a/git-push.html b/git-push.html
index 97a00dd26..f586e87d2 100644
--- a/git-push.html
+++ b/git-push.html
@@ -447,7 +447,7 @@ identical to the last three above, respectively:

 
In addition to the above, as a short-hand, the name of a
 file in $GIT_DIR/remotes directory can be given; the
 named file should be in the following format:

-

+

 

 
URL: one of the above URL format
 Push: <refspec>
@@ -461,11 +461,12 @@ respectively.  Multiple Push: and Pull: lines may
 be specified for additional branch mappings.

 
Or, equivalently, in the $GIT_DIR/config (note the use
 of fetch instead of Pull:):

-

+

 

-
url = <url>
-push = <refspec>
-fetch = <refspec>

+
[remote "<remote>"]
+        url = <url>
+        push = <refspec>
+        fetch = <refspec>

 

 
The name of a file in $GIT_DIR/branches directory can be
 specified as an older notation short-hand; the named
@@ -475,13 +476,13 @@ name of remote head (URL fragment notation).
 $GIT_DIR/branches/<remote> file that stores a <url>
 without the fragment is equivalent to have this in the
 corresponding file in the $GIT_DIR/remotes/ directory.

-

+

 

 
URL: <url>
 Pull: refs/heads/master:<remote>

 

 
while having <url>#<head> is equivalent to

-

+

 

 
URL: <url>
 Pull: refs/heads/<head>:<remote>

@@ -502,7 +503,7 @@ by Linus Torvalds <torvalds@osdl.org>

 

 
 
diff --git a/git-repo-config.html b/git-repo-config.html
index 52503e05f..ed5373e49 100644
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -430,7 +430,10 @@ you use --global option without $HOME being properly set.
 
 

 

-        git-repo-config will ensure that the output is a simple decimal number
+        git-repo-config will ensure that the output is a simple
+        decimal number.  An optional value suffix of k, m, or g
+        in the config file will cause the value to be multiplied
+        by 1024, 1048576, or 1073741824 prior to output.
 

 

 
@@ -662,17 +665,11 @@ core.logAllRefUpdates
         variable is set to true, missing "$GIT_DIR/logs/<ref>"
         file is automatically created for branch heads.
 

-

-

-
This information can be used to determine what commit
-was the tip of a branch "2 days ago".

-

-

-

-
This value is true by default in a repository that has
+
This information can be used to determine what commit
+was the tip of a branch "2 days ago".

+
This value is true by default in a repository that has
 a working directory associated with it, and false by
-default in a bare repository.

-

+default in a bare repository.

 
 

 core.repositoryFormatVersion
@@ -1215,7 +1212,7 @@ receive.denyNonFastForwards
 

 
 
diff --git a/git-repo-config.txt b/git-repo-config.txt
index b379ec507..c55a8ba0d 100644
--- a/git-repo-config.txt
+++ b/git-repo-config.txt
@@ -87,7 +87,10 @@ OPTIONS
 	git-repo-config will ensure that the output is "true" or "false"
 
 --int::
-	git-repo-config will ensure that the output is a simple decimal number
+	git-repo-config will ensure that the output is a simple
+	decimal number.  An optional value suffix of 'k', 'm', or 'g'
+	in the config file will cause the value to be multiplied
+	by 1024, 1048576, or 1073741824 prior to output.
 
 
 ENVIRONMENT
diff --git a/urls.txt b/urls.txt
index 670827c32..870c95073 100644
--- a/urls.txt
+++ b/urls.txt
@@ -40,9 +40,11 @@ In addition to the above, as a short-hand, the name of a
 file in `$GIT_DIR/remotes` directory can be given; the
 named file should be in the following format:
 
-	URL: one of the above URL format
-	Push: 
-	Pull: 
+------------
+URL: one of the above URL format
+Push: 
+Pull: 
+------------
 
 Then such a short-hand is specified in place of
  without  parameters on the command
@@ -54,10 +56,12 @@ be specified for additional branch mappings.
 Or, equivalently, in the `$GIT_DIR/config` (note the use
 of `fetch` instead of `Pull:`):
 
+------------
 [remote ""]
 	url = 
 	push = 
 	fetch = 
+------------
 
 The name of a file in `$GIT_DIR/branches` directory can be
 specified as an older notation short-hand; the named
@@ -68,10 +72,15 @@ name of remote head (URL fragment notation).
 without the fragment is equivalent to have this in the
 corresponding file in the `$GIT_DIR/remotes/` directory.
 
-	URL: 
-	Pull: refs/heads/master:
+------------
+URL: 
+Pull: refs/heads/master:
+------------
+
 
 while having `#` is equivalent to
 
-	URL: 
-	Pull: refs/heads/:
+------------
+URL: 
+Pull: refs/heads/:
+------------
-- 
2.26.2