2016-08-15 30 views
0

我的git樹結構:是否有可能在過去推送提交樹中插入新提交?

* f7b1232 (HEAD -> feature/users-model, origin/feature/users-model) hi 
* e4b0e22 (origin/develop, origin/HEAD, feature/posts, develop) Merge pull request #7 f 
rom rightx2/feature/users 
|\ 
| * 19c42fa (origin/feature/users) Merge pull request #6 from rightx2/feature/users-view 
| |\ 
| | * 68e6ffb (origin/feature/users-view) Implement simple message showing mechanism 
| | * 211530b Import secret infos from environ variable 
| | * a1eebb5 Add login,signup FB link 
| | * f41a915 Rule out chacha_dabang from Makefile 'migrate' 
| | * 7dc6ba8 Python-Social-Auth : Facebook 
| | * e8530c6 Implement logout mechanism 
| | * b726d24 Showing user info in header.html 
| | * c0b8977 Implement login mechanism 
| | * 2d9c8e7 Implement Signup mechanism 
| | * 48b74ee Create home view 
| | * 0cbea91 Install django-pipeline for managing static files 
| | * 187caca Apply static files using load staticfiles 
| | * 2ac64bb Remove chacha_dabang from INSTALLED_APPS 
| | * 7d6b4ba Create skeleton html 
| | * 60e6b15 Create SignupView : render to simple 'signup' text showing page 
| |/ 
| * 9b52f89 Merge pull request #5 from rightx2/feature/users-model 
| |\ 
|//
| * 193bf39 Update Makefile : add 'users' in makemigrations 
| * 8ece4a4 Create User model inheriting AbstractUser 
| * 1ae6a56 Init apps : users 
|/ 
* 4ec18e7 Merge pull request #3 from rightx2/feature/init 
|\ 
| * 96d6b8c (origin/feature/init) Teporarily remove travis 
| * c5c9e57 Update requirements(dev) : selenium 
| * 2c8f6ee Install Travis in slack 
| * 75c8ccb Init travis.yml 
| * 54fa188 Create Makefile : migrate 
| * d211af7 Add chacha_dabnag in INSTALLED_APPS 
| * 3e5601d Install debug_toolbar and django_extension 
| * d2a8780 Scaffold settings 
| * 2d63194 Update .gitignore : database files 
| * 2bfc7c5 Init project : chacha_dabang 
| * 4466f58 Init : requirements 
|/ 
* e3a8499 (origin/master, master) Initial commit 

目前,我在f7b1232,我意識到,我需要在origin/feature/init分支(75c8ccb2c8f6ee之間的某處)添加一些更多的提交。但這個分支已經被推入github併合併到其他分支。有沒有辦法做到這一點?

+0

你是什麼意思添加更多的提交? – Bhargav

+0

@Bhargav類似的東西..假設我錯過了在'feature/init'分支中實現一些東西(與'init'階段相關)。所以我想要做的就是像'git rebase -i ~~~'並且添加更多提交等。 – user3595632

+0

嗯..你知道功能/ init只是一個分支,並且與你的建築物的軟件沒有關係。 – Bhargav

回答

0

你可以使用rebase來操作樹。詳情請看git-scp page。基本上你可以運行git rebase --interactive SHA並選擇編輯提交。您也可以重新訂購提交,重新填寫它們並立即打壁球。最後運行git rebase --continue移回HEAD。

請記住,在主分支和其他人使用的分支上操作樹並不是一個好方法。您應該在頂部添加提交,並描述爲什麼需要它。

相關問題