git merge - git - exclude commits when rebasing -


i have merged feature not ready go master. without realizing rebased bad master branch good.

but not sure how pull bad commits out of other story.

here git log file 

commit 15bb0d630f9b9cf59axxxxxxx8100d3a7302 author: moises zaragoza <mzaragoza@xxxx.com> date:   mon jun 1 11:45:31 2015 -0400      updates    commit 3caf183afe3f5d7dcfxxxxxxxa239d44c8dfd11a author: moises zaragoza <mzaragoza@xxxx.com> date:   mon jun 1 11:45:31 2015 -0400      updates   commit 3c6c81c7a3215fcdxxxxxxxb56a5540745c397 author: moises zaragoza <mzaragoza@xxxx.com> date:   wed jun 3 16:59:31 2015 -0400      bad commit should not here

if haven't pushed code yet, can interractive rebase , delete commits :

git rebase --interractive 3c6c81c7a3215fcdxxxxxxxb56a5540745c397^

you end editor commit history:

3c6c81c7a3215fcdxxxxxxxb56a5540745c397 bad commit should not here 3caf183afe3f5d7dcfxxxxxxxa239d44c8dfd11a updates  15bb0d630f9b9cf59axxxxxxx8100d3a7302 updates

if want delete commit 3c6c81c7a3215fcdxxxxxxxb56a5540745c397, delete line in interractive rebase , save:

3caf183afe3f5d7dcfxxxxxxxa239d44c8dfd11a updates  15bb0d630f9b9cf59axxxxxxx8100d3a7302 updates

see http://www.git-scm.com/book/en/v2/git-tools-rewriting-history


Comments

Post a Comment

Popular posts from this blog

Magento/PHP - Get phones on all members in a customer group -

i working on custom magento extension. working around adminhtml part , i've created custom form there. here form code: <?php class vivasindustries_smsnotification_block_adminhtml_sms_sendmass_edit_form extends mage_adminhtml_block_widget_form { public function _preparelayout() { $extensionpath = mage::getmoduledir('js', 'vivasindustries_smsnotification'); $head = $this->getlayout()->getblock('head'); $head->addjs('jquery.js'); $head->addjs('vivas.js'); return parent::_preparelayout(); } protected function _prepareform() { $form = new varien_data_form(array( 'id' => 'edit_form', 'action' => $this->geturl('*/*/save', array('id' => $this->getrequest()->get...
Read more

php - Bypass Geo Redirect for specific directories -

i'm trying bypass redirect specific url within site. wondering if might able help. the code below code use, original urls replaces example.com i'd able access http://example.com/admin without redirect occuring. is there way this, , there way using own ip? function country_geo_redirect() { $country = getenv('http_geoip_country_code'); if ($country == "us" ) { wp_redirect("http://usa.example.com/"); exit; } else if ($country == "gb" ) { wp_redirect("http://uk.example.com/"); exit; } } add_action('init', 'country_geo_redirect'); you can bypass redirection code if server found ip address. if ip address == <my ip address> ' nothing here else country_georedirect() end if
Read more

php - .htaccess mod_rewrite for dynamic url which has domain names -

i want convert url ex:( example.com/link.php?url=facebook.com ) ( example.com/facebook.com.php ) how can using .htaccess. or there other process make job easier ? i tried adding script .htaccess file options +followsymlinks rewriteengine on rewriterule url-(.*)\.htm$ link.php?url=$1 but converting url adding "url-" ( example.com/url-facebook.com.php ) i want remove "url-" , want make ( example.com/facebook.com.php ) rewriteengine on rewritecond %{the_request} ^get.*link\.php\?url\= [nc] rewritecond %{request_uri} !/system/.* [nc] rewriterule (.*?)link\.php\?url\=/*(.*) /$1$2 [r=301,ne,l] not sure how above work edit of used use remove index.php url
Read more