emilio/clang-format-merge

Wrapper doesn't work with git's rebase.autostash feature

rjmunro opened this issue · 0 comments

Because the git wrapper edits .gitattributes which is part of the repository, the change is undone automatically if you have an existing .gitattributes file comitted and git config rebase.autostash true enabled.

It should instead edit .git/info/attributes, as suggested in the manual set up instructions, as this is outside the repository itself and will not be undone by git stash.