]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pb/trim-trailing-spaces'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 18:27:47 +0000 (11:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 18:27:47 +0000 (11:27 -0700)
Fix an error in parsing of .gitignore files that use a trailing
"\ " to mark pathnames that end with a SP.

* pb/trim-trailing-spaces:
  dir.c:trim_trailing_spaces(): fix for " \ " sequence


Trivial merge