Merge branch 'ap/diff-ignore-blank-lines'
commit08585fd48d2d3d8facce9bdc366cfd896329a4b8
authorJunio C Hamano <gitster@pobox.com>
Sun, 30 Jun 2013 22:39:53 +0000 (30 15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 30 Jun 2013 22:39:53 +0000 (30 15:39 -0700)
tree731ec3979f6efde016abb6a06dcec0e184b640ea
parentd1314826935392d38e3bb2df754762a402d0af00
parent36617af7ed594d1928554356d809bd611c642dd2
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
Documentation/diff-options.txt