Learning Git Branching

最新推荐文章于 2025-06-22 21:28:40 发布

转载最新推荐文章于 2025-06-22 21:28:40 发布 · 707 阅读

5 ·

CC 4.0 BY-SA版权

原文链接：http://www.cnblogs.com/hugeng007/p/9523436.html

文章标签：

#git

本文详细介绍Git中分支的创建、切换、合并及Rebase等核心操作，包括bugFix分支的使用、交互式Rebase、标签应用、描述使用、多级Rebase、双亲节点处理及复杂分支纠缠情况的解决策略。

Learning Git Branches

Transmission

Level intro2

Git Branch

git checkout -b bugFix

Level intro3

Git Merge

git checkout -b bugFix
git commit
git checkout master
git commit
git merge bugFix

Level Intro4

Get Rebase

git checkout -b bugFix
git commit
git checkout master
git commit
git checkout bugFix
git rebase master

Level rampup1

Head

git checkout C4

level rampup2

level rampup3

Relative reference2(~)

level rampup4

Git:undo

git branch -f local HEAD~1
git checkout pushed
git revert pushed

level rampup5

Git Cherry-pick

git cherry-pick C3 C4 C7

level rampup6

Git Interactive rebase

git rebase -i HEAD~4
pick C2
exchange C4 and C5

Level mixed1

Take only one submission record

git rebase -i HEAD~3
pick C2
pick C3
git branch -f master HEAD

Level mixed2

submission skill #1

git rebase -i HEAD~2
git rebase -i HEAD~1
git rebase -i HEAD~2
git branch -f master HEAD

Level mixed3

submission skills #2

git checkout master
git cherry-pick C2
git reset C2
git checkout caption
git rebase -i HEAD~2
git branch -f master HEAD

Level mixed4

Git Tag

git tag v1 C2
git tag v0 C1
git checkout C2

Level mixed5

Git Describe

git commit

Level advanced1

Git multiple rebase

git checkout bugFix
git rebase bugFix
git rebase master
git checkout side
git rebase bugFix
git checkout another
git rebase side
git branch -f master C7'

Level advanced2

two parent nodes

git branch bugFix C2

Level advanced3

Git Entangled branches

show solution

The Reference

TransmissionGate_Git main operation detailed usage

The Unknown Word

The First Column	The Second Column
entangled	[in'tangld]纠缠不清的
cherry-pick	最佳选择
checkout	检验
bugFix	修复bug
interactive	交互的
cherry-pick	最佳选择
-d	--delete
-D	--delete --force
-f	--force
-m	--move
-M	--move --force
-r	--remove
-a	--all
-i	interactive
merge	融入
git commit --amend	修改最后一次提交
promotional email	促销邮件
promotinoal	[pre'moutional]增进的，促销的