From 1c9eecff97beab2d425397dc624281dff5c0be5c Mon Sep 17 00:00:00 2001 From: Will Palmer Date: Thu, 13 May 2010 09:59:00 +0100 Subject: [PATCH] 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 Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 1 + diff.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c9c6c2b1c..4a968591c 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[] diff --git a/diff.c b/diff.c index e49f14a92..43a313deb 100644 --- a/diff.c +++ b/diff.c @@ -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; -- 2.26.2