Skip to content

Commit ec18a75

Browse files
authored
Update my_favorite_neat_little_git_trick_demo.md
Added git rerere and git notes command as git command trick.
1 parent 7ae7166 commit ec18a75

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

01_version_control/my_favorite_neat_little_git_trick_demo.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
[format]
1515
pretty = format:%C(auto,yellow)%h %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(20,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D
1616
```
17+
- `git rerere` — remember conflict resolutions. Git auto-resolves the same merge conflicts next time.
18+
- example: `git config rerere.enabled true` -> Git learns your conflict resolutions forever
19+
- `git notes` Attach notes to a commit without changing history (useful for audits, reviewers, Jira notes)
20+
- example: `git notes add -m "Ticket ABC-123 analyzed"` -> Add metadata without touching commit
1721
1822
## Tricks from Winter Term 2024/25
1923

0 commit comments

Comments
 (0)