aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-12 12:23:12 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-12 12:23:12 -0800
commit5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc (patch)
tree3d637de62931404577e0070e3bc0569da361d28e /builtin
parentaa3982890fe7506badfddf6252402a335a4d72b7 (diff)
parentd32805dce7bdc45a3e4045e999fc5d56e3b46a82 (diff)
downloadgit-5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc.tar.gz
git-5bf72ed2e7ef82d5ef7a35c978dc72576fdb0efc.tar.xz
Merge branch 'maint'
* maint: Replace filepattern with pathspec for consistency
Diffstat (limited to 'builtin')
-rw-r--r--builtin/add.c2
-rw-r--r--builtin/commit.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 7738025a2..0dd014eb9 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -17,7 +17,7 @@
#include "bulk-checkin.h"
static const char * const builtin_add_usage[] = {
- N_("git add [options] [--] <filepattern>..."),
+ N_("git add [options] [--] <pathspec>..."),
NULL
};
static int patch_interactive, add_interactive, edit_interactive;
diff --git a/builtin/commit.c b/builtin/commit.c
index 1a0e5f14a..3348aa14e 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -31,12 +31,12 @@
#include "sequencer.h"
static const char * const builtin_commit_usage[] = {
- N_("git commit [options] [--] <filepattern>..."),
+ N_("git commit [options] [--] <pathspec>..."),
NULL
};
static const char * const builtin_status_usage[] = {
- N_("git status [options] [--] <filepattern>..."),
+ N_("git status [options] [--] <pathspec>..."),
NULL
};