Merge branch 'master' into next

* master:
  fix various typos in documentation
  blame: Fix path pruning
  cvsserver: use git-rev-list instead of git-log
  Fix "git-log --parents" breakage post v1.3.0
  add documentation for update-index --unresolve

diff --cc log-tree.c
index aaf2b9423f01243584e15e6c93007a3f42c9d917,b90ba6762ad0aa469a19c42cf8d53f7a79db02d5..d92abaf64bc3cecce06f09d1e523c8f203a93b06
--- 1/log-tree.c
--- 2/log-tree.c
+++ b/log-tree.c
@@@ -37,20 -49,14 +49,22 @@@ void show_log(struct rev_info *opt, str
        /*
         * Print header line of header..
         */
 -      printf("%s%s",
 -              opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
 -              diff_unique_abbrev(commit->object.sha1, abbrev_commit));
 -      if (opt->parents)
 -              show_parents(commit, abbrev_commit);
 -      if (parent)
 -              printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit));
 -      putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
 +
 +      if (opt->commit_format == CMIT_FMT_EMAIL)
 +              printf("From %s  Thu Apr 7 15:13:13 2005\n",
 +                     sha1_to_hex(commit->object.sha1));
 +      else {
 +              printf("%s%s",
 +                     opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
 +                     diff_unique_abbrev(commit->object.sha1, abbrev_commit));
++              if (opt->parents)
++                      show_parents(commit, abbrev_commit);
 +              if (parent) 
 +                      printf(" (from %s)",
 +                             diff_unique_abbrev(parent->object.sha1,
 +                                                abbrev_commit));
 +              putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
 +      }
  
        /*
         * And then the pretty-printed message itself

diff --cc revision.c
Simple merge

diff --cc update-index.c
Simple merge