aboutsummaryrefslogtreecommitdiff
path: root/builtin-rerere.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2009-11-09 09:05:01 -0600
committerJunio C Hamano <gitster@pobox.com>2009-11-10 12:00:21 -0800
commit99caeed05d3e89176d352104a2b70a77aa7e5d81 (patch)
treef65515f8b4302877d661176266cd6bf9a75e5a53 /builtin-rerere.c
parent548d3464dc446db58a8fc8f7a8cc6cfb2d683faa (diff)
downloadgit-99caeed05d3e89176d352104a2b70a77aa7e5d81.tar.gz
git-99caeed05d3e89176d352104a2b70a77aa7e5d81.tar.xz
Let 'git <command> -h' show usage without a git dir
There is no need for "git <command> -h" to depend on being inside a repository. Reported by Gerfried Fuchs through http://bugs.debian.org/462557 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-rerere.c')
-rw-r--r--builtin-rerere.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c
index adfb7b5f4..343d6cde4 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -106,6 +106,9 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
if (argc < 2)
return rerere();
+ if (!strcmp(argv[1], "-h"))
+ usage(git_rerere_usage);
+
fd = setup_rerere(&merge_rr);
if (fd < 0)
return 0;