From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 30 Jun 2013 22:39:53 +0000 (-0700)
Subject: Merge branch 'ap/diff-ignore-blank-lines'
X-Git-Tag: v1.8.4-rc0~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08585fd48d2d3d8facce9bdc366cfd896329a4b8;p=thirdparty%2Fgit.git

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
---

08585fd48d2d3d8facce9bdc366cfd896329a4b8