From: Junio C Hamano <junkio@cox.net>
Date: Sun, 18 Feb 2007 00:16:48 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~284
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/69bc0e22d37db4fa9875b717a64949bbfce4ebdf?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Update draft release notes for 1.5.0.1
Convert update-index references in docs to add.
Attempt to improve git-rebase lead-in description.
Do not take mode bits from index after type change.
git-blame: prevent argument parsing segfault
Make gitk save and restore window pane position on Linux and Cygwin.
Make gitk save and restore the user set window position.
[PATCH] gitk: Use show-ref instead of ls-remote
[PATCH] Make gitk work reasonably well on Cygwin.
[PATCH] gitk - remove trailing whitespace from a few lines.
Change git repo-config to git config
---

69bc0e22d37db4fa9875b717a64949bbfce4ebdf
diff --combined Documentation/core-intro.txt
index 24b060b91e,6bee448e7d..eea44d9d56
--- a/Documentation/core-intro.txt
+++ b/Documentation/core-intro.txt
@@@ -106,7 -106,8 +106,8 @@@ directory tree, and renaming a file doe
  file is associated with in any way.
  
  A blob is typically created when gitlink:git-update-index[1]
- is run, and its data can be accessed by gitlink:git-cat-file[1].
+ (or gitlink:git-add[1]) is run, and its data can be accessed by
+ gitlink:git-cat-file[1].
  
  Tree Object
  ~~~~~~~~~~~
@@@ -587,5 -588,4 +588,5 @@@ stages to temporary files and calls a "
  
  	git-merge-index git-merge-one-file hello.c
  
 -and that is what higher level `git resolve` is implemented with.
 +and that is what higher level `git merge -s resolve` is implemented
 +with.
diff --combined builtin-blame.c
index 7a5665f093,1a752b95bb..5669a169ff
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@@ -2065,7 -2065,6 +2065,7 @@@ int cmd_blame(int argc, const char **ar
  	int i, seen_dashdash, unk, opt;
  	long bottom, top, lno;
  	int output_option = 0;
 +	int show_stats = 0;
  	const char *revs_file = NULL;
  	const char *final_commit_name = NULL;
  	char type[10];
@@@ -2087,8 -2086,6 +2087,8 @@@
  			blank_boundary = 1;
  		else if (!strcmp("--root", arg))
  			show_root = 1;
 +		else if (!strcmp(arg, "--show-stats"))
 +			show_stats = 1;
  		else if (!strcmp("-c", arg))
  			output_option |= OUTPUT_ANNOTATE_COMPAT;
  		else if (!strcmp("-t", arg))
@@@ -2203,6 -2200,7 +2203,7 @@@
  			if (!strcmp(argv[j], "--"))
  				seen_dashdash = j;
  		if (seen_dashdash) {
+ 			/* (2) */
  			if (seen_dashdash + 1 != argc - 1)
  				usage(blame_usage);
  			path = add_prefix(prefix, argv[seen_dashdash + 1]);
@@@ -2211,6 -2209,8 +2212,8 @@@
  		}
  		else {
  			/* (3) */
+ 			if (argc <= i)
+ 				usage(blame_usage);
  			path = add_prefix(prefix, argv[i]);
  			if (i + 1 == argc - 1) {
  				final_commit_name = argv[i + 1];
@@@ -2351,7 -2351,7 +2354,7 @@@
  		ent = e;
  	}
  
 -	if (DEBUG) {
 +	if (show_stats) {
  		printf("num read blob: %d\n", num_read_blob);
  		printf("num get patch: %d\n", num_get_patch);
  		printf("num commits: %d\n", num_commits);