Merge branch 'maint'

* maint:
git-read-tree: document -v option.
Remove exec bit from builtin-fast-export.c

diff --combined Documentation/git-read-tree.txt
index cbe68352bfbb957ccbbc99fae4f97c49d90c647e,c95ad9f1451fd5db2e4fcbdb64f606f81f39ff14..58fb906ef68e8b800b0616a5655aa757a362ed6e
--- 1/Documentation/git-read-tree.txt
--- 2/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@@ -50,6 -50,9 +50,9 @@@ OPTION
        trees that are not directly related to the current
        working tree status into a temporary index file.
  
+ -v::
+       Show the progress of checking files out.
+ 
  --trivial::
        Restrict three-way merge by `git-read-tree` to happen
        only if there is no file-level merging required, instead
@@@ -345,7 -348,7 +348,7 @@@ middle of doing, and when your working 
  have finished your work-in-progress), attempt the merge again.
  
  
 -See Also
 +SEE ALSO
  --------
  linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
  linkgit:gitignore[5]
@@@ -361,4 -364,4 +364,4 @@@ Documentation by David Greaves, Junio 
  
  GIT
  ---
 -Part of the linkgit:git[7] suite
 +Part of the linkgit:git[1] suite

diff --combined builtin-fast-export.c
index 1dfc01e8f009968ef5d6118bffed7818e736576c,4ab93fcf780c100f9af3bb6d4ddf3cbe86f73b3d..1dfc01e8f009968ef5d6118bffed7818e736576c
mode 100755,100644..100644
--- 1/builtin-fast-export.c
--- 2/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@@ -368,7 -368,7 +368,7 @@@ int cmd_fast_export(int argc, const cha
        };
  
        /* we handle encodings */
 -      git_config(git_default_config);
 +      git_config(git_default_config, NULL);
  
        init_revisions(&revs, prefix);
        argc = setup_revisions(argc, argv, &revs, NULL);