modify/delete conflict resolution overwrites untracked file

[git.git] / help.c

diff --git a/help.c b/help.c
index 3cb19628965685ce59a5377b81bef975851996e8..dc0786d8002ef633cae4485eb5b25cdb6cf17df4 100644 (file)
--- a/help.c
+++ b/help.c
@@ -555,7 +555,8 @@ static int is_git_command(const char *s)
 {
        load_command_list();
        return is_in_cmdlist(&main_cmds, s) ||
-               is_in_cmdlist(&other_cmds, s);
+               is_in_cmdlist(&other_cmds, s) ||
+               !strcmp(s, "help");
 }
 
 static const char *prepend(const char *prefix, const char *cmd)