Re: [PATCH v5 0/2] Honor .gitattributes with rebase --am

Hi Brian On 26/08/2019 00:33, brian m. carlson wrote: This series makes rebase --am honor the .gitattributes file for subsequent patches when a patch changes it. Note that there are two places we load attributes in ll-merge.c, but this code only handles the one that git am uses. The two cannot

[PATCH v5 0/2] Honor .gitattributes with rebase --am

This series makes rebase --am honor the .gitattributes file for subsequent patches when a patch changes it. Note that there are two places we load attributes in ll-merge.c, but this code only handles the one that git am uses. The two cannot be unified because the one in ll_merge_marker_size inten