github - Git Squash all commits in origin/master into single commit within origin/master -


i playing around git repository , made quite number of commits earlier on master branch. realised bit noisy, , merge of single commit.

102381 commit z .... 176232 commit 891273 initial commit

to simply

198273 initial commit (after rebase) 891273 initial commit

i have looked around , many of solutions seems around squashing. unfortunately might possible given on master branch already.

one of initial thoughts

  1. create new branch commit #891273
  2. squash master new branch
  3. delete old master, , replace new branch

i not sure if might way it; thought wiser ideas, guidance , discussions it.

find easy way achieve requirement:

  1. git checkout –b branch1. create new branch commit #891273,

  2. git rebase –i master

  3. waiting editor input (type i start input):

    pick 176232 commit a

    squash ****** commit b

    ......

    squash 102381 commit z

note: type ‘esc’ button stop input

  1. input :wq exit editor, find want

note: when squashing commit z, may have conflict. need fix conflicted file, , use git add filename, git rebase --continue continue squashing

reference： https://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit


Comments

Post a Comment

Popular posts from this blog

php - How to add and update images or image url in Volusion using Volusion API -

actually have store importing products store product data insert , update image or image url not insert , update. this xml code name datapro.txt. <products_joined> <productcode>3710_012t</productcode> <vendor_partno>eah5450silent/di/1gd3(lp)</vendor_partno> <productname>test product ta</productname> <hideproduct>n</hideproduct> <stockstatus>20</stockstatus> <lastmodified>1/5/2016 10:25:00 am</lastmodified> <lastmodby>2</lastmodby> <productweight>0.9</productweight> <productprice>100</productprice> <productmanufacturer>asus tek</productmanufacturer> <vendor_price>32.69</vendor_price> <numproductssharingstock>0</numproductssharingstock> <categoryids>107</categoryids> <producturl>http://tebkq.mvlce.servertrust.com/productdetails.asp?productcode=3710_012t</producturl>
Read more

javascript - IE9 error '$'is not defined -

Image
<!--[if lte ie 9]><html class="lte9"><![endif]--><!--[if gt ie 9]><html><![endif]--> <!--[if !ie]><!--> <html> <!--<![endif]--> blah blah <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.1/jquery.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> <script src="{{ asset('js/mypage.js') }}" type="text/javascript"></script> </body> </html> when load page, ie9 brings error '$' not defined . how can solve error? +++ mypage.js $(function(){ //when load page, //ie9 tag not moving. $(window).load(function() { $('div.mask').hide(); }); // when click , willshow show. //for not ie 9 if (!$('html').hasclass('lte9')) { var = $('ul.about > li > span.activebtn');
Read more