</Git & collaboration
Understand branches, merges, rebases, and conflicts through commit graphs and workflows. — 28 entries
Merge commit머지 커밋
A merge commit joins two branches with two parents, preserving both the split and the reunion in history.
Linked worktree연결 워크트리
Linked worktrees share repository objects while giving each branch its own working directory.
Stacked pull requests스택형 풀 리퀘스트
A large change is split into small pull requests, each based on the layer below it.
Agentic code review에이전트 기반 코드 리뷰
An agent follows calls and references around a diff to gather review context.
Review dismissal ruleset리뷰 승인 해제 권한 규칙
A repository ruleset limits which users, teams, or apps may dismiss an approving review.
Git history fixup이전 커밋에 수정 접기
A staged patch is folded into an earlier commit and its descendants are replayed.
Config-based Git hooks설정 기반 Git 훅
Git configuration maps hook events to commands that can be composed.
Parallel Git hooks병렬 Git 훅
Independent configured hooks may run together while hooks using shared state remain serial.
Add resolved conflicts충돌 해결 파일만 스테이징
Only resolved conflict paths are staged, reducing accidental inclusion of unrelated edits.
Working tree작업 트리
The working tree is the current on-disk file state where edits differ from the checked-out snapshot.
Staging area스테이징 영역
The index separately holds the file content chosen for the next commit.
Commit object커밋 객체
An immutable Git record points to a tree, parent commits, metadata, and a message.
Branch pointer브랜치 포인터
A branch name points to a commit and advances when new commits are made on it.
HEAD referenceHEAD 참조
HEAD identifies the current checkout and usually points to a branch name.
Rebase리베이스
Rebase replays a series of commits on a new base.
Cherry-pick체리픽
Cherry-pick applies one selected commit’s change on the current branch as a new commit.
Revert되돌리기 커밋
Revert records a new commit that inverses an earlier change without deleting history.
Merge conflict머지 충돌
Git pauses automatic integration when two histories change the same area incompatibly.
Pull request review풀 리퀘스트 리뷰
A pull request review records feedback, revisions, and approval for a proposed change.
Merge queue머지 큐
A merge queue tests approved pull requests against an updated base before merging them in order.
Incremental MIDX repack점진적 멀티팩 인덱스 재포장
Append an index layer for new packs and compact small layers when needed.
Line history pickaxe줄 이력 피카스 검색
Find commits that changed a chosen string within a function’s line history.
SHA-256 repository transitionSHA-256 저장소 전환 준비
Groundwork for interoperability between repositories with different object hash formats.
Delete merged branches머지 완료 브랜치 정리
Select only local branches whose tips are already reachable from their upstreams for bulk deletion.
Reset modes리셋 모드
Soft, mixed, and hard reset change HEAD, the index, and working files to different extents.
Stash임시 보관
Temporarily shelve uncommitted changes, then apply them again.
Remote-tracking branch원격 추적 브랜치
A local reference records a remote branch position seen at the last fetch.
Git bisect이분 탐색 디버깅
Test the midpoint between a known good and bad commit to locate the first bad change.