From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Jun 2008 23:13:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc3~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5bcde3082d5f348ff8b02547126746b9b713c8d5?ds=inline;hp=-c

Merge branch 'maint'

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

5bcde3082d5f348ff8b02547126746b9b713c8d5
diff --combined Documentation/git-read-tree.txt
index cbe68352bf,c95ad9f145..58fb906ef6
--- a/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 1dfc01e8f0,4ab93fcf78..1dfc01e8f0
mode 100755,100644..100644
--- a/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);