diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-21 13:49:18 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-21 13:49:18 -0700 |
commit | aebbcf57972961c221c75dee039a17be8cfae1ad (patch) | |
tree | 29533b04a006f40e03de74aa3a7e2c1514415f23 /diff.c | |
parent | e5dce96e9e26f8e30291c79fa5647313c64b2150 (diff) | |
download | git-aebbcf57972961c221c75dee039a17be8cfae1ad.tar.gz |
diff: accept --no-follow option
Once you do
$ alias glogone git log --follow
there is no way to say
$ glogone --no-follow ...
Not that "log --follow" is all that useful, but it is cheap to
support the common "you can defeat an undesirable option with a
'no-' variant of it later on the command line" pattern.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3584,6 +3584,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) DIFF_OPT_SET(options, FIND_COPIES_HARDER); else if (!strcmp(arg, "--follow")) DIFF_OPT_SET(options, FOLLOW_RENAMES); + else if (!strcmp(arg, "--no-follow")) + DIFF_OPT_CLR(options, FOLLOW_RENAMES); else if (!strcmp(arg, "--color")) options->use_color = 1; else if (!prefixcmp(arg, "--color=")) { |