From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 7 Sep 2019 16:23:36 +0000 (-0700)
Subject: Merge branch 'bc/reread-attributes-during-rebase' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f5e5db0b090a7b735dbc2dc92731ea4a448be56;p=git

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

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

9f5e5db0b090a7b735dbc2dc92731ea4a448be56