diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-09 20:27:43 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-09 20:27:43 +0400 |
| commit | 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0 (patch) | |
| tree | 4d2814b43911594cf054a9c4613baf55f6e5b7a4 /Documentation | |
| parent | be427d758b53343d31debb520c0bc251a62013a9 (diff) | |
| parent | ec00d6e0038e030cf73182374e21025c2776cb23 (diff) | |
Merge branch 'maint'
* maint:
Documentation: cloning to empty directory is allowed
Clarify kind of conflict in merge-one-file helper
git config: clarify --add and --get-color
archive-tar.c: squelch a type mismatch warning
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-clone.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-config.txt | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 4072f40d7a..b14de6c407 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -149,7 +149,7 @@ then the cloned repository will become corrupt. part of the source repository is used if no directory is explicitly given ("repo" for "/path/to/repo.git" and "foo" for "host.xz:foo/.git"). Cloning into an existing directory - is not allowed. + is only allowed if the directory is empty. :git-clone: 1 include::urls.txt[] diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 7131ee3c66..f68b198205 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -69,7 +69,8 @@ OPTIONS --add:: Adds a new line to the option without altering any existing - values. This is the same as providing '^$' as the value_regex. + values. This is the same as providing '^$' as the value_regex + in `--replace-all`. --get:: Get the value for a given key (optionally filtered by a regex @@ -155,7 +156,7 @@ See also <<FILES>>. When the color setting for `name` is undefined, the command uses `color.ui` as fallback. ---get-color name default:: +--get-color name [default]:: Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard |