Merge branch 'maint'

gitster · gitster · commit 0c91a6f302d8 · 2013-03-10T22:29:29.000-07:00
* maint:
  Translate git_more_info_string consistently
diff --git a/git.c b/git.c
@@ -545,7 +545,7 @@ int main(int argc, const char **argv)
 		commit_pager_choice();
 		printf("usage: %s\n\n", git_usage_string);
 		list_common_cmds_help();
-		printf("\n%s\n", git_more_info_string);
+		printf("\n%s\n", _(git_more_info_string));
 		exit(1);
 	}
 	cmd = argv[0];

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ int main(int argc, const char **argv)`
`545`	`545`	`commit_pager_choice();`
`546`	`546`	`printf("usage: %s\n\n", git_usage_string);`
`547`	`547`	`list_common_cmds_help();`
`548`		`- printf("\n%s\n", git_more_info_string);`
	`548`	`+ printf("\n%s\n", _(git_more_info_string));`
`549`	`549`	`exit(1);`
`550`	`550`	`}`
`551`	`551`	`cmd = argv[0];`