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/merge-options.txt | |
| 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/merge-options.txt')
0 files changed, 0 insertions, 0 deletions