From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Jun 2006 07:01:52 +0000 (-0700)
Subject: Merge branch 'vb/sendemail' into next
X-Git-Tag: v1.4.1-rc1~40
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f63237a18e951b93ac46a0e594f286255e1eaaaf;p=git.git

Merge branch 'vb/sendemail' into next

* vb/sendemail:
  Cleanup git-send-email.perl:extract_valid_email
  read-tree --reset: update working tree file for conflicted paths.
  Documentation: Spelling fixes
  Builtin git-rev-parse.
  fetch: do not report "same" unless -verbose.
---

f63237a18e951b93ac46a0e594f286255e1eaaaf
diff --cc builtin-read-tree.c
index 0c6ba3d8a,085e11e7c..cc61c2d81
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@@ -920,24 -895,12 +921,27 @@@ int cmd_read_tree(int argc, const char 
  			continue;
  		}
  
 +		/* "--prefix=<subdirectory>/" means keep the current index
 +		 *  entries and put the entries from the tree under the
 +		 * given subdirectory.
 +		 */
 +		if (!strncmp(arg, "--prefix=", 9)) {
 +			if (stage || merge || prefix)
 +				usage(read_tree_usage);
 +			prefix = arg + 9;
 +			merge = 1;
 +			stage = 1;
 +			if (read_cache_unmerged())
 +				die("you need to resolve your current index first");
 +			continue;
 +		}
 +
- 		/* This differs from "-m" in that we'll silently ignore unmerged entries */
+ 		/* This differs from "-m" in that we'll silently ignore
+ 		 * unmerged entries and overwrite working tree files that
+ 		 * correspond to them.
+ 		 */
  		if (!strcmp(arg, "--reset")) {
 -			if (stage || merge)
 +			if (stage || merge || prefix)
  				usage(read_tree_usage);
  			reset = 1;
  			merge = 1;