Программирование
Поисковый справочник по repository, branch, commit, синхронизации, PR, конфликтам и безопасным Git-действиям.
33 терминов
Основные понятия
Repository
engineerdoge/math-ai-toolsA project folder tracked by Git, usually mirrored on GitHub.
When you ask to inspect a project, commit work, or compare branches, the repository is the unit being handled.
engineerdoge/math-ai-toolsCheck the current repository status.
Основные понятия
Working tree
git statusThe files currently checked out on your machine, including edits that are not committed yet.
Use it to separate committed history from the edits currently in progress.
git statusShow what changed in the working tree.
Основные понятия
Staging area
git add src/components/SiteHeader.tsxA temporary selection of changes that will be included in the next commit.
It lets you commit only the files or hunks that belong together.
Staging does not save history by itself. The commit is what records it.
git add src/components/SiteHeader.tsxStage only the files for the Git terms page.
Основные понятия
Commit
git commit -m "Add Git terms reference"A saved snapshot of selected changes in the repository history.
Commits make it possible to review, compare, deploy, or roll back changes later.
git commit -m "Add Git terms reference"Create a commit with a concise message.
Основные понятия
Diff
git diffA line-by-line view of what changed between two file states.
Diff is the quickest way to review exactly what an edit did before committing.
git diffReview the diff for unexpected changes.
Ветки
Branch
qwen3.5A named line of work that can move separately from other lines of work.
Branches let you develop a feature without changing main immediately.
qwen3.5Tell me which branch I am currently on.
Ветки
main branch
mainThe default branch that usually represents the stable or production-ready version.
Compare your working branch with main to see what changed.
mainCompare this branch against main.
Ветки
checkout
git switch qwen3.5Changing the working tree to another branch or commit.
Use it when you need to inspect or continue work on another branch.
Uncommitted edits can block switching branches if they would be overwritten.
git switch qwen3.5Switch to the qwen3.5 branch after checking for uncommitted changes.
Ветки
merge
git merge mainCombining changes from one branch into another branch.
Use merge to bring main updates into your feature branch or finish a feature into main.
Merge can create conflicts when both branches edited the same lines differently.
git merge mainExplain what would happen before merging main into this branch.
Ветки
rebase
git rebase mainReplaying commits from one branch on top of another base commit.
It can make history look linear before merging a feature branch.
Rebase rewrites commit history, so it should be used carefully on shared branches.
git rebase mainDo not rebase yet. First explain the risk on this branch.
Синхронизация
clone
git clone https://github.com/user/project.gitMaking a local copy of a remote repository.
It is usually the first step when starting work on an existing GitHub project.
git clone https://github.com/user/project.gitClone this repository and show the available branches.
Синхронизация
remote
origin git@github.com:user/project.gitA named connection from the local repository to a repository hosted somewhere else.
Remote settings decide where pull and push communicate.
origin git@github.com:user/project.gitShow the configured remotes.
Синхронизация
fetch
git fetch originDownloading remote branch information without changing your working files.
Use fetch before comparing your branch with the latest remote state.
git fetch originFetch from origin, then compare this branch with main.
Синхронизация
pull
git pull origin mainFetching remote changes and applying them to the current branch.
Use it to update your local branch with work that was pushed elsewhere.
Pull can change your working branch and may cause conflicts.
git pull origin mainBefore pulling, check whether I have local uncommitted changes.
Синхронизация
push
git push origin qwen3.5Uploading local commits to a remote repository.
Push makes your local commits available on GitHub or another remote.
Push only uploads commits, not uncommitted working tree edits.
git push origin qwen3.5Push the current branch after confirming the build passes.
Синхронизация
origin
git push origin qwen3.5The conventional default name for the remote repository you cloned from.
Most push, pull, and fetch examples use origin as the remote name.
git push origin qwen3.5Check whether origin points to the expected GitHub repository.
Ревью
Pull Request
Open a PR from qwen3.5 into mainA GitHub review page for discussing and merging branch changes.
Use a PR to review changed files, run checks, discuss comments, and merge safely.
Open a PR from qwen3.5 into mainSummarize what should go into the PR description.
Ревью
Review
Review requested changesChecking code changes for bugs, regressions, readability, and missing tests.
Review helps catch issues before merging a branch into the shared codebase.
Review requested changesReview this branch for bugs and missing tests.
Конфликты
Merge conflict
CONFLICT (content): Merge conflict in src/app/page.tsxA situation where Git cannot automatically combine changes from different branches.
You must choose the correct final content before the merge can continue.
Do not blindly accept one side. Check the intended behavior first.
CONFLICT (content): Merge conflict in src/app/page.tsxExplain the conflict and propose the safest resolution.
Конфликты
Conflict marker
<<<<<<< HEADText markers Git inserts into a file to show conflicting versions.
Markers show which part came from your current branch and which came from the incoming branch.
Conflict markers should not remain in committed code.
<<<<<<< HEADFind any remaining conflict markers.
Конфликты
Untracked file
?? src/lib/git-github.tsA file that exists in the folder but has not been added to Git tracking yet.
New pages and components usually appear as untracked until staged.
?? src/lib/git-github.tsList untracked files and tell me which ones belong to this feature.
Конфликты
Modified file
M src/components/SiteHeader.tsxA tracked file whose content differs from the last committed version.
It helps you see which existing files were touched by the current work.
M src/components/SiteHeader.tsxShow the modified files for this task.
Безопасность
stash
git stash push -m "before branch switch"Temporarily saving uncommitted changes so the working tree can become clean.
Use stash before switching branches when you are not ready to commit.
Stashed work can be forgotten. Always name it clearly and reapply it deliberately.
git stash push -m "before branch switch"Stash my current edits with a clear message before switching branches.
Безопасность
reset
git reset --soft HEAD~1Moving branch or staging state back to another commit or state.
Soft or mixed reset can adjust a local commit before it is shared.
Hard reset can discard work. Ask for an explanation before using it.
git reset --soft HEAD~1Explain the safest way to undo the last local commit without losing changes.
Безопасность
revert
git revert abc1234Creating a new commit that undoes an earlier commit.
Revert is usually safer than rewriting history after commits have been pushed.
git revert abc1234Revert the problematic commit without rewriting shared history.
Безопасность
force push
git push --force-with-lease origin qwen3.5Overwriting a remote branch with your local branch history.
It is sometimes used after rewriting local history on a private feature branch.
Force push can erase other people's remote commits. Prefer force-with-lease and confirm first.
git push --force-with-lease origin qwen3.5Do not force push. Explain whether force-with-lease is necessary.
Безопасность
.gitignore
.next/A file that tells Git which files or folders should not be tracked.
Use it for build output, dependencies, local environment files, and temporary files.
.next/Check whether build output is ignored properly.
Команды
git status
git status --shortA command that shows branch, staged changes, modified files, and untracked files.
Run it before editing, committing, pulling, or switching branches.
git status --shortRun git status and summarize only the important changes.
Команды
git log
git log --oneline -5A command for viewing commit history.
Use it to find recent commits, compare work, or identify a commit to revert.
git log --oneline -5Show the last five commits in a compact format.
Команды
git add
git add src/lib/git-github.tsA command that stages changes for the next commit.
Use explicit paths when you want a focused commit.
git add src/lib/git-github.tsStage only the files created for this page.
Команды
git commit
git commit -m "Add Git terms reference"A command that records staged changes into repository history.
Use a message that says what changed and why it matters.
git commit -m "Add Git terms reference"Commit the staged changes with a clear message.
Команды
git pull
git pull --ff-onlyA command that updates the current branch from a remote branch.
The --ff-only option avoids creating an unexpected merge commit.
git pull --ff-onlyPull with ff-only if it is safe.
Команды
git push
git push origin HEADA command that uploads local commits to a remote branch.
Use it after tests pass and commits are ready to share.
git push origin HEADPush this branch after confirming there are no lint or build failures.