diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-13 01:15:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-13 01:15:55 +0200 |
| commit | 2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe (patch) | |
| tree | 3346bd647b350c29eb620f5a440b43513dc2ad2d /help.c | |
| parent | push: point to 'git pull' and 'git push --force' in case of non-fast forward (diff) | |
| parent | Change mentions of "git programs" to "git commands" (diff) | |
| download | git-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.tar.xz git-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.zip | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |