From c71a873e2fbd4398c46a81824a0ccc4d8039faa4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 4 Aug 2007 00:27:26 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc4 --- RelNotes-1.5.3.txt | 6 +++--- config.txt | 2 +- git-config.html | 8 +++----- git-config.txt | 4 +--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt index 03d18430e..21bb1fc6f 100644 --- a/RelNotes-1.5.3.txt +++ b/RelNotes-1.5.3.txt @@ -47,8 +47,8 @@ Updates since v1.5.2 renaming history of a single file. - "git-filter-branch" lets you rewrite the revision history of - the current branch, creating a new branch. You can specify a - number of filters to modify the commits, files and trees. + specified branches. You can specify a number of filters to + modify the commits, files and trees. - "git-cvsserver" learned new options (--base-path, --export-all, --strict-paths) inspired by git-daemon. @@ -274,6 +274,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.3-rc3-119-g50cff52 +O=v1.5.3-rc4 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/config.txt b/config.txt index 3135cb7a6..de9e72b56 100644 --- a/config.txt +++ b/config.txt @@ -101,7 +101,7 @@ Example # Proxy settings [core] - gitProxy="ssh" for "ssh://kernel.org/" + gitProxy="ssh" for "kernel.org" gitProxy=default-proxy ; for the rest Variables diff --git a/git-config.html b/git-config.html index 61fa4723c..6cd648711 100644 --- a/git-config.html +++ b/git-config.html @@ -601,9 +601,7 @@ GIT_CONFIG_LOCAL
; Proxy settings
 [core]
-        gitproxy="ssh" for "ssh://kernel.org/"
         gitproxy="proxy-command" for kernel.org
-        gitproxy="myprotocol-command" for "my://"
         gitproxy=default-proxy ; for all the rest

you can set the filemode to true with

@@ -666,7 +664,7 @@ i.e. the one without a "for …" postfix, do something like this:

To add a new proxy, without altering any of the existing ones, use

-
% git config core.gitproxy '"proxy" for example.com'
+
% git config core.gitproxy '"proxy-command" for example.com'

CONFIGURATION FILE

@@ -761,7 +759,7 @@ customary UNIX fashion.

# Proxy settings
 [core]
-        gitProxy="ssh" for "ssh://kernel.org/"
+        gitProxy="ssh" for "kernel.org"
         gitProxy=default-proxy ; for the rest

Variables

@@ -1885,7 +1883,7 @@ transfer.unpackLimit diff --git a/git-config.txt b/git-config.txt index 8451cccf8..c3dffffe3 100644 --- a/git-config.txt +++ b/git-config.txt @@ -214,9 +214,7 @@ Given a .git/config like this: ; Proxy settings [core] - gitproxy="ssh" for "ssh://kernel.org/" gitproxy="proxy-command" for kernel.org - gitproxy="myprotocol-command" for "my://" gitproxy=default-proxy ; for all the rest you can set the filemode to true with @@ -291,7 +289,7 @@ To actually match only values with an exclamation mark, you have to To add a new proxy, without altering any of the existing ones, use ------------ -% git config core.gitproxy '"proxy" for example.com' +% git config core.gitproxy '"proxy-command" for example.com' ------------ -- 2.26.2