Defame1297
38eb0745b7
Description 582 -> 237 chars, body 1217 -> 290 words. The single remotes.md splits into config, fetch, push, and pull flow files. Restores the confirm: true token to the force-push gate -- it is the git plugin's cross-skill contract, gated on by git-orchestrate and git-branches. Moves push.md's worked example off main, which the skill's own Step 1 refuses, and restores the never-bare---force directive.
38 lines
2.0 KiB
Markdown
38 lines
2.0 KiB
Markdown
---
|
|
topic: pull
|
|
source_keys:
|
|
- git-scm-pull-docs
|
|
- context7-git-htmldocs
|
|
---
|
|
|
|
# Pulling
|
|
|
|
Default strategy: `--ff-only`. It fails on divergence, which forces a conscious choice instead of an accidental merge commit.
|
|
|
|
- **Fast-forward only**: `git pull --ff-only` — the recommended default
|
|
- **Rebase**: `git pull --rebase` replays your commits on top for linear history, but rewrites SHAs. Verify nothing being replayed has been pushed: rebasing published commits breaks everyone downstream.
|
|
- **Merge**: `git pull --no-rebase` — three-way merge commit, preserves original commits, non-linear
|
|
- **Rebase preserving merges**: `git pull --rebase=merges` keeps intentional local merge commits during the replay
|
|
- **Stage without committing**: `git pull --squash` collapses incoming commits into staged changes; you write the message
|
|
- **Merge strategy**: Git 2.34+ defaults to `ort` (`recursive` is now an alias for it). Strategy options such as `-X ours`, `-X theirs`, `-X ignore-space-change` pass through unchanged.
|
|
- **Submodules**: `--recurse-submodules` only fetches submodules already checked out. Newly added ones are not initialized — use the `git-submodules` skill for those.
|
|
|
|
## On divergence
|
|
|
|
A pull that diverges with no strategy configured fails, and that failure is the useful outcome. Report the divergence and the three ways out — `--ff-only`, `--rebase`, `--no-rebase` — and let the caller choose. Auto-merging a diverged branch buries a decision that belongs to the human.
|
|
|
|
## Config precedence
|
|
|
|
Highest wins:
|
|
|
|
1. Command-line flag (`--ff-only` / `--rebase` / `--no-rebase`)
|
|
2. `pull.rebase` config (global or local)
|
|
3. `branch.<name>.rebase` (branch-specific override)
|
|
4. `branch.autoSetupRebase` (set automatically when the tracking branch was created)
|
|
|
|
```bash
|
|
git config pull.ff only # deterministic default across Git versions
|
|
git config --global pull.rebase true
|
|
git config branch.develop.rebase false # develop always merges, regardless of the global default
|
|
```
|