Merge branch 'es/pretty-describe-more'

Extend "git log --format=%(describe)" placeholder to allow passing
selected command-line options to the underlying "git describe"
command.

* es/pretty-describe-more:
  pretty: add abbrev option to %(describe)
  pretty: add tag option to %(describe)
  pretty.c: rework describe options parsing for better extensibility

diff --cc Documentation/pretty-formats.txt
index 23f63358871ad3732f8c4716678318237bc94870,9e943fb74bb5cf15a5c85f3486e279ee17d13067..0b4c1c8d98a4acf01c19722941095da2c2c6525d
--- 1/Documentation/pretty-formats.txt
--- 2/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@@ -220,6 -220,12 +220,12 @@@ The placeholders are
                          inconsistent when tags are added or removed at
                          the same time.
  +
 -** 'tags[=<bool>]': Instead of only considering annotated tags,
++** 'tags[=<bool-value>]': Instead of only considering annotated tags,
+    consider lightweight tags as well.
+ ** 'abbrev=<number>': Instead of using the default number of hexadecimal digits
+    (which will vary according to the number of objects in the repository with a
+    default of 7) of the abbreviated object name, use <number> digits, or as many
+    digits as needed to form a unique object name.
  ** 'match=<pattern>': Only consider tags matching the given
     `glob(7)` pattern, excluding the "refs/tags/" prefix.
  ** 'exclude=<pattern>': Do not consider tags matching the given
@@@ -273,12 -279,7 +279,7 @@@ endif::git-rev-list[
                          If any option is provided multiple times the
                          last occurrence wins.
  +
- The boolean options accept an optional value `[=<value>]`. The values
- `true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
- sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
- option is given with no value, it's enabled.
- +
 -** 'key=<K>': only show trailers with specified key. Matching is done
 +** 'key=<key>': only show trailers with specified <key>. Matching is done
     case-insensitively and trailing colon is optional. If option is
     given multiple times trailer lines matching any of the keys are
     shown. This option automatically enables the `only` option so that
@@@ -313,6 -314,11 +314,11 @@@ insert an empty string unless we are tr
  decoration format if `--decorate` was not already provided on the command
  line.
  
 -The boolean options accept an optional value `[=<bool>]`. The values
++The boolean options accept an optional value `[=<bool-value>]`. The values
+ `true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
+ sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
+ option is given with no value, it's enabled.
+ 
  If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
  is inserted immediately before the expansion if and only if the
  placeholder expands to a non-empty string.

diff --cc pretty.c
Simple merge