Merge branch 'master' into pb/gitpm

This is to resolve the conflicts with Ryan's annotate updates early.

1 files changed, 1 insertions, 1 deletions

diff --git a/mktree.c b/mktree.c
index ab63cd99d4..9a6f0d2f6b 100644
--- a/mktree.c
+++ b/mktree.c
@@ -71,7 +71,7 @@ static void write_tree(unsigned char *sha1)
 	write_sha1_file(buffer, offset, tree_type, sha1);
 }
 
-static const char mktree_usage[] = "mktree [-z]";
+static const char mktree_usage[] = "git-mktree [-z]";
 
 int main(int ac, char **av)
 {