Git: how to compare to changesets without comitting them? -


given have code generation tool updates files in our working dir. run tool 2 different parameters , want understand difference brings. possible git somehow?

something has worked me like:

# make change git diff > first-try.patch  # make different change git diff > second-try.patch  interdiff first-try.patch second-try.patch

the interdiff shows diff of diffs, useful. typically need patchutils installed on linux machine interdiff.

the other choice be:

# make change git commit -m "first try" # make note of commit id... call commit1  # restore tree git reset --hard head^ # make second change git commit -m "second try"  git diff commit1 head  # go original starting point. git reset --hard head^

i idea less, since can screw things if make mistake. it's easier in other ways (doesn't require interdiff, instance). note: might think can reference commit1 since back-pedaled, that's not true. git leave object around , clean later, long it's not being used after period of time.


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 - .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

Website Login Issue developed in magento -

i have website developed using magento . able login. right now, login failed. infact operations interacts user table failing. need know issue. how figure out? first clear try clear log file second make sure have not upgraded magento and 3rd make sure db accessible in magento -harry p
Read more