diff options
Diffstat (limited to 'builtin-update-index.c')
| -rw-r--r-- | builtin-update-index.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c index a6b7f2d636..a19e78603c 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -9,6 +9,7 @@ #include "tree-walk.h" #include "builtin.h" #include "refs.h" +#include "resolve-undo.h" /* * Default to not allowing changes to the list of files. The @@ -703,6 +704,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) verbose = 1; continue; } + if (!strcmp(path, "--clear-resolve-undo")) { + resolve_undo_clear(); + continue; + } if (!strcmp(path, "-h") || !strcmp(path, "--help")) usage(update_index_usage); die("unknown option %s", path); |