| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Remove custom merge strategy for changelog | Christian Duerr | 2021-08-27 |
| | | | | | | | | | | While the custom merge strategy can make things simpler in some scenarios, it has repeatedly shown to silently introduce errors that have to be manually spotted and corrected after the fact. It's much more reliable and efficient to always manually oversee potential conflicts, rather than letting them slip through half of the time and having to contribute follow-up patches. | ||
| * | Add custom merge strategy for CHANGELOG.md | Christian Duerr | 2020-02-15 |
| The merge strategy `union` should hopefully reduce the number of conflicts when trying to rebase the configuration file, since most of the changes are simple additions anyways. | |||
 |
index : r-alacritty.git | |
| My custom-patched version of alacritty. |
| aboutsummaryrefslogtreecommitdiff |
path: root/.gitattributes