tree 60e0e012e23b909c6938b2f164b1c8f92bed518a
parent 8f3ba423e7149fdbe1d7e1d2f245b4c0a2a1bdfb
parent 2c65d90f7579a0e2a6460eebce44795587e87043
author Junio C Hamano <gitster@pobox.com> 1568057200 -0700
committer Junio C Hamano <gitster@pobox.com> 1568057200 -0700

Merge branch 'bc/reread-attributes-during-rebase'

The "git am" based backend of "git rebase" ignored the result of
updating ".gitattributes" done in one step when replaying
subsequent steps.

* bc/reread-attributes-during-rebase:
  am: reload .gitattributes after patching it
  path: add a function to check for path suffix