From: Junio C Hamano <junkio@cox.net>
Date: Tue, 31 Oct 2006 03:38:50 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83877f8d92b2050eb668dc3351277e57779a8f05;p=git.git

Merge branch 'maint'

* maint:
  revision traversal: --unpacked does not limit commit list anymore.
  Continue traversal when rev-list --unpacked finds a packed commit.
  Use memmove instead of memcpy for overlapping areas
  quote.c: ensure the same quoting across platforms.
  Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
---

83877f8d92b2050eb668dc3351277e57779a8f05
diff --cc blame.c
index e664813cb,3e227d271..3ec1c8f1b
--- a/blame.c
+++ b/blame.c
@@@ -17,20 -17,17 +17,22 @@@
  #include "diffcore.h"
  #include "revision.h"
  #include "xdiff-interface.h"
 +#include "quote.h"
  
+ #ifndef DEBUG
  #define DEBUG 0
+ #endif
  
 -static const char blame_usage[] = "git-blame [-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
 -	"  -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
 -	"  -l, --long          Show long commit SHA1 (Default: off)\n"
 -	"  -t, --time          Show raw timestamp (Default: off)\n"
 -	"  -S, --revs-file     Use revisions from revs-file instead of calling git-rev-list\n"
 -	"  -h, --help          This message";
 +static const char blame_usage[] =
 +"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] file [commit]\n"
 +"  -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
 +"  -l, --long          Show long commit SHA1 (Default: off)\n"
 +"  -t, --time          Show raw timestamp (Default: off)\n"
 +"  -f, --show-name     Show original filename (Default: auto)\n"
 +"  -n, --show-number   Show original linenumber (Default: off)\n"
 +"  -p, --porcelain     Show in a format designed for machine consumption\n"
 +"  -S revs-file        Use revisions from revs-file instead of calling git-rev-list\n"
 +"  -h, --help          This message";
  
  static struct commit **blame_lines;
  static int num_blame_lines;