diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:38:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:38:35 -0700 |
| commit | 15d29dde04842d0222cfbc0a8383382ccff9ec21 (patch) | |
| tree | c3d578e46770e5ce514e32a353877a75d26fc41a | |
| parent | 104d3794481c83f8db00ccf85134fc55c76852f9 (diff) | |
| parent | e9008b9a44f46e97f39c424240ade0a6e6429cab (diff) | |
| download | git-15d29dde04842d0222cfbc0a8383382ccff9ec21.tar.gz | |
Merge branch 'jk/no-no-no-empty-directory'
* jk/no-no-no-empty-directory:
parseopt: add OPT_NEGBIT
| -rw-r--r-- | builtin-ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index da2daf45ac..3d59b0e140 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -454,7 +454,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) OPT_BIT(0, "directory", &dir.flags, "show 'other' directories' name only", DIR_SHOW_OTHER_DIRECTORIES), - OPT_BIT(0, "no-empty-directory", &dir.flags, + OPT_NEGBIT(0, "empty-directory", &dir.flags, "don't show empty directories", DIR_HIDE_EMPTY_DIRECTORIES), OPT_BOOLEAN('u', "unmerged", &show_unmerged, |