diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-05 15:36:04 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-05 15:36:04 -0700 |
commit | 2749fa7771f2a4323b48b78fa194a90d611bc2d8 (patch) | |
tree | 1f3426fc3a5cb59c716ccb58e38e74432c7f79ea /Documentation/git-repo-config.txt | |
parent | Merge branch 'js/fmt-patch' into next (diff) | |
parent | binary diff: further updates. (diff) | |
download | tgif-2749fa7771f2a4323b48b78fa194a90d611bc2d8.tar.xz |
Merge branch 'jc/bindiff' into next
* jc/bindiff:
binary diff: further updates.
binary patch.
pack-object: squelch eye-candy on non-tty
core.prefersymlinkrefs: use symlinks for .git/HEAD
repo-config: trim white-space before comment
Fix for config file section parsing.
Clarify git-cherry documentation.
Update git-unpack-objects documentation.
Fix up docs where "--" isn't displayed correctly.
Several trivial documentation touch ups.
git-svn 1.0.0
git-svn: documentation updates
delta: stricter constness
Makefile: do not link rev-list any specially.
builtin-push: --all and --tags _are_ explicit refspecs
Diffstat (limited to 'Documentation/git-repo-config.txt')
-rw-r--r-- | Documentation/git-repo-config.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt index ddcf52364c..fd44f629f5 100644 --- a/Documentation/git-repo-config.txt +++ b/Documentation/git-repo-config.txt @@ -34,10 +34,10 @@ convert the value to the canonical form (simple decimal number for int, a "true" or "false" string for bool). If no type specifier is passed, no checks or transformations are performed on the value. -This command will fail if +This command will fail if: -. .git/config is invalid, -. .git/config can not be written to, +. The .git/config file is invalid, +. Can not write to .git/config, . no section was provided, . the section or key is invalid, . you try to unset an option which does not exist, or |