Make usage documentation for git-add consistent.

The usage string for the executable was missing --refresh.  In
addition, the documentation referred to "file", but the usage string
referred to "filepattern".  Updated the documentation to
"filepattern", as git-add does handle patterns.

Signed-off-by: Brian Hetro <whee@smaertness.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 3383aca9aff5bbcfeaaa782736c226cad29b25b7..e5efbc9a4e6280b8ffe72969e2269dfb970a18e6 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -7,7 +7,9 @@ git-add - Add file contents to the index
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-add' [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <file>...
+[verse]
+'git-add' [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh]
+          [--] <filepattern>...

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -41,7 +43,7 @@ commit.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

-<file>...::
+<filepattern>...::

        Files to add content from.  Fileglobs (e.g. `*.c`) can
        be given to add all matching files.  Also a
        leading directory name (e.g. `dir` to add `dir/file1`
        Files to add content from.  Fileglobs (e.g. `*.c`) can
        be given to add all matching files.  Also a
        leading directory name (e.g. `dir` to add `dir/file1`

diff --git a/builtin-add.c b/builtin-add.c
index 3dd4ded937e20d326737d17cceeebb1f3f744f07..b08e68831a3d3b5ff91e679b4e1862bf65f22bff 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -14,7 +14,7 @@
 #include "revision.h"
 
 static const char builtin_add_usage[] =
 #include "revision.h"
 
 static const char builtin_add_usage[] =

-"git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--] <filepattern>...";
+"git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--refresh] [--] <filepattern>...";

 
 static int take_worktree_changes;
 static const char *excludes_file;
 
 static int take_worktree_changes;
 static const char *excludes_file;