0

すべてのコミット履歴が 1 つのブランチの一部と見なされるように、git プロジェクトの履歴をマージするにはどうすればよいですか?

現在、私はこれを持っています:

* 465a83a Highlight search
* 37a367d Tab=3; AutosaveSession (Not using yet)
*   9f2559c Merge branch 'master' of github.com:shahverdy/.vim
|\  
| * 6bf7783 SaveSession was added.
| |\  
| | * 6cdd383 Some changes with path allocation
| | |\  
| | | * de535b2 Update README.md
| | | * cb78dae Update README.md
| | | * 6664428 Update README.md
| | | * b6f3869 Some extra modifications + README.ms
| | | * 0924e77 Oops! vimrc was not included in the last commit
| | | * c030172 sweeping away ...
| | | * d67280e bundle installer was added, some extaras was sweeped away
| | | * 10a669c Cursors fixed...
| | | * 9dfd01f Cursors was edited ...
| | | * 0b5d8aa Syntax for PHP and Javascript was added
| | | * dd5a21d A bug fixed
| | | * ad5b9f2 Syntax for PHP and Javascript was added
| | | * 99e5595 Fixed code folding+ search highlighting
| | | * 69c7f77 File Explorer fixed
| | | * ba5fbf7 .vimrc was added
| | * f875ee1 A totel reset
| * 9edf692 Update
* 9c71074 new plugins

そして、私はこれが欲しい:

* 465a83a Highlight search
* 37a367d Tab=3; AutosaveSession (Not using yet)
* 9f2559c Merge branch 'master' of github.com:shahverdy/.vim
* 6bf7783 SaveSession was added.
* 6cdd383 Some changes with path allocation
* de535b2 Update README.md
* cb78dae Update README.md
* 6664428 Update README.md
* b6f3869 Some extra modifications + README.ms
* 0924e77 Oops! vimrc was not included in the last commit
* c030172 sweeping away ...
* d67280e bundle installer was added, some extaras was sweeped away
* 10a669c Cursors fixed...
* 9dfd01f Cursors was edited ...
* 0b5d8aa Syntax for PHP and Javascript was added
* dd5a21d A bug fixed
* ad5b9f2 Syntax for PHP and Javascript was added
* 99e5595 Fixed code folding+ search highlighting
* 69c7f77 File Explorer fixed
* ba5fbf7 .vimrc was added
* f875ee1 A totel reset
* 9edf692 Update
* 9c71074 new plugins

編集

試してみgit rebaseましたが、出力は でしたがCurrent branch master is up to date.、履歴は以前のように表示されます。

ありがとう

4

1 に答える 1