diff options
| author | Andrew Ruder <andy@aeruder.net> | 2007-04-26 23:58:55 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-26 22:43:10 -0700 |
| commit | 4551d05fe44c6d87ff8a24cfba7a79bba0179d5e (patch) | |
| tree | 96fa8f7bcb2dce80a0a6c0b89f51a933093f9c9b | |
| parent | 8abe88a29c0789276c6d028b76b1190630b101c6 (diff) | |
| download | git-4551d05fe44c6d87ff8a24cfba7a79bba0179d5e.tar.gz | |
Removing -n option from git-diff-files documentation
-n is not a short form of --no-index as the documentation
suggests. Removing it from the documentation and command
usage string.
Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-diff-files.txt | 4 | ||||
| -rw-r--r-- | builtin-diff-files.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index b78c4c64f1..2e1e29ef5a 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -8,7 +8,7 @@ git-diff-files - Compares files in the working tree and the index SYNOPSIS -------- -'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|-n|--no-index] [<common diff options>] [<path>...] +'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [<common diff options>] [<path>...] DESCRIPTION ----------- @@ -36,7 +36,7 @@ omit diff output for unmerged entries and just show "Unmerged". diff, similar to the way 'diff-tree' shows a merge commit with these flags. -\-n,\--no-index:: +--no-index:: Compare the two given files / directories. -q:: diff --git a/builtin-diff-files.c b/builtin-diff-files.c index 6ba5077a2b..6cb30c8e12 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -10,7 +10,7 @@ #include "builtin.h" static const char diff_files_usage[] = -"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|-n|--no-index] [<common diff options>] [<path>...]" +"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|--no-index] [<common diff options>] [<path>...]" COMMON_DIFF_OPTIONS_HELP; int cmd_diff_files(int argc, const char **argv, const char *prefix) |