Skip to content

docs(meta): recommend git rerere for repeated/long rebases #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jan-kubica wants to merge 2 commits into
base: main
Choose a base branch
from
Open

docs(meta): recommend git rerere for repeated/long rebases #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c14609
docs(meta): recommend git rerere for repeated/long rebases
jan-kubica Jun 22, 2026
93f18b6
docs(meta): also recommend rerere.autoupdate
jan-kubica Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules/engineering.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
manual discipline
- Conventional Commits: `feat:`, `chore:`, `fix:`, `docs:`
- Rebase feature branches onto main (linear history)
- Enable `git rerere` (`git config --global rerere.enabled true`, plus
`rerere.autoupdate true` to auto-stage what it resolves) so conflict
resolutions are recorded and auto-replayed across repeated or long rebases
- Fail fast: validate at boundaries, return/throw early
- Minimize brace nesting: invert conditions, early returns
- Use named constants, not string literals for domain values
Expand Down