docs(advanced-git): merge-tip rebase collapse, no tail-piped gates, named staging, worktree .git file - #141
Merged
Merged
Conversation
…amed staging, worktree .git file Four promoted traps; also removes a tail-pipe from this file's own cleanup example (the pattern the new section bans). Signed-off-by: Sebastian Mendel <info@sebastianmendel.de>
|
Contributor
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Scanned FilesNone |
github-actions
Bot
added
documentation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Four promoted traps (
/retro promote, batch 7):ahead = 0) and GitHub auto-closes the PR — verifyahead >= 1after batch rebases, use--rebase-mergeswhen merges carry content.tail/headinside&&chains report tail's exit code and hide the error — three tags on stale HEADs and one failed-but-"OK" verification build later, the rule is: gates run unpiped.git add -A/.with legacy untracked files present — stage by name..gitis a FILE;--exclude-dir=.gitdoesn't protect it from bulk sed, which rewrites the gitdir pointer.Also fixes this file's own cleanup example, which used the banned tail-pipe. The fifth note from the batch (worktree paths resolve from
.bare) was already documented in detail and is tombstoned without changes.Came from /retro: yes