diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
| commit | 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a (patch) | |
| tree | 80a6b54d21978b5c3879662bdc4f5951f804b808 /builtin-add.c | |
| parent | b715cfbba4083d25ec0d0f94e440ad734607ddb0 (diff) | |
| parent | 73a2acc0a09829f887fdf2dbcfba217102227932 (diff) | |
| download | git-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.gz | |
Merge branch 'master' into sp/gfi
git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it. This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.
This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).
Conflicts:
git-compat-util.h
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-add.c b/builtin-add.c index e7a1b4d9ab..87e16aa220 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -10,7 +10,7 @@ #include "cache-tree.h" static const char builtin_add_usage[] = -"git-add [-n] [-v] [-f] [--interactive] [--] <filepattern>..."; +"git-add [-n] [-v] [-f] [--interactive | -i] [--] <filepattern>..."; static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix) { @@ -102,7 +102,8 @@ int cmd_add(int argc, const char **argv, const char *prefix) int add_interactive = 0; for (i = 1; i < argc; i++) { - if (!strcmp("--interactive", argv[i])) + if (!strcmp("--interactive", argv[i]) || + !strcmp("-i", argv[i])) add_interactive++; } if (add_interactive) { |