From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 12 Apr 2008 22:41:19 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint
X-Git-Tag: v1.5.5.1~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d6d96f835cace1c108100cf88e216a59debcb937;p=git.git

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
---

d6d96f835cace1c108100cf88e216a59debcb937
diff --cc builtin-shortlog.c
index bd795b1db,01cfd7b47..e6a286501
--- a/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;