summaryrefslogtreecommitdiff
path: root/help.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-12 23:15:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-12 23:15:55 (GMT)
commit2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe (patch)
tree3346bd647b350c29eb620f5a440b43513dc2ad2d /help.c
parent07436e43daf1a97d3d702090d6289f745bd5ad90 (diff)
parent57f6ec029090f64377ec5c0926b6e2e39b0caa4f (diff)
downloadgit-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.zip
git-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.tar.gz
git-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.tar.bz2
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3: Change mentions of "git programs" to "git commands" Documentation: merge: one <remote> is required help.c: give correct structure's size to memset()
Diffstat (limited to 'help.c')
-rw-r--r--help.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/help.c b/help.c
index 6c46d8b..294337e 100644
--- a/help.c
+++ b/help.c
@@ -302,7 +302,7 @@ const char *help_unknown_cmd(const char *cmd)
struct cmdnames main_cmds, other_cmds;
memset(&main_cmds, 0, sizeof(main_cmds));
- memset(&other_cmds, 0, sizeof(main_cmds));
+ memset(&other_cmds, 0, sizeof(other_cmds));
memset(&aliases, 0, sizeof(aliases));
git_config(git_unknown_cmd_config, NULL);
@@ -334,7 +334,7 @@ const char *help_unknown_cmd(const char *cmd)
const char *assumed = main_cmds.names[0]->name;
main_cmds.names[0] = NULL;
clean_cmdnames(&main_cmds);
- fprintf(stderr, "WARNING: You called a Git program named '%s', "
+ fprintf(stderr, "WARNING: You called a Git command named '%s', "
"which does not exist.\n"
"Continuing under the assumption that you meant '%s'\n",
cmd, assumed);