mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-03-11 10:58:32 +00:00
Update cheatsheets
This commit is contained in:
21
tldr/git-rerere
Normal file
21
tldr/git-rerere
Normal 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`
|
||||
Reference in New Issue
Block a user