# [PATCH/RFC resend] diff-options: make --patch a synonym for -p 3 messages from 2010-05-13 to 2010-05-13. Participants: Will Palmer, Matthieu Moy, Jeff King. Thread: https://gitlist.dev/t/23791 ## Will Palmer, 2010-05-13 08:59 Subject: [PATCH/RFC resend] diff-options: make --patch a synonym for -p Message-ID: <1273741140.2516.15.camel@wpalmer.simply-domain> URL: https://gitlist.dev/e/1273741140.2516.15.camel%40wpalmer.simply-domain ``` Here we simply make --patch a synonym for -p, whose mnemonic was "patch" all along. Signed-off-by: Will Palmer --- Re-sending, as this seems to have slipped under the radar last time. In case a justification is non-obvious: -p has always meant "patch", and the synonym (-u) has a long-form. I always find myself typing out the long-form --patch, only to be surprised that it doesn't exist. This patch seeks to correct what I can only assume was an oversight. Documentation/diff-options.txt | 1 + diff.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c9c6c2b..4a96859 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 d0ecbc3..8ea9f97 100644 --- a/diff.c +++ b/diff.c @@ -2722,7 +2722,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; ``` ## Matthieu Moy, 2010-05-13 11:39 Subject: Re: [PATCH/RFC resend] diff-options: make --patch a synonym for -p Message-ID: URL: https://gitlist.dev/e/vpqzl04ghdv.fsf%40bauges.imag.fr In-Reply-To: <1273741140.2516.15.camel@wpalmer.simply-domain> ``` Will Palmer writes: > Re-sending, as this seems to have slipped under the radar last time. > In case a justification is non-obvious: -p has always meant "patch", and the > synonym (-u) has a long-form. I always find myself typing out the long-form > --patch, only to be surprised that it doesn't exist. This patch seeks to > correct what I can only assume was an oversight. Agreed. I'll still type -p, but explaining to newbies "git log --patch" is self-explanatory, while "git log -p" is non-obvious, especially when it's different from "git -p log"... -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ``` ## Jeff King, 2010-05-13 11:45 Subject: Re: [PATCH/RFC resend] diff-options: make --patch a synonym for -p Message-ID: <20100513114554.GA10963@coredump.intra.peff.net> URL: https://gitlist.dev/e/20100513114554.GA10963%40coredump.intra.peff.net In-Reply-To: <1273741140.2516.15.camel@wpalmer.simply-domain> ``` On Thu, May 13, 2010 at 09:59:00AM +0100, Will Palmer wrote: > Here we simply make --patch a synonym for -p, whose mnemonic was "patch" > all along. Yeah, makes sense to me. We already have --patch-with-stat and --patch-with-raw (even though they are just historical), so clearly --patch is the obvious choice. > Re-sending, as this seems to have slipped under the radar last time. Junio is incommunicado for a bit. I don't know how able he'll be to comb through the list once he gets back, so you may need to an eye out and resend again in a week or so. :) -Peff ```