Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
  Document -w option to shortlog
  bisect: report bad rev better

diff --cc builtin-shortlog.c
index bd795b1db7a4054a0218d1ec96794ad25d656896,01cfd7b47c120133eafaf0701bc721fbf50fddc5..e6a2865019cceadfcbfc8575a2bd1f97b7159dcb
--- 1/builtin-shortlog.c
--- 2/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@@ -6,11 -6,13 +6,11 @@@
  #include "revision.h"
  #include "utf8.h"
  #include "mailmap.h"
 +#include "shortlog.h"
  
  static const char shortlog_usage[] =
- "git-shortlog [-n] [-s] [-e] [<commit-id>... ]";
+ "git-shortlog [-n] [-s] [-e] [-w] [<commit-id>... ]";
  
 -static char *common_repo_prefix;
 -static int email;
 -
  static int compare_by_number(const void *a1, const void *a2)
  {
        const struct path_list_item *i1 = a1, *i2 = a2;

diff --cc git-bisect.sh
Simple merge