ref-filter: modify "%(objectname:short)" to take length

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 79905fbdaf3338912c33a567b4de9ec23919157a..83f86b9231b012bbb4716dc27cd72291cb48126a 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -47,12 +47,12 @@ checks or transformations are performed on the value.
 
 When reading, the values are read from the system, global and
 repository local configuration files by default, and options
-`--system`, `--global`, `--local` and '--file <filename>' can be
+`--system`, `--global`, `--local` and `--file <filename>` can be
 used to tell the command to read from only that location (see <<FILES>>).
 
 When writing, the new value is written to the repository local
 configuration file by default, and options `--system`, `--global`,
-'--file <filename>' can be used to tell the command to write to
+`--file <filename>` can be used to tell the command to write to
 that location (you can say `--local` but that is the default).
 
 This command will fail with non-zero status upon error.  Some exit
@@ -263,6 +263,9 @@ The files are read in the order given above, with last value found taking
 precedence over values read earlier.  When multiple values are taken then all
 values of a key from all files will be used.
 
+You may override individual configuration parameters when running any git
+command by using the `-c` option. See linkgit:git[1] for details.
+
 All writing options will per default write to the repository specific
 configuration file. Note that this also affects options like `--replace-all`
 and `--unset`. *'git config' will only ever change one file at a time*.