[英]How to point branch head in git to master?
如果我正確理解你的問題:
您想丟棄batter-icons
分支。 這很容易:
$ git branch -D batter-icons
你想變基ups-icons-support
在master~1
。 所以,這樣做:
$ git checkout ups-icons-support $ git rebase master~1
現在你有:
* ups-icons-support
master * |
\|
* master~1
如果您的目標是替換舊的 master 分支,您可以:
$ git checkout master
$ git reset --hard ups-icons-support
你需要做兩個任務:
您需要大寫的“d”,因為這些提交將丟失所有獲取它們的引用。
git branch -D batter-icons
這是通過 git rebase --onto 完成的
git checkout ups-icons-support
git rebase --onto master~1 HEAD~1 ups-icons-support
感謝您的回答,這是我如何做到的
git log --oneline --decorate --all --graph
* dd9bda6 (origin/batter-icons, batter-icons) на всякий * 16b9233 battery to primary * cb61d3a icons 1 | * 3824a5e (origin/ups-icons-support, ups-icons-support) XFCE-powemanager-UPS-icons | * 4c8ecae Reverted index.theme to original(as was after forking) |/ * 7ca1226 (HEAD, origin/master, origin/HEAD, master) 96 support * 66c295a folders and index for panel folder * c4ca2a7 1.3.1
* dd9bda6 (origin/batter-icons, batter-icons) на всякий * 16b9233 battery to primary * cb61d3a icons 1 | * 3824a5e (origin/ups-icons-support, ups-icons-support) XFCE-powemanager-UPS-icons | * 4c8ecae Reverted index.theme to original(as was after forking) |/ * 7ca1226 (HEAD, origin/master, origin/HEAD, master) 96 support * 66c295a folders and index for panel folder * c4ca2a7 1.3.1
git branch -D batter-icons
git branch -D --remote origin/batter-icons
git checkout ups-icons-support
git rebase --onto master~1 HEAD~1 ups-icons-support
git branch -D --remote origin/master origin/ups-icons-support
git rebase --onto master~2 HEAD~1 ups-icons-support
git log --oneline --decorate --all --graph
* c49c5e2 (ups-icons-support) XFCE-powemanager-UPS-icons | * 7ca1226 (HEAD, master) 96 support | * 66c295a folders and index for panel folder |/ * c4ca2a7 1.3.1
* c49c5e2 (ups-icons-support) XFCE-powemanager-UPS-icons | * 7ca1226 (HEAD, master) 96 support | * 66c295a folders and index for panel folder |/ * c4ca2a7 1.3.1
聲明:本站的技術帖子網頁,遵循CC BY-SA 4.0協議,如果您需要轉載,請注明本站網址或者原文地址。任何問題請咨詢:yoyou2525@163.com.