diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:17:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:17:46 -0700 |
| commit | b9a77eeda1d7f8a56fb7aed1063956c653d137d1 (patch) | |
| tree | e1c91eac4f91e3d1d5f9853cd1f49fc335dd6008 /builtin | |
| parent | Merge branch 'mg/maint-notes-C-doc' (diff) | |
| parent | Documentation: clarify "git clean -e <pattern>" (diff) | |
| download | tgif-b9a77eeda1d7f8a56fb7aed1063956c653d137d1.tar.xz | |
Merge branch 'jc/clean-exclude-doc'
* jc/clean-exclude-doc:
Documentation: clarify "git clean -e <pattern>"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clean.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 75697f7111..0c7b3d0f4c 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -54,7 +54,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) OPT_BOOLEAN('d', NULL, &remove_directories, "remove whole directories"), { OPTION_CALLBACK, 'e', "exclude", &exclude_list, "pattern", - "exclude <pattern>", PARSE_OPT_NONEG, exclude_cb }, + "add <pattern> to ignore rules", PARSE_OPT_NONEG, exclude_cb }, OPT_BOOLEAN('x', NULL, &ignored, "remove ignored files, too"), OPT_BOOLEAN('X', NULL, &ignored_only, "remove only ignored files"), @@ -98,7 +98,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix) setup_standard_excludes(&dir); for (i = 0; i < exclude_list.nr; i++) - add_exclude(exclude_list.items[i].string, "", 0, dir.exclude_list); + add_exclude(exclude_list.items[i].string, "", 0, + &dir.exclude_list[EXC_CMDL]); pathspec = get_pathspec(prefix, argv); |