projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f3ba42 2c65d90)
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)
commitc8ada15456f951913dbf628a7c441032e90b8e11
tree60e0e012e23b909c6938b2f164b1c8f92bed518atree | snapshot
parent8f3ba423e7149fdbe1d7e1d2f245b4c0a2a1bdfbcommit | diff
parent2c65d90f7579a0e2a6460eebce44795587e87043commit | diff
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
apply.c diff1 | diff2 | blob | history
t/t3400-rebase.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.