diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-11 12:09:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-11 12:09:18 -0700 |
| commit | 65ea3b8c6d9517c5d7f2a6c089cc6578c9486114 (patch) | |
| tree | b36b6510ecf2319402d5ea34c7088f06ef2f9b3c /builtin-commit.c | |
| parent | Merge branch 'lt/core-optim' (diff) | |
| parent | Merge branch 'maint-1.5.4' into maint (diff) | |
| download | tgif-65ea3b8c6d9517c5d7f2a6c089cc6578c9486114.tar.xz | |
Merge branch 'maint'
* maint:
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 6433f86cbb..a65c2b8c37 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"), |