summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-04 00:55:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-04 00:55:44 (GMT)
commitfe3bf4cb526aa85941c30b6e9104e8b0a84094c3 (patch)
tree6025b0dac28226709c9685910b8fcbdb3b5cfbcc /builtin
parent9af970339e1055313ca19f9f28d006ed621b0080 (diff)
parentf3a2fffe06d13b216cbc18acba5a46b8a00ae326 (diff)
downloadgit-fe3bf4cb526aa85941c30b6e9104e8b0a84094c3.zip
git-fe3bf4cb526aa85941c30b6e9104e8b0a84094c3.tar.gz
git-fe3bf4cb526aa85941c30b6e9104e8b0a84094c3.tar.bz2
Merge branch 'jk/unbreak-am-h'
"git am -h" triggered a BUG(). * jk/unbreak-am-h: am: handle "-h" argument earlier
Diffstat (limited to 'builtin')
-rw-r--r--builtin/am.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 0f63dca..5ee146b 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2311,6 +2311,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
OPT_END()
};
+ if (argc == 2 && !strcmp(argv[1], "-h"))
+ usage_with_options(usage, options);
+
git_config(git_am_config, NULL);
am_state_init(&state);