Merge branch 'master'

* master:
  Merge branch 'kh/svn'
  git-svnimport: -r adds svn revision number to commit messages
  Merge branch 'jc/commit'
  commit: detect misspelled pathspec while making a partial commit.
  combine-diff: diff-files fix (#2)
  combine-diff: diff-files fix.
  Merge branch 'jc/rebase'
  Merge branch 'ra/email'

diff --cc diff-files.c
Simple merge

diff --cc ls-files.c
index 5539fd85492e6e76c5a3ebc6651ff9f750e4e8c6,a716e5fad2c92122a802ee4e8e25f0bc3248eef4..52bbfdc805aecaa9c463adbb4ef94d1af9c8511f
--- 1/ls-files.c
--- 2/ls-files.c
+++ b/ls-files.c
@@@ -445,26 -454,9 +455,26 @@@ static void show_ce_entry(const char *t
        if (len >= ce_namelen(ce))
                die("git-ls-files: internal error - cache entry not superset of prefix");
  
-       if (pathspec && !match(pathspec, ce->name, len))
+       if (pathspec && !match(pathspec, ps_matched, ce->name, len))
                return;
  
 +      if (tag && *tag && show_valid_bit &&
 +          (ce->ce_flags & htons(CE_VALID))) {
 +              static char alttag[4];
 +              memcpy(alttag, tag, 3);
 +              if (isalpha(tag[0]))
 +                      alttag[0] = tolower(tag[0]);
 +              else if (tag[0] == '?')
 +                      alttag[0] = '!';
 +              else {
 +                      alttag[0] = 'v';
 +                      alttag[1] = tag[0];
 +                      alttag[2] = ' ';
 +                      alttag[3] = 0;
 +              }
 +              tag = alttag;
 +      }
 +
        if (!show_stage) {
                fputs(tag, stdout);
                write_name_quoted("", 0, ce->name + offset,