Merge branch 'maint'

* maint:
  rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
  Add missing "short" alternative to --date in rev-list-options.txt
  git-show.txt: Not very stubby these days.
  Clarify repack -n documentation

diff --cc Documentation/rev-list-options.txt
index 3558348b720aa62d6a34719daed5fb623a10501d,9cd677105df1324cfa760e42f10b2629f5eb6962..dfcef79a6b772ae5fb11fc378772042ba465615f
--- 1/Documentation/rev-list-options.txt
--- 2/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -13,11 -13,10 +13,11 @@@ include::pretty-options.txt[
  
        Synonym for `--date=relative`.
  
- --date={relative,local,default,iso,rfc}::
+ --date={relative,local,default,iso,rfc,short}::
  
        Only takes effect for dates shown in human-readable format, such
 -      as when using "--pretty".
 +      as when using "--pretty". `log.date` config variable sets a default
 +      value for log command's --date option.
  +
  `--date=relative` shows dates relative to the current time,
  e.g. "2 hours ago".

diff --cc builtin-rev-parse.c
index f8d8548e9cddd7d2d123fcf0fdee513754df86c1,00b607824dda2dab1c1ffb8bfdbd0972baa44ec5..ab3e85054e174d2d328c625f1db744854b62f5f7
--- 1/builtin-rev-parse.c
--- 2/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@@ -100,9 -110,8 +108,7 @@@ static void show_rev(int type, const un
        if (!(filter & DO_REVS))
                return;
        def = NULL;
 -      revs_count++;
  
-       if (type != show_type)
-               putchar('^');
        if (symbolic && name) {
                if (symbolic == SHOW_SYMBOLIC_FULL) {
                        unsigned char discard[20];