From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:46:23 +0000 (-0700)
Subject: Merge branch 'jc/apply-ignore-whitespace' into maint
X-Git-Tag: v2.0.1~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c122c9a968d5528b799fd5aeab8e67fffb45ef4d

Merge branch 'jc/apply-ignore-whitespace' into maint

"--ignore-space-change" option of "git apply" ignored the spaces
at the beginning of line too aggressively, which is inconsistent
with the option of the same name "diff" and "git diff" have.

* jc/apply-ignore-whitespace:
apply --ignore-space-change: lines with and without leading whitespaces do not match
---

c122c9a968d5528b799fd5aeab8e67fffb45ef4d