diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-30 15:39:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-30 15:39:53 -0700 |
| commit | 08585fd48d2d3d8facce9bdc366cfd896329a4b8 (patch) | |
| tree | 731ec3979f6efde016abb6a06dcec0e184b640ea /Documentation | |
| parent | Merge branch 'mh/loose-refs-race-with-pack-ref' (diff) | |
| parent | diff: add --ignore-blank-lines option (diff) | |
| download | tgif-08585fd48d2d3d8facce9bdc366cfd896329a4b8.tar.xz | |
Merge branch 'ap/diff-ignore-blank-lines'
"git diff" learned a mode that ignores hunks whose change consists
only of additions and removals of blank lines, which is the same as
"diff -B" (ignore blank lines) of GNU diff.
* ap/diff-ignore-blank-lines:
diff: add --ignore-blank-lines option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index a85288f23e..19f78a7d5c 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -461,6 +461,9 @@ endif::git-format-patch[] differences even if one line has whitespace where the other line has none. +--ignore-blank-lines:: + Ignore changes whose lines are all blank. + --inter-hunk-context=<lines>:: Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. |