git-resolve: dying is good, not showing help is bad.

diff --git a/commit.h b/commit.h
index c24ab210611815938f4d61f662f1c82e4959e61f..5d179d4dc891947e1f8421184f1030bfda245cf7 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -40,6 +40,7 @@ enum cmit_fmt {
        CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
        CMIT_FMT_SHORT,
        CMIT_FMT_FULL,
+       CMIT_FMT_ONELINE,
 };
 
 extern enum cmit_fmt get_commit_format(const char *arg);