From 3f403b04bd95096f37297ab2cfbd4ad1f6dbb904 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 13 Dec 2006 10:14:13 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4.2-g1349 --- config.txt | 12 ++++++------ git-push.html | 26 +++++++++----------------- git-push.txt | 15 +++++++++------ git-repo-config.html | 14 +++++++------- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/config.txt b/config.txt index 21ec55797..f5a552ee8 100644 --- a/config.txt +++ b/config.txt @@ -137,16 +137,16 @@ branch..merge:: this option, `git pull` defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. -pager.color:: +color.pager:: A boolean to enable/disable colored output when the pager is in use (default is true). -diff.color:: +color.diff:: When true (or `always`), always use colors in patch. When false (or `never`), never. When set to `auto`, use colors only when the output is to the terminal. -diff.color.:: +color.diff.:: Use customized color for diff colorization. `` specifies which part of the patch to use the specified color, and is one of `plain` (context text), `meta` @@ -271,19 +271,19 @@ showbranch.default:: The default set of branches for gitlink:git-show-branch[1]. See gitlink:git-show-branch[1]. -status.color:: +color.status:: A boolean to enable/disable color in the output of gitlink:git-status[1]. May be set to `true` (or `always`), `false` (or `never`) or `auto`, in which case colors are used only when the output is to a terminal. Defaults to false. -status.color.:: +color.status.:: Use customized color for status colorization. `` is one of `header` (the header text of the status message), `updated` (files which are updated but not committed), `changed` (files which are changed but not updated in the index), or `untracked` (files which are not tracked by git). The values of - these variables may be specified as in diff.color.. + these variables may be specified as in color.diff.. tar.umask:: By default, gitlink:git-tar-tree[1] sets file and directories modes diff --git a/git-push.html b/git-push.html index b323bf0e0..97a00dd26 100644 --- a/git-push.html +++ b/git-push.html @@ -317,21 +317,12 @@ on the command line nor in any Push line of the corresponding remotes file---see below), then all the refs that exist both on the local side and on the remote side are updated.

-

Some short-cut notations are also supported.

-
    -
  • -

    -tag <tag> means the same as refs/tags/<tag>:refs/tags/<tag>. -

    -
    • -
  • -

    -A parameter <ref> without a colon is equivalent to - <ref>:<ref>, hence updates <ref> in the destination from <ref> - in the source. -

    -
    • -
+

tag <tag> means the same as refs/tags/<tag>:refs/tags/<tag>.

+

A parameter <ref> without a colon is equivalent to +<ref>:<ref>, hence updates <ref> in the destination from <ref> +in the source.

+

Pushing an empty <src> allows you to delete the <dst> ref from +the remote repository.

--all @@ -498,7 +489,8 @@ Pull: refs/heads/<head>:<remote>

Author

-

Written by Junio C Hamano <junkio@cox.net>

+

Written by Junio C Hamano <junkio@cox.net>, later rewritten in C +by Linus Torvalds <torvalds@osdl.org>

Documentation

@@ -510,7 +502,7 @@ Pull: refs/heads/<head>:<remote>
diff --git a/git-push.txt b/git-push.txt index d4ae99fa5..197f4b512 100644 --- a/git-push.txt +++ b/git-push.txt @@ -49,12 +49,14 @@ corresponding remotes file---see below), then all the refs that exist both on the local side and on the remote side are updated. + -Some short-cut notations are also supported. +`tag ` means the same as `refs/tags/:refs/tags/`. + -* `tag ` means the same as `refs/tags/:refs/tags/`. -* A parameter without a colon is equivalent to - `:`, hence updates in the destination from - in the source. +A parameter without a colon is equivalent to +`:`, hence updates in the destination from +in the source. ++ +Pushing an empty allows you to delete the ref from +the remote repository. \--all:: Instead of naming each ref to push, specifies that all @@ -75,7 +77,8 @@ include::urls.txt[] Author ------ -Written by Junio C Hamano +Written by Junio C Hamano , later rewritten in C +by Linus Torvalds Documentation -------------- diff --git a/git-repo-config.html b/git-repo-config.html index c27b1414f..8935bb954 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -748,7 +748,7 @@ branch.<name>.merge

-pager.color +color.pager

@@ -757,7 +757,7 @@ pager.color

-diff.color +color.diff

@@ -767,7 +767,7 @@ diff.color

-diff.color.<slot> +color.diff.<slot>

@@ -1022,7 +1022,7 @@ showbranch.default

-status.color +color.status

@@ -1033,7 +1033,7 @@ status.color

-status.color.<slot> +color.status.<slot>

@@ -1042,7 +1042,7 @@ status.color.<slot> updated (files which are updated but not committed), changed (files which are changed but not updated in the index), or untracked (files which are not tracked by git). The values of - these variables may be specified as in diff.color.<slot>. + these variables may be specified as in color.diff.<slot>.

@@ -1140,7 +1140,7 @@ receive.denyNonFastForwards -- 2.26.2