Merge branch 'maint'

* maint:
  git-svn: change dashed git-commit-tree to git commit-tree
  Documentation: clarify information about 'ident' attribute
  bash completion: add doubledash to "git show"
  Use test-chmtime -v instead of perl in t5000 to get mtime of a file
  Add --verbose|-v to test-chmtime
  asciidoc: add minor workaround to add an empty line after code blocks
  Plug a memleak in builtin-revert
  Add file delete/create info when we overflow rename_limit
  Install git-cvsserver in $(bindir)
  Install git-shell in bindir, too

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc builtin-revert.c
index 472554019afdb5e8e21f2d362f62f40eb569d8aa,c41788685bf0b5bea3a3ae26615795e07a995793..7483a7a63bf09a7a123e442e9b933b9d24f2b1a6
--- 1/builtin-revert.c
--- 2/builtin-revert.c
+++ b/builtin-revert.c
@@@ -248,13 -266,10 +248,13 @@@ static int revert_or_cherry_pick(int ar
  {
        unsigned char head[20];
        struct commit *base, *next, *parent;
 -      int i;
 +      int i, index_fd, clean;
        char *oneline, *reencoded_message = NULL;
        const char *message, *encoding;
-       const char *defmsg = xstrdup(git_path("MERGE_MSG"));
+       char *defmsg = xstrdup(git_path("MERGE_MSG"));
 +      struct merge_options o;
 +      struct tree *result, *next_tree, *base_tree, *head_tree;
 +      static struct lock_file index_lock;
  
        git_config(git_default_config, NULL);
        me = action == REVERT ? "revert" : "cherry-pick";

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc git-svn.perl
Simple merge