Skip to content

Git Master

Authoritative DevOps Git reference.

Sections

  • docs/devops-workflows/ : advanced workflows (git-diff-deployment-decisions, git-fixup-autosquash, git-diff-devops, git-fast-import-export, git-revert-rollbacks, git-refspecs-and-mirroring, git-attributes-filter-drivers, git-lfs-devops, sparse-checkout, merge-strategies, merge-drivers, rebase-interactive, worktree, rerere, filter-repo, subtree, submodule, commit signing, bisect, stash, replace/grafts, git-hooks-devops, git-bundle-shallow-clone, git-plumbing-ci-automation, git-notes-ci-annotations, cherry-pick, range-diff, git-tagging-strategy, git-merge-tree-in-memory, git-credential-helpers, git-conditional-config, git-archive-deterministic-builds, git-reference-clones-alternates, git-multi-pack-index, git-partial-clone-promisor, git-maintenance, git-reflog-forensics, git-worktree-feature-branches, git-worktree-parallel-builds, git-push-safety, git-commit-forensics-querying, git-format-patch-am, git-rev-list-devops, git-commit-trailers, git-bisect-run, git-pathspec-magic)
  • docs/troubleshooting/ : disaster recovery (repo-corruption-repair, reflog rescue, git-reflog-rescue, git-debugging-tracing) |- docs/recipes/ : quick cheat-sheet recipes (diff-deploy-quick, fixup-autosquash-quick, diff-quick, bisect-run-quick, revert-rollback-quick, repo-corruption-quick, refspecs-mirroring-quick, attributes-filter-quick, lfs-quick, sparse-checkout-quick, plumbing-quick, hooks-quick, stash-quick, submodule-quick, subtree-quick, replace-grafts-quick, rerere-quick, signing-quick, bundle-shallow-quick, filter-repo-quick, merge-strategy-quick, merge-driver-quick, worktree-parallel-quick, rebase-interactive-quick, notes-quick, range-diff-quick, tagging-quick, merge-tree-quick, credential-helpers-quick, conditional-config-quick, archive-quick, reference-clones-alternates-quick, multi-pack-index-quick, partial-clone-promisor-quick, maintenance-quick, push-safety-quick, commit-forensics-quick, patch-workflow-quick, rev-list-quick, trailers-quick, debugging-tracing-quick, pathspec-quick, fast-import-quick, blame-quick)
  • docs/adr/ : architecture decision records (ADR 0001 static site publishing)
  • docs/glossary.md : domain concepts and terminology
  • scripts/ : practical helper scripts (diff-deploy-manage.sh, fixup-autosquash-manage.sh, diff-manage.sh, bisect-run-manage.sh, revert-manage.sh, repo-repair.sh, mirror-sync.sh, attributes-manage.sh, lfs-manage.sh, build-docs.sh, sparse-checkout-ci.sh, plumbing-tools.sh, hooks-manage.sh, stash-manage.sh, submodule-manage.sh, replace-manage.sh, rerere-manage.sh, bundle-manage.sh, maintenance-manage.sh, bisect-ci.sh, wt-hotfix.sh, wt-feature.sh, merge-lockfile.py, install-merge-drivers.sh, range-diff-manage.sh, tag-manage.sh, merge-tree-manage.sh, credential-helper-manage.sh, config-include-manage.sh, archive-manage.sh, reference-cache-manage.sh, midx-manage.sh, promisor-manage.sh, push-safety-manage.sh, commit-forensics.sh, patchwork-manage.sh, rev-list-manage.sh, debugging-manage.sh, fast-import-manage.sh, blame-manage.sh)

Static site publication

Build the static site locally or run the live-reload server:

./scripts/build-docs.sh build  # compiles to site/
./scripts/build-docs.sh serve  # serves on http://127.0.0.1:8000

Every push to master triggers .forgejo/workflows/publish.yaml to compile the docs and publish directly to Cloudflare Pages.

Latest

  • docs/devops-workflows/git-blame-forensics.md: Attribution forensics for incident response, deployment routing, and CI gates. Covers blame mechanics, --ignore-revs-file maintenance, programmatic output (--porcelain, --line-porcelain, --format=json), range blame for targeted investigation, blame-based CI author frequency and volatility gates, incident trace procedure, monorepo ownership matrices via blame, merge commit attribution, and 10 common pitfalls. Includes a diff-blame pipeline that blames only lines changed in a diff.
  • docs/recipes/blame-quick.md: One-page cheat sheet for basic blame, ignore revs, machine-readable output formats, CI gate commands, ignore file maintenance, copy/move detection, incident trace procedure, and script action reference.

  • scripts/blame-manage.sh: Management utility with 11 actions: inspect, range, porcelain, ignore, ignore-sync, diff-blame, gate-authors, gate-volatility, ownership, incident, and heatmap.

  • docs/devops-workflows/git-fast-import-export.md: Bulk repository import/export via text stream. Covers the fast-export stream format (blob, commit, tag, reset, checkpoint, marks), 6 DevOps patterns (monorepo consolidation with --prefix, repo splitting via --path, history anonymization with --anonymize, incremental migration with marks files, synthetic test repo generation, stream manipulation with external scripts), performance characteristics (orders of magnitude faster than filter-repo for stream-level rewrites), and a tools comparison table for fast-import vs filter-repo vs filter-branch.

  • docs/recipes/fast-import-quick.md: One-page cheat sheet for export flags, import commands, stream format reference, file change commands, marks for incremental migration, and DevOps one-liners (consolidation pipe, split, SSH streaming, synthetic repo generator).

  • scripts/fast-import-manage.sh: Automation wrapper with 10 actions: export, import, anonymize, consolidate, split, stream-ssh, marks-status, synthetic, verify-stream, and help.

  • docs/devops-workflows/git-diff-deployment-decisions.md: Using git diff --name-only, diff-tree --no-commit-id, --diff-filter, --exit-code, git shortlog, git log --first-parent, git interpret-trailers, and git merge-base --is-ancestor to decide what to build, deploy, and promote. Covers targeted service builds from monorepo diffs, change-type deploy gates, git blame-ignore-revs for blame truth, commit-trailer extraction in CI, environment promotion gates, and matrix generation for parallel deployment.

  • docs/recipes/diff-deploy-quick.md: One-page cheat sheet for git diff deployment decision commands: changed-files listing, deploy gate exit codes, service-targeted build one-liners, release notes from shortlog, first-parent merge logs, blame ignore revs, trailer extraction, and fast-forward promotion gates.

  • scripts/diff-deploy-manage.sh: Automation script with ten actions: list-changed, filter-deploy, count, shortlog, changelog, matrix, blame-ignore, extract-trailer, promote-gate, tree-compare, and exit-code.

  • docs/devops-workflows/git-bisect-run.md: Deep automated regression hunting guide. Covers git bisect run exit code contract (0/1-124/125/126+), building robust test scripts with Docker isolation, temp-directory zero-contamination builds, multi-criteria regression scoring, flaky test retry with adaptive logging, skip-unreachable patterns, parallel bisect runs on different monorepo modules in separate worktrees, first-parent bisect for merge-heavy history, bisect replay for reproducible forensics, and CI pipeline integration with Forgejo/GitHub Actions. Includes real test-script templates for each pattern.

  • docs/recipes/bisect-run-quick.md: One-page cheat sheet for exit code contract, worktree-isolated runs, path-scoped bisect, test script template, CI workflow snippet, and replay commands.

  • scripts/bisect-run-manage.sh: Automation script supporting run (HEAD vs good tag), run-range (custom bad/good refs), skip-test (generate template), replay (from saved log), status, log, visualize, and reset -- with --worktree, --first-parent, and --path options.

  • docs/troubleshooting/git-debugging-tracing.md: Protocol-level Git diagnostics for CI failures. Covers all 9 GIT_TRACE* environment variables — packet-level wire protocol (GIT_TRACE_PACKET), cURL HTTP negotiation (GIT_CURL_VERBOSE), performance profiling (GIT_TRACE_PERFORMANCE), working-tree discovery (GIT_TRACE_SETUP), shallow boundary inspection (GIT_TRACE_SHALLOW), and pack access logging (GIT_TRACE_PACK_ACCESS). Includes 4 practical diagnostics scenarios (protocol error, slow clone, auth failure, structured logging), persistent trace config for CI runners, security redaction patterns, and a full "blanket trace" one-liner that is the universal first response to any opaque Git failure.

  • docs/recipes/debugging-tracing-quick.md: One-page cheat sheet for trace variable selection, common cURL error patterns, CI persistence config, and security notes.

  • scripts/debugging-manage.sh: Automation wrapper with capture (all categories, timestamped log file), curl/perf/packet single-category traces, redact (strip auth from trace logs), install/uninstall/info for persistent repo-level trace config.

  • docs/devops-workflows/git-fixup-autosquash.md: The PR review fixup workflow. git commit --fixup=<SHA> marks corrections against the commit they belong in; git rebase -i --autosquash folds them in automatically. Covers --fixup=amend:, rebase.autoSquash config modes (true / log), CI gates to reject branches with fixup! commits, pre-receive hooks, range-diff verification after squash, autostash integration, --update-refs for stacked branches, multiple fixups targeting the same commit, fixup filtering in git log --grep, and a comparison table of fixup vs manual rebase vs squash merge vs --amend.

  • docs/recipes/fixup-autosquash-quick.md: One-page cheat sheet for fixup creation, autosquash rebase one-liners, CI detection, range-diff verification, and config keys.

  • scripts/fixup-autosquash-manage.sh: Automation script supporting fixup, squash, autosquash, detect (CI gate), pre-receive, verify, install-hook, and `config.

  • docs/devops-workflows/git-rev-list-devops.md: The plumbing commit traversal engine for CI/CD automation. Covers counting, filtering (time, author, message, path, parent count), symmetric difference with left-right markers, cherry-pick (patch-equivalent) detection across branches, parent/topology filters (first-parent, ancestry-path, min/max-parents), bisect cost estimation, programmatic stdin usage, ordering control, and real deployment gates (commit count throttles, backport gap reports, stale branch detection, release area breakdowns). Full command reference table mapping 25+ flags to DevOps use cases.

  • docs/recipes/rev-list-quick.md: One-page cheat sheet for rev-list counting, filtering, cross-branch analysis, topology flags, programmatic patterns, range syntax, and exit codes.

  • scripts/rev-list-manage.sh: Automation utility supporting count, left-right, cherry-gap, merges, range, since-until, stale, bisect-cost, top-count, verify-range, touching-path, and stdin-count.

  • docs/devops-workflows/git-diff-devops.md: Diff algorithms (myers, patience, histogram), exit-code CI gates, whitespace checks, rename/copy detection tuning, programmatic output formats (--numstat, --shortstat, --raw), combined diff for merge review, word-diff for documentation, function-context for code review, external diff tools, performance tuning with diff-tree, custom diff drivers for binary/structured files, and CI patterns for build gating, scope detection, and change magnitude checks.

  • docs/recipes/diff-quick.md: One-page cheat sheet for diff algorithms, rename flags, programmatic output, diff-filter codes, merge diff commands, CI gate patterns, and exit codes.

  • scripts/diff-manage.sh: Automation utility supporting compare, check-whitespace, files-changed, stat, numstat, check-gate, gate-files, diff-filter, word-diff, algorithm-compare, and binary-check.

  • docs/devops-workflows/git-format-patch-am.md: Patch-based collaboration for air-gapped promotion, cross-org contribution, and backport pipelines. Covers git format-patch (ranges, cover letters, --signoff, --binary, --stdout), git am (series application, --3way fallback, --continue/--skip/--abort recovery), raw-diff application with git apply --check, patch inspection with git mailinfo, patch lifecycle patterns for CI promotion and backports, and round-trip losslessness verification.

  • docs/recipes/patch-workflow-quick.md: One-page cheat sheet for patch generation, application, recovery commands, key flags, and DevOps apply/backport patterns.

  • scripts/patchwork-manage.sh: Patch toolkit supporting export, apply, apply-diff, check (dry-run gate), status, continue/skip/abort, stat, info, verify (round-trip), series, and clean-patch.

  • docs/devops-workflows/git-commit-forensics-querying.md: Advanced git log querying, pickaxe search (-S/-G), file lifecycle tracking via --diff-filter, function line-range tracking (-L), clean blame with --ignore-revs, release notes with git shortlog, build versioning with git describe, branch governance with git for-each-ref, topology-aware history via --ancestry-path, and combined DevOps forensic patterns for incident investigation and release automation.

  • docs/recipes/commit-forensics-quick.md: One-page cheat sheet for pickaxe search, --first-parent, --diff-filter, -L tracking, clean blame, shortlog changelog generation, git describe, for-each-ref audits, and CI preflight checks.

  • scripts/commit-forensics.sh: Automation utility supporting 13 actions: pickaxe, pickaxe-regex, blame-clean, shortlog, describe, stale-branches, changed-files, merge-path, audit-refs, changelog, who-changed, content-age, ahead-behind, git-grep-log, and ci-skip-check.

  • docs/devops-workflows/git-push-safety.md: Git push safety for CI/CD pipelines -- client-side safe force-push (--force-with-lease, --force-if-includes), server-side enforcement (receive.denyNonFastForwards, receive.fsckObjects, push certificates), pre-receive/update hook policy, atomic pushes, signed pushes, audit logging, and CI-specific push patterns for feature branches, releases, and emergency hotfixes.

  • docs/recipes/push-safety-quick.md: One-page cheat sheet for safe force-push commands, server-side deny config, CI push patterns, pre-receive hook templates, and audit logging setup.

  • scripts/push-safety-manage.sh: Configuration and audit utility supporting secure-remote (hardening a receiving repo with deny rules + fsck), secure-global (client-side push defaults), inspect (config audit), test-lease (dry-run lease push), check-script (scanning for bare --force in scripts), install-pre-receive and install-post-receive (policy hooks), and cert-setup (push certificate nonce generation).

  • docs/devops-workflows/git-multi-pack-index.md: Multi-pack index (MIDX) architecture, reachability bitmaps across packfiles, and incremental batch repacking. Covers index structure, object lookups across packfiles, reachability bitmap generation (git multi-pack-index write --bitmap), preferred pack selection, batch repacking (--batch-size), redundant pack expiration (git multi-pack-index expire), geometric repacking (git repack --geometric), and automated CI runner maintenance.

  • docs/recipes/multi-pack-index-quick.md: One-page cheat sheet for MIDX commands, bitmap flags, batch repacking formulas, maintenance routines, and verification checks.

  • scripts/midx-manage.sh: Automation script supporting status (inspecting packs, index size, and bitmaps), write (generating index and bitmaps), verify (integrity checking), repack (bounded batch compaction), expire (safe pack unlinking), geometric (geometric progression repack), and auto-maintenance (end-to-end safe maintenance cycle).

  • docs/devops-workflows/git-partial-clone-promisor.md: Deferred object fetching via Git partial clones and promisor remotes. Covers filter levels (blob:none, tree:0), promisor remote contracts, protocol v2 negotiation, git rev-list --missing object inspection, forced re-fetch with --refetch, merge/rebase/cherry-pick in partial clones, GC constraints in promisor repos, CI pre-fetch and fallback patterns, shared promisor cache for parallel worktrees, and promisor troubleshooting.

  • docs/recipes/partial-clone-promisor-quick.md: One-page cheat sheet for promisor inspection, force materialization, maintenance commands, config keys, and troubleshooting common failures.

  • scripts/promisor-manage.sh: Management utility with nine actions: status (promisor config + missing object count), inspect (missing objects by type), materialize (eager HEAD object fetch), fetch-refetch (full promisor re-download), verify (promisor-aware fsck), gc-safe (promisor-boundary GC), enable (filtered clone), disable (promisor removal), and configure-ci (four CI clone strategy templates).

  • docs/devops-workflows/git-reference-clones-alternates.md: Accelerating CI runner builds and disk deduplication with Git reference repositories and object alternates. Covers object borrowing mechanics via .git/objects/info/alternates, non-blocking clones (--reference-if-able), standalone decoupling (--dissociate and git repack -a -d -l), safe cache update routines without destructive pruning (--no-prune), dynamic runtime object injection (GIT_ALTERNATE_OBJECT_DIRECTORIES), and self-hosted runner cache configurations.

  • docs/recipes/reference-clones-alternates-quick.md: One-page cheat sheet for reference clone syntax, dissociation commands, alternate path rules, environment variables, CI pipeline snippets, and bad object troubleshooting.

  • scripts/reference-cache-manage.sh: Runner cache management utility supporting init (bare mirror cache creation), sync (safe non-destructive fetch), clone (reference clone with automatic fallback and dissociation flags), status (alternate path inspection), dissociate (standalone local repacking), audit-borrowers (identifying active borrowing repositories), and verify (full object integrity validation).

  • docs/devops-workflows/git-archive-deterministic-builds.md: Clean release artifact packaging and deterministic build generation with git archive. Covers format selection (tar, tar.gz, zip), prefix directory safety, stripping development and CI tooling via .gitattributes (export-ignore), dynamic build metadata and commit SHA injection (export-subst), byte-for-byte reproducible archives with fixed timestamps (--mtime), direct Docker build context streaming over stdin, submodule bundling, and CI release automation.

  • docs/recipes/archive-quick.md: One-page cheat sheet for git archive commands, .gitattributes export flags, metadata format placeholders, reproducible timestamp scripts, and Docker pipeline streams.

  • scripts/archive-manage.sh: Automation and verification utility supporting create (archive packaging with prefix and format control), inspect (archive content inspection without extracting), verify-subst (verifying export placeholder expansion), audit-ignore (identifying excluded tracked files), reproducible-tar (deterministic archive generation with commit timestamp and SHA256 checksums), and cat-file (direct file extraction from archive stream).

  • docs/devops-workflows/git-conditional-config.md: Enterprise configuration cascading, scope hierarchies, and dynamic includeIf conditional directives. Covers directory-based routing (gitdir: and case-insensitive gitdir/i:), branch matching (onbranch:), remote URL matching (hasconfig:remote.*.url:), multi-identity isolation, directory-scoped commit signing and SSH keys, URL rewrites (url.<base>.insteadOf), scoped proxy routing, CI runner safe.directory fixes, and worktree-specific configurations (extensions.worktreeConfig).

  • docs/recipes/conditional-config-quick.md: One-page cheat sheet for scope precedence, conditional include syntax, multi-profile identity templates, URL rewrites, and origin inspection commands.

  • scripts/config-include-manage.sh: Profile management and configuration tracing script supporting setup-profile (profile creation and include registration), list-scopes (origin and scope inspection), trace (evaluating active directory configuration), add-insteadof (URL rewrite rules), audit-safe-dirs (safe directory validation), and verify-identity (commit identity validation).

  • docs/devops-workflows/git-credential-helpers.md: Secure authentication management for CI/CD runners and developer workstations. Covers the Git credential helper wire protocol (get, store, erase), in-memory socket caching, scoped helper routing (credential.<url>.helper), dynamic just-in-time token injection via Vault/APIs, direct header injection (http.extraHeader), and plaintext token leak audits.

  • docs/recipes/credential-helpers-quick.md: One-page cheat sheet for helper backend selection, timeout configuration, scoped configurations, CI runner token injection one-liners, and security leak scans.

  • scripts/credential-helper-manage.sh: Automation and auditing utility supporting test-fill (protocol resolution), set-cache (daemon configuration), set-scoped (domain routing), seed-cache (non-interactive memory seeding), clear-cache (daemon termination), audit-leaks (repository token leak detection), and sanitize-remote (stripping inline tokens from remotes).

  • docs/devops-workflows/git-merge-tree-in-memory.md: Server-side in-memory three-way merges using git merge-tree --write-tree. Covers zero-checkout merge conflict detection in CI, synthesizing merge commits without disk locks, speculative merge queues (merge trains), rebase simulation with --merge-base, and server-side pre-receive gate hooks.

  • docs/recipes/merge-tree-quick.md: One-page cheat sheet for git merge-tree --write-tree syntax, flags (--name-only, --merge-base, --no-messages), exit code matrices, and synthetic merge commit one-liners.

  • scripts/merge-tree-manage.sh: Automation utility with six subcommands: can-merge for zero-checkout mergeability testing, tree for merged tree extraction, synthesize for in-memory merge commit creation, conflicts for conflict reporting, speculative-batch for multi-PR merge queue evaluation, and simulate-rebase for in-memory rebase compatibility checks.

  • docs/devops-workflows/git-tagging-strategy.md: Complete release tagging reference covering lightweight vs annotated vs signed tags, SemVer and pre-release patterns (v2.4.0-rc.1), git describe for build stamping with --tags --always --dirty, signed-tag CI verification gates, tag-based Docker build patterns, and the ^{} peel mechanic for signed tags.

  • docs/recipes/tagging-quick.md: One-page cheat sheet for the three tag types, SemVer naming, git describe flags, signing setup, CI tag-verification loops, and the pre-release sequence (alpha -> beta -> rc -> release).

  • scripts/tag-manage.sh: Twelve-action utility: create, describe, peel, verify, verify-all (CI gate), list, delete (local + remote), move (refuses published tags), push, push-all, semver-bump (major/minor/patch/prerelease), is-prerelease, deploy-env (rc->staging, stable->production), and stamp (writes a version.json for downstream tooling).

  • docs/devops-workflows/git-range-diff.md: Compare two commit ranges after a rebase, subtree pull, cherry-pick batch, or force-push. Pair commits on the old side with their counterparts on the new side and surface only the patches that actually changed. The missing tool for "did this rebase preserve behaviour?" reviews.

  • docs/recipes/range-diff-quick.md: One-page cheat sheet for git range-diff syntax, the = ! < > markers, common DevOps patterns (rebase validation, vendor subtree pulls, cherry-pick drift, force-push review), --creation-factor tuning, and a CI pre-merge gate.

  • scripts/range-diff-manage.sh: Automation utility with four actions: compare for manual range review (with --strict exit-code mode), pre-rebase to capture the merge-base anchor before rebasing, pre-merge-gate for CI gates that fail on substantive drift, and force-push-diff to compare a remote branch's reflog prior tip against its current tip.

  • docs/devops-workflows/git-revert-rollbacks.md: Non-destructive production rollbacks, single and range commit reversions, merge commit parent selection (-m 1), Linus Torvalds merge revert recovery patterns, and automated CI/CD incident rollback pipelines.

  • docs/recipes/revert-rollback-quick.md: One-page cheat sheet for single, range, merge, and atomic --no-commit revert commands.

  • scripts/revert-manage.sh: Automation utility for single/range/merge commit reversions, atomic pull request rollback staging, merge parent inspections, and re-revert restoration.

  • docs/troubleshooting/repo-corruption-repair.md: Git object store forensics, stale lock clearing, index reconstruction from HEAD, corrupt loose object and packfile recovery, and plumbing reconstruction for missing trees and commits.

  • docs/recipes/repo-corruption-quick.md: One-page cheat sheet for emergency repository repair commands, lock clearance, index rebuilding, and object diagnostics.

  • scripts/repo-repair.sh: Diagnostic and emergency repair automation script to inspect repository integrity, remove stale locks, rebuild index files, restore HEAD refs, verify packfiles, and execute automated salvage pipelines.

  • docs/devops-workflows/git-refspecs-and-mirroring.md: Refspec mechanics, pull request and merge request fetch mappings, negative refspecs, dual-push configurations, atomic push synchronization, and Git LFS replication for disaster recovery.

  • docs/recipes/refspecs-mirroring-quick.md: One-page cheat sheet for refspec mapping syntax, PR fetch configuration, dual-push setup, and mirror synchronization commands.

  • scripts/mirror-sync.sh: Management script for atomic multi-remote synchronization, pull request fetching, dual-push setup, remote auditing, and LFS asset syncing.

  • docs/devops-workflows/git-attributes-filter-drivers.md -- Git attributes and filter drivers for DevOps: clean/smudge pipelines for secret scrubbing, textconv for canonical JSON/YAML diffing, Jupyter notebook diffing, infrastructure hunk headers (xfuncname), and line ending normalization

  • docs/recipes/attributes-filter-quick.md -- one-page cheat sheet for .gitattributes configuration, diff driver commands, and filter debugging

  • scripts/attributes-manage.sh -- management script to initialize baseline attributes, configure recommended diff drivers, audit repository attribute coverage, and test clean/smudge filter idempotency

  • docs/devops-workflows/git-lfs-devops.md -- Git Large File Storage for CI/CD and DevOps, covering pointer anatomy, GIT_LFS_SKIP_SMUDGE bypass, selective path fetching, binary file locking, history migration, and cache pruning

  • docs/recipes/lfs-quick.md -- one-page cheat sheet for Git LFS commands, tracking patterns, CI smudge bypass, and lock management

  • scripts/lfs-manage.sh -- automation utility for Git LFS setup, selective CI pulls, large-file audits, cache pruning, migration, and lock control

  • docs/devops-workflows/git-sparse-checkout.md -- monorepo optimization guide covering blobless/treeless partial clones, cone mode path filtering, multi-worktree sparse configurations, CI pipeline isolation, and conflict resolution

  • docs/recipes/sparse-checkout-quick.md -- quick reference commands for sparse cones, worktree isolation, and blobless shallow clones
  • scripts/sparse-checkout-ci.sh -- automation script for CI runners to perform filtered clones and manage sparse directory sets
  • docs/devops-workflows/git-merge-drivers.md -- custom .gitattributes merge drivers (merge=<name>), three-way merge inputs (%O %A %B), deterministic lockfile merging, JSON deep merge, vendor-blob theirs-wins, and CI integration patterns
  • docs/recipes/merge-driver-quick.md -- one-page cheat sheet for custom merge driver registration and built-in merge strategies (union, binary)
  • scripts/merge-lockfile.py -- deterministic three-way lockfile merger (Python)
  • scripts/install-merge-drivers.sh -- register all custom merge drivers on a CI container
  • docs/devops-workflows/git-plumbing-ci-automation.md -- low-level Git plumbing commands (hash-object, cat-file, write-tree, commit-tree, update-ref, diff-tree) for high-speed CI/CD scripting and zero-checkout synthetic commits
  • docs/recipes/plumbing-quick.md -- at-a-glance cheat sheet for Git plumbing and in-memory object operations
  • scripts/plumbing-tools.sh -- utility script for CI ancestor checks, direct file extractions, change diffs, and synthetic commit generation
  • docs/devops-workflows/git-submodule-management.md -- full submodule lifecycle (add, clone --recurse-submodules, update --remote, CI patterns for shallow/branch/auth, gitlink index inspection), submodule->subtree conversion, disaster recovery
  • scripts/submodule-manage.sh -- add/update/remove/status/pin submodules with dry-run support
  • docs/recipes/submodule-quick.md -- one-page cheat sheet for submodule operations
  • docs/devops-workflows/git-bundle-shallow-clone.md -- air-gapped CI transport, incremental backup archives, and shallow/partial clone acceleration
  • docs/recipes/bundle-shallow-quick.md -- one-page cheat sheet for git-bundle and shallow clone workflows
  • scripts/bundle-manage.sh -- utility script to create, verify, unbundle, and list Git bundle archives
  • docs/devops-workflows/git-hooks-devops.md -- pre-commit and server-side Git hooks for CI enforcement, secret scanning, and commit message linting
  • scripts/hooks-manage.sh -- utility script to install, configure, distribute, and audit Git hooks across teams and CI runners
  • docs/recipes/hooks-quick.md -- cheat sheet for Git hook installation and configuration
  • docs/devops-workflows/git-replace-grafts.md -- surgical history modification with git replace and grafts: re-parent commits, swap blobs/trees, and fix ancestry without force-push or SHA changes
  • docs/recipes/replace-grafts-quick.md -- at-a-glance replace/grafts cheat sheet for CI-safe history fixes
  • scripts/replace-manage.sh -- utility script to inspect, configure, export/import, and manage replace refs and grafted replacements
  • docs/devops-workflows/git-stash-advanced.md -- Comprehensive stash patterns for CI-safe branching, selective stashing, stash branches, and index preservation
  • docs/recipes/stash-quick.md -- At-a-glance stash cheat sheet
  • scripts/stash-manage.sh -- Utility script to list, apply, drop, export, and import stashes with file counts
  • docs/devops-workflows/git-bisect-ci-triage.md -- automated binary search regression triage for CI failures
  • docs/recipes/rerere-quick.md -- at-a-glance Rerere CLI cheat sheet
  • scripts/rerere-manage.sh -- utility script to inspect, configure, forget bad resolutions, and export/import Rerere cache for CI runners
  • docs/devops-workflows/git-filter-repo.md -- scrub secrets and large binaries from repository history
  • docs/recipes/filter-repo-quick.md -- one-liner cheat-sheet for history filtering
  • docs/devops-workflows/git-merge-strategies.md -- fast-forward vs squash vs no-ff vs ours/theirs merge strategies for CI pipelines
  • docs/recipes/merge-strategy-quick.md -- merge strategy command matrix
  • docs/troubleshooting/reflog-rescue.md -- recover lost commits from accidental reset/rebase using the reflog
  • docs/devops-workflows/git-subtree-monorepo.md -- split subfolders to standalone repos and manage vendor dependencies
  • docs/recipes/subtree-quick.md -- minimal subtree split/pull cheat-sheet
  • docs/devops-workflows/git-commit-signing.md -- GPG/SSH commit signing for supply-chain integrity and CI enforcement
  • docs/recipes/signing-quick.md -- at-a-glance commit signing commands
  • docs/devops-workflows/git-worktree-parallel-debug.md -- parallel CI debug and hotfix builds with git worktree
  • docs/devops-workflows/git-notes-ci-annotations.md -- annotate commits with CI build metadata without altering SHA
  • docs/recipes/notes-quick.md -- at-a-glance git-notes commands and named namespaces
  • scripts/notes-manage.sh -- annotate, show, push, fetch, and list notes by namespace |- docs/devops-workflows/git-cherry-pick.md -- selective backport and hotfix promotion across release branches. Covers basic cherry-pick mechanics, -x source recording for traceability, merge commit mainline selection (-m 1), conflict resolution and recovery (--continue/--skip/--abort), patch trains for staged environment promotion, multi-branch security hotfix backports, CI-gated backport pipelines, cherry-pick vs rebase vs merge decision table, LFS pointer handling, signed commit re-signing, and a full reference table of 15+ flags mapped to DevOps use cases. |- docs/recipes/cherry-pick-quick.md -- one-page cheat sheet for cherry-pick syntax, conflict recovery, environment promotion patterns, and key flags. |- scripts/cherry-pick-manage.sh -- automation utility supporting backport (single commit to multiple branches), sequence (range with progress reporting), promote (environment staging), conflicts (inspect paused state), verify (range-diff fidelity check), cleanup (find/reset stale cherry-pick states), and status.

|- docs/devops-workflows/git-commit-trailers.md — structured commit metadata via git interpret-trailers for CI/CD automation. Covers the trailer wire protocol (--parse, --in-place, --trailer), configuration directives (trailer.where, trailer.ifexists, trailer.ifmissing, trailer.<key>.command), and 7 DevOps patterns — DCO pre-receive enforcement, CI skip gating, backport source stamping, release phase gating, automated changelog extraction from trailers, prepare-commit-msg hook for Change-Id injection, and multi-trailer environment export. ||- docs/recipes/trailers-quick.md — one-page cheat sheet for trailer parsing, creation, config keys, and DevOps one-liners for DCO checks, CI skip, backport stamps, and changelog extraction. | |- docs/devops-workflows/git-pathspec-magic.md — Git pathspec magic signatures for precision path filtering in CI/CD. Covers all 7 magic signatures (top, literal, icase, glob, attr, exclude, recursive), combining signatures, shell quoting pitfalls, and 4 DevOps scenarios (monorepo CI scope detection, infrastructure-only change gates, attribute-defined scope, and git grep across scoped paths). |- docs/recipes/pathspec-quick.md — one-page cheat sheet for magic signatures, short forms, combining flags, and common CI patterns.