aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-07 15:36:39 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-07 15:36:39 -0700
commitfd60acaced6de16ebfb66959067e2b29f99a133e (patch)
tree32d43206d1d50ddab868904991fa75f88f69ffa7 /Documentation
parentd92f1dc63f0582e7cf8dac54d50a2748119a1ce3 (diff)
parent178613c737f82489a1e2c387236731541fe19081 (diff)
downloadgit-fd60acaced6de16ebfb66959067e2b29f99a133e.tar.gz
git-fd60acaced6de16ebfb66959067e2b29f99a133e.tar.xz
Merge branch 'fix'
* fix: repack: honor -d even when no new pack was created clone: keep --reference even with -l -s repo-config: document what value_regexp does a bit more clearly. Release config lock if the regex is invalid core-tutorial.txt: escape asterisk
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/core-tutorial.txt2
-rw-r--r--Documentation/git-repo-config.txt9
2 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt
index 4211c8197..d1360ecde 100644
--- a/Documentation/core-tutorial.txt
+++ b/Documentation/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/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index fd44f629f..660c18ff8 100644
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/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