OurBigBook.com $£ Sponsor 中国独裁统治 China Dictatorship 新疆改造中心、六四事件、法轮功、郝海东、709大抓捕、2015巴拿马文件邓家贵、低端人口、西藏骚乱

Git tips / Merge two or more commits into one

Before

7 my-feature HEAD
|
6
|
5 master
|
4
|
3
|
2
|
1

Oh, commit 6 was just a temporary step, should be put together with commit 7:

git rebase -i HEAD~2

Mark 6 to be squashed.

After:

67 my-feature HEAD
|
5 master
|
4
|
3
|
2
|
1

Better now, ready to push.

 Ancestors (12)