diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-11 19:09:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-11 19:09:12 (GMT) |
| commit | 3e08f5db65bcfe3ad238ee0de1cac2da84953cf3 (patch) | |
| tree | ce9480bd5f59c93ed232a94e58f99e5f1c59940b /builtin-commit.c | |
| parent | 32a27b56662b1c7aa13f98c95f170ba5290c7559 (diff) | |
| parent | 32efcd91c6505ae28f87c0e9a3e2b3c0115017d8 (diff) | |
| download | git-3e08f5db65bcfe3ad238ee0de1cac2da84953cf3.zip git-3e08f5db65bcfe3ad238ee0de1cac2da84953cf3.tar.gz git-3e08f5db65bcfe3ad238ee0de1cac2da84953cf3.tar.bz2 | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
wt-status.h: declare global variables as extern
builtin-commit.c: add -u as short name for --untracked-files
git-repack: re-enable parsing of -n command line option
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 52a05c2..e3564a5 100644 --- 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"), |