From 6d891e69a947d5abd6ecd44db9748716b8c428f5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 May 2006 23:36:21 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.3.2-gfd60a --- core-tutorial.html | 6 +++--- core-tutorial.txt | 2 +- git-repo-config.html | 11 ++++++----- git-repo-config.txt | 9 +++++---- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/core-tutorial.html b/core-tutorial.html index 9dfa534f..f240b6bc 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1186,11 +1186,11 @@ environment, is git show-branch.

The first two lines indicate that it is showing the two branches and the first line of the commit log message from their top-of-the-tree commits, you are currently on master branch -(notice the asterisk character), and the first column for +(notice the asterisk * character), and the first column for the later output lines is used to show commits contained in the master branch, and the second column for the mybranch branch. Three commits are shown along with their log messages. -All of them have non blank characters in the first column ( +All of them have non blank characters in the first column (* shows an ordinary commit on the current branch, . is a merge commit), which means they are now part of the master branch. Only the "Some work" commit has the plus + character in the second column, @@ -2011,7 +2011,7 @@ to follow, not easier.

diff --git a/core-tutorial.txt b/core-tutorial.txt index 4211c819..d1360ecd 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -971,7 +971,7 @@ $ git show-branch --topo-order master mybranch The first two lines indicate that it is showing the two branches and the first line of the commit log message from their top-of-the-tree commits, you are currently on `master` branch -(notice the asterisk `*` character), and the first column for +(notice the asterisk `\*` character), and the first column for the later output lines is used to show commits contained in the `master` branch, and the second column for the `mybranch` branch. Three commits are shown along with their log messages. diff --git a/git-repo-config.html b/git-repo-config.html index de05a747..79aeedb6 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -286,10 +286,11 @@ git-repo-config(1) Manual Page

You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped.

-

If you want to set/unset an option which can occur on multiple lines, you -should provide a POSIX regex for the value. If you want to handle the lines -not matching the regex, just prepend a single exclamation mark in front -(see EXAMPLES).

+

If you want to set/unset an option which can occur on multiple +lines, a POSIX regexp value_regex needs to be given. Only the +existing values that match the regexp are updated or unset. If +you want to handle the lines that do not match the regex, just +prepend a single exclamation mark in front (see EXAMPLES).

The type specifier can be either --int or --bool, which will make git-repo-config ensure that the variable(s) are of the given type and convert the value to the canonical form (simple decimal number for int, @@ -829,7 +830,7 @@ imap

diff --git a/git-repo-config.txt b/git-repo-config.txt index fd44f629..660c18ff 100644 --- a/git-repo-config.txt +++ b/git-repo-config.txt @@ -23,10 +23,11 @@ You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped. -If you want to set/unset an option which can occur on multiple lines, you -should provide a POSIX regex for the value. If you want to handle the lines -*not* matching the regex, just prepend a single exclamation mark in front -(see EXAMPLES). +If you want to set/unset an option which can occur on multiple +lines, a POSIX regexp `value_regex` needs to be given. Only the +existing values that match the regexp are updated or unset. If +you want to handle the lines that do *not* match the regex, just +prepend a single exclamation mark in front (see EXAMPLES). The type specifier can be either '--int' or '--bool', which will make 'git-repo-config' ensure that the variable(s) are of the given type and -- 2.11.0