Merge with master.

diff --git a/diff-tree.c b/diff-tree.c
index 5b9467d58b064de81bfecfeebd4dfac50e515cca..0dd3cdacb2640dac7dfac3829e38b46bc450101f 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -395,7 +395,7 @@ static int diff_tree_stdin(char *line)
        return diff_tree_commit(commit, line);
 }
 
-static char *diff_tree_usage =
+static const char diff_tree_usage[] =
 "git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
 "[<common diff options>] <tree-ish> <tree-ish>"
 COMMON_DIFF_OPTIONS_HELP;