diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:21:25 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:21:25 -0700 |
| commit | a3c76f2858b1ceae5b70b7ee69d2663143dcce49 (patch) | |
| tree | 1b60773c0fde8c6c2551e445f402985e1921cc59 /builtin-add.c | |
| parent | Merge branch 'mw/sendemail' (diff) | |
| parent | git-add --intent-to-add (-N) (diff) | |
| download | tgif-a3c76f2858b1ceae5b70b7ee69d2663143dcce49.tar.xz | |
Merge branch 'jc/add-ita'
* jc/add-ita:
git-add --intent-to-add (-N)
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-add.c b/builtin-add.c index 7c874e3115..ea4e77169a 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -166,7 +166,7 @@ static const char ignore_error[] = "The following paths are ignored by one of your .gitignore files:\n"; static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0; -static int ignore_add_errors, addremove; +static int ignore_add_errors, addremove, intent_to_add; static struct option builtin_add_options[] = { OPT__DRY_RUN(&show_only), @@ -176,6 +176,7 @@ static struct option builtin_add_options[] = { OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"), OPT_BOOLEAN('f', "force", &ignored_too, "allow adding otherwise ignored files"), OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"), + OPT_BOOLEAN('N', "intent-to-add", &intent_to_add, "record only the fact that the path will be added later"), OPT_BOOLEAN('A', "all", &addremove, "add all, noticing removal of tracked files"), OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"), @@ -246,6 +247,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) flags = ((verbose ? ADD_CACHE_VERBOSE : 0) | (show_only ? ADD_CACHE_PRETEND : 0) | + (intent_to_add ? ADD_CACHE_INTENT : 0) | (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) | (!(addremove || take_worktree_changes) ? ADD_CACHE_IGNORE_REMOVAL : 0)); |