mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-01-26 11:33:59 +00:00
22 lines
415 B
Plaintext
22 lines
415 B
Plaintext
---
|
|
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`
|