Merge branch 'maint-1.5.4' into maint

diff --git a/builtin-commit.c b/builtin-commit.c
index 52a05c20bbf4d6d70ac293e3960ead33454357fa..e3564a526a29927702e2aab368feae3e641c1256 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -101,7 +101,7 @@ static struct option builtin_commit_options[] = {
        OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
        OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
        OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
-       OPT_BOOLEAN(0, "untracked-files", &untracked_files, "show all untracked files"),
+       OPT_BOOLEAN('u', "untracked-files", &untracked_files, "show all untracked files"),
        OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
        OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),