From: Junio C Hamano Date: Tue, 3 Jun 2014 19:06:40 +0000 (-0700) Subject: Merge branch 'jc/apply-ignore-whitespace' X-Git-Tag: v2.1.0-rc0~202 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f008cef4abb2a4db766b4a152b304aca91a0101a?hp=--cc Merge branch 'jc/apply-ignore-whitespace' "--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 --- f008cef4abb2a4db766b4a152b304aca91a0101a