diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-14 08:15:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-14 08:15:51 -0800 |
| commit | 90d0b8a9f015c21b8f4a00a88838cd7bda5750e9 (patch) | |
| tree | 3f70d934cb2d677ee1ba9635ff8f309042297dbb /diff.c | |
| parent | Merge branch 'fc/remote-testgit-feature-done' (diff) | |
| parent | blame: pay attention to --no-follow (diff) | |
| download | git-90d0b8a9f015c21b8f4a00a88838cd7bda5750e9.tar.gz git-90d0b8a9f015c21b8f4a00a88838cd7bda5750e9.zip | |
Merge branch 'jc/blame-no-follow'
Teaches "--no-follow" option to "git blame" to disable its
whole-file rename detection.
* jc/blame-no-follow:
blame: pay attention to --no-follow
diff: accept --no-follow option
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3626,6 +3626,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=")) { |