diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-14 01:30:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 21:40:42 -0800 |
| commit | 859f9c45814afae3250424946e2156ea366224f7 (patch) | |
| tree | bb5f2fc60eabb80011c758ea6961d37a754b6e96 /diff.c | |
| parent | 44478d99ee0b2c219a733545efe0cb422658bf60 (diff) | |
| download | git-859f9c45814afae3250424946e2156ea366224f7.tar.gz git-859f9c45814afae3250424946e2156ea366224f7.tar.xz | |
teach diff machinery about --ignore-space-at-eol
`git diff --ignore-space-at-eol` will ignore whitespace at the
line ends.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2038,6 +2038,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) options->xdl_opts |= XDF_IGNORE_WHITESPACE; else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change")) options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE; + else if (!strcmp(arg, "--ignore-space-at-eol")) + options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL; else if (!strcmp(arg, "--color-words")) options->color_diff = options->color_diff_words = 1; else if (!strcmp(arg, "--no-renames")) |