远程仓库与同步

$ git clone https://github.com/user/project.git
# Git 自动创建名为 origin 的 remote，指向该 URL

.git/refs/remotes/
└── origin/
    ├── HEAD
    ├── master
    └── feature

# 列出所有远程仓库的简写
$ git remote
origin

# 显示远程仓库的详细信息（包括 URL 和追踪的分支）
$ git remote -v
origin  https://github.com/user/project.git (fetch)
origin  https://github.com/user/project.git (push)

$ git remote show origin
* remote origin
  Fetch URL: https://github.com/user/project.git
  Push  URL: https://github.com/user/project.git
  HEAD branch: master
  Remote branches:
    master  tracked
    feature tracked
  Local branches configured for 'git pull':
    master   merges with remote master
  Local refs configured for 'git push':
    master   pushes to master   (up to date)

# 基本格式
$ git remote add <shortname> <url>

# 示例：添加一个上游仓库
$ git remote add upstream https://github.com/original/project.git

$ git fetch upstream
# 等同于 git fetch https://github.com/original/project.git

# 重命名 remote
$ git remote rename old-name new-name
$ git remote rename origin github-origin

# 修改 remote 的 URL（常用于从 HTTPS 切换到 SSH）
$ git remote set-url origin git@github.com:user/project.git

# 删除 remote（断开与远程仓库的连接，不影响本地提交）
$ git remote remove upstream

# 从 origin 拉取所有分支的更新
$ git fetch origin

# 只拉取特定分支
$ git fetch origin master

# 拉取所有远程仓库的更新
$ git fetch --all

# 查看 origin/master 相对于本地 master 的新提交
$ git log master..origin/master

# 查看差异
$ git diff master..origin/master

# 查看远程分支列表
$ git branch -r
  origin/master
  origin/feature

# 查看所有分支（本地 + 远程）
$ git branch -a
* master
  remotes/origin/master
  remotes/origin/feature

# 基本用法（当前分支已设置上游时）
$ git pull

# 等价于
$ git fetch origin
$ git merge origin/master  # 假设当前在 master 分支，上游是 origin/master

# 使用 rebase 代替 merge
$ git pull --rebase

# 等价于
$ git fetch origin
$ git rebase origin/master

# 对当前仓库设置
$ git config pull.rebase true

# 全局设置
$ git config --global pull.rebase true

$ git pull
error: Your local changes to the following files would be overwritten by merge:
        src/main.js
Please commit your changes or stash them before you merge.

$ git pull
CONFLICT (content): Merge conflict in src/main.js
Automatic merge failed; fix conflicts and then commit the result.

# 推送当前分支到对应的上游分支
$ git push

# 推送指定分支到指定远程仓库
$ git push origin master

# 推送所有本地分支
$ git push --all origin

# 推送标签
$ git push origin v1.0
$ git push origin --tags   # 推送所有标签

$ git push origin master
To https://github.com/user/project.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/user/project.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.

# 第一步：拉取并合并远程更新
$ git pull origin master

# 如果有冲突，解决后：
$ git add .
$ git commit

# 第二步：再次推送
$ git push origin master

# 危险：强制推送，覆盖远程历史
$ git push --force origin master

# 更安全：只有当远程引用指向你预期的 commit 时才强制推送
$ git push --force-with-lease origin master

# 检出远程分支 feature，自动创建本地分支并追踪
$ git checkout feature
Branch 'feature' set up to track remote branch 'feature' from 'origin'.
Switched to a new branch 'feature'

# 方法一：推送时设置上游
$ git push -u origin feature
# 或
$ git push --set-upstream origin feature

# 方法二：为已有分支设置上游
$ git branch -u origin/feature
# 或
$ git branch --set-upstream-to=origin/feature

# 方法三：创建分支时指定上游
$ git checkout -b feature origin/feature

# 查看所有分支的追踪关系和同步状态
$ git branch -vv
* master    8e3a2f1 [origin/master] Add login feature
  feature   3b7c1d0 [origin/feature: ahead 2, behind 1] Implement search
  hotfix    a1b2c3d Fix critical bug

# git status 也会显示追踪状态
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)

# 取消当前分支的上游设置
$ git branch --unset-upstream

# 取消指定分支的上游设置
$ git branch --unset-upstream feature

# 第一步：从你的 fork 克隆
$ git clone https://github.com/yourname/project.git
$ cd project

# 第二步：添加原项目为 upstream
$ git remote add upstream https://github.com/original/project.git

# 验证
$ git remote -v
origin    https://github.com/yourname/project.git (fetch)
origin    https://github.com/yourname/project.git (push)
upstream  https://github.com/original/project.git (fetch)
upstream  https://github.com/original/project.git (push)

# 1. 从 upstream 获取最新代码
$ git fetch upstream

# 2. 将本地 master 更新到 upstream/master
$ git checkout master
$ git merge upstream/master
# 或使用 rebase 保持线性历史
$ git rebase upstream/master

# 3. 创建功能分支开发
$ git checkout -b feature-branch

# 4. 开发完成后推送到 origin（你的 fork）
$ git push -u origin feature-branch

# 5. 在 GitHub 上从 origin/feature-branch 向 upstream/master 发起 Pull Request

# 6. PR 被合并后，同步 upstream 并更新 origin
$ git fetch upstream
$ git checkout master
$ git merge upstream/master
$ git push origin master

# 7. 清理已合并的功能分支
$ git branch -d feature-branch
$ git push origin --delete feature-branch

# 方法一：merge（保留完整历史）
$ git fetch upstream
$ git checkout master
$ git merge upstream/master
$ git push origin master

# 方法二：rebase（保持线性历史，推荐）
$ git fetch upstream
$ git checkout master
$ git rebase upstream/master
$ git push origin master

# 方法三：直接重置到 upstream（慎用，会丢失 fork 上的独有提交）
$ git fetch upstream
$ git checkout master
$ git reset --hard upstream/master
$ git push origin master --force

# 查看所有远程分支
$ git branch -r
  origin/master
  origin/feature
  upstream/master
  upstream/develop

# 比较不同 remote 的同一分支
$ git diff origin/master upstream/master

# 从 upstream 的特定分支创建本地分支
$ git checkout -b local-develop upstream/develop

# 远程仓库管理
git remote -v                          # 查看所有远程仓库
git remote add <name> <url>            # 添加远程仓库
git remote remove <name>               # 删除远程仓库
git remote set-url <name> <new-url>    # 修改远程仓库 URL

# 同步操作
git fetch <remote>                     # 下载远程数据（安全，不修改工作区）
git pull                               # fetch + merge（可能产生合并提交）
git pull --rebase                      # fetch + rebase（保持线性历史）
git push <remote> <branch>             # 推送本地提交到远程
git push --force-with-lease            # 安全的强制推送

# 追踪关系
git branch -u <remote>/<branch>        # 设置上游分支
git branch -vv                         # 查看追踪关系和同步状态
git push -u origin <branch>            # 推送并设置上游