diff options
| author | Will Palmer <wmpalmer@gmail.com> | 2010-05-13 09:59:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-18 21:50:03 -0700 |
| commit | 1c9eecff97beab2d425397dc624281dff5c0be5c (patch) | |
| tree | df7ad0e5a7ea02db25aa2593516eb492800aa092 | |
| parent | 67687feae52ff2d3ab7edf3ac42a39c5e44be299 (diff) | |
| download | git-1c9eecff97beab2d425397dc624281dff5c0be5c.tar.gz | |
diff-options: make --patch a synonym for -p
Here we simply make --patch a synonym for -p, whose mnemonic was "patch"
all along.
Signed-off-by: Will Palmer <wmpalmer@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/diff-options.txt | 1 | ||||
| -rw-r--r-- | diff.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c9c6c2b1cb..4a968591cb 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -21,6 +21,7 @@ endif::git-format-patch[] ifndef::git-format-patch[] -p:: -u:: +--patch:: Generate patch (see section on generating patches). {git-diff? This is the default.} endif::git-format-patch[] @@ -2701,7 +2701,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) const char *arg = av[0]; /* Output format options */ - if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) + if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")) options->output_format |= DIFF_FORMAT_PATCH; else if (opt_arg(arg, 'U', "unified", &options->context)) options->output_format |= DIFF_FORMAT_PATCH; |