New Branch Switching Branches Basic Branching and Merging Basic Branching Basic Merging Basic Merge Conflicts Branch Management Changing a branch name Branching Workflows Long-Running Branches Basic Rebase More Interesting Rebases The Perils of Rebasing Rebase When You Rebase Rebase vs. Merge Summary Git on the Server The Protocols Local Protocol The HTTP Protocols The SSH Protocol Workflow The Role of Reset Reset With a Path Squashing Check It Out Summary Advanced Merging Merge Conflicts Undoing Merges Other Types of Merges Rerere Debugging with Git File Annotation Binary

New Branch Switching Branches Basic Branching and Merging Basic Branching Basic Merging Basic Merge Conflicts Branch Management Changing a branch name Branching Workflows Long-Running Branches Basic Rebase More Interesting Rebases The Perils of Rebasing Rebase When You Rebase Rebase vs. Merge Summary Git on the Server The Protocols Local Protocol The HTTP Protocols The SSH Protocol Workflow The Role of Reset Reset With a Path Squashing Check It Out Summary Advanced Merging Merge Conflicts Undoing Merges Other Types of Merges Rerere Debugging with Git File Annotation Binary

command — you use it to begin tracking new files, to stage files, and to do other things like marking merge-conflicted files as resolved. It may be helpful to think of it more as “add precisely this content little ASCII graph showing your branch and merge history: $ git log --pretty=format:"%h %s" --graph * 2d3acf9 Ignore errors from SIGCHLD on trap * 5e3ee11 Merge branch 'master' of https://github.com/dustin/grit e1193f8 Support for heads with slashes in them |/ * d6016bc Require time for xmlschema * 11d191e Merge branch 'defunkt' into local This type of output will become more interesting as we go through branching

$ git log --pretty=format:"%h %s" --graph * 2d3acf9 ignore errors from SIGCHLD on trap * 5e3ee11 Merge branch 'master' of git://github.com/dustin/grit |\ | * 420eac9 Added a method for getting the current e1193f8 support for heads with slashes in them |/ * d6016bc require time for xmlschema * 11d191e Merge branch 'defunkt' into local 这种输出类型会在我们下一章学完分支与合并以后变得更加有趣。 以上只是简单介绍了一些 git log 命令支持的选项。 git log 的常用选项 f6 Merge branch 'experiment' a6b4c97498bd301d84096da251c98a07c7723e65 beginning write support 0d52aaab4479697da7686c15f77a3d64d9165190 one more thing 6d52a271eda8725415634dd79daabbc4d9b6008e Merge branch

difftool git commit git reset git rm git mv git clean 分支与合并 git branch git checkout git merge git mergetool git log git stash git tag 项目分享与更新 git fetch git pull git push git remote git $ git log --pretty=format:"%h %s" --graph * 2d3acf9 ignore errors from SIGCHLD on trap * 5e3ee11 Merge branch 'master' of git://github.com/dustin/grit |\ | * 420eac9 Added a method for getting the current e1193f8 support for heads with slashes in them |/ * d6016bc require time for xmlschema * 11d191e Merge branch 'defunkt' into local 这种输出类型会在我们下一章学完分支与合并以后变得更加有趣。 以上只是简单介绍了一些 git log 命令支持的选项。 git log 的常用选项

CE Pull/Merge requests ✓ ✓ ✓ ✓ ✓ ✓ ✓ Squash merging ✓ ✘ ✓ ✓ ✓ ✓ ✓ Rebase merging ✓ ✓ ✓ ✘ ⁄ ✘ ✓ 评论 Pull/Merge request 中的某行 代码 ✓ ✘ ✓ ✓ ✓ ✓ ✓ 指定 Pull/Merge request 的审核人 ✓ ✘ ⁄ ✓ ✓ ✓ ✓ 解决 Merge 冲突 ✘ ✘ ✘ ✓ ✓ ✓ ✓ ✘ 限制某些用户的 push 和 merge 权 限 ✓ ✘ ✓ ⁄ ✓ ✓ ✓ 回退某些 commits 或 merge request ✓ ✘ ✓ ✓ ✓ ✓ ✘ Pull/Merge requests 对比 Gitea 与其它 Git 托管工具 - 11 - 本文档使用 书栈网 · BookStack.CN 构建 requests 模板 ✓ ✓ ✓ ✓ ✓ ✘ ✘ ✘ 查看 Cherry- picking 的更改 ✓ ✘ ✘ ✓ ✓ ✘ ✘ 下载 Patch ✓ ✘ ✓ ✓ ✓ / ✘ Merge queues ✘ ✘ ✓ ✘ ✓ ✘ ✘ 特性 Gitea Gogs GitHub EE GitLab CE GitLab EE BitBucket RhodeCode CE 支持 Webhook ✓ ✓ ✓ ✓ ✓ ✓ ✓ 自定义 Git

#强制删除分支（不能删除当前所处的分支） # git branch -d xxxxx #删除空的分支，删除已被合并的分支 # git merge yyy #将yyy分支合并到当前分支（当前为xxx），源为 yyy，目的为xxx # git branch --no-merged remotes/origin/bran3 remotes/origin/bran4 remotes/origin/main #管理员再决定是否合并分支 管理员电脑上：main分支# git merge remotes/rmtRepo/bran4 #将远程的 bran4合并到本地的main分支 管理员电脑上：main分支# git push -uf rmtRepo main 支 成员电脑上操作： # git fetch rmtRepo main #同步远程代码库（同步远程的main分支到 本地的当前分支） # git merge remotes/origin/main main #合并同步远程代码库的main分支到 本地的main分支 ★其他克隆操作 # git clone -b bran5