diff --git a/.gitignore b/.gitignore index 10ee45c..0315d4b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,23 @@ result .direnv .pre-commit-config.yaml .worktrees/ + +# Created by https://www.toptal.com/developers/gitignore/api/git +# Edit at https://www.toptal.com/developers/gitignore?templates=git + +### Git ### +# Created by git for backups. To disable backups in Git: +# $ git config --global mergetool.keepBackup false +*.orig + +# Created by git when using merge tools for conflicts +*.BACKUP.* +*.BASE.* +*.LOCAL.* +*.REMOTE.* +*_BACKUP_*.txt +*_BASE_*.txt +*_LOCAL_*.txt +*_REMOTE_*.txt + +# End of https://www.toptal.com/developers/gitignore/api/git