Update cheatsheets

This commit is contained in:
ivuorinen
2025-10-21 00:19:51 +00:00
parent c3f5e8d7ab
commit 8d00ec1c41
29 changed files with 728 additions and 15 deletions

21
tldr/git-rerere Normal file
View File

@@ -0,0 +1,21 @@
---
syntax: markdown
tags: [tldr, common]
source: https://github.com/tldr-pages/tldr.git
---
# git rerere
> Reuse fixes for merge conflicts.
> More information: <https://git-scm.com/docs/git-rerere>.
- Enable rerere globally:
`git config --global rerere.enabled true`
- Forget a file's recorded resolution:
`git rerere forget {{path/to/file}}`
- Check the status of recorded resolutions:
`git rerere status`