]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bc/reread-attributes-during-rebase'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:40 +0000 (12:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:40 +0000 (12:26 -0700)
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

1  2 
apply.c
t/t3400-rebase.sh

diff --cc apply.c
Simple merge
Simple merge