version control - Can git do a diff between a repo file and an external (non-repo) file? -


i need diff between version of myfile in master~2, , copy of myfile exists outside repository (say d:\folder\myfile).

the wording in git-diff under --no-index says:

git diff --no-index [--options] [--] […]

this form compare given 2 paths on filesystem. can omit --no-index option when running command in working tree controlled git , at least 1 of paths points outside working tree

the wording "at least one" seems imply comparison can done between 1 repo file , 1 non-repo file, in practice: 

$ git diff master~2:myfile d:/folder/myfile   error: not access: 'master~2:myfile'  $ git diff master~2:myfile -- d:/folder/myfile   fatal: d:/folder/myfile: 'd:/folder/myfile' outside repository    $ git diff --no-index master~2:myfile -- d:/folder/myfile   usage: git diff --no-index <path> <path>

what easiest way achieve comparison?

without using git-diff, found indirect way of achieving - method given in this blog post, using external file original "current file", , making sure have repo directory current-directory before doing git show.

the steps involved are:

  1. open external non-repo file in vim usual way
  2. do :vsp new vertically split new (blank) window
  3. :cd working directory of git repository
  4. :read !git show master~2:myfile read contents of myfile 2 commits ago
  5. setf yourfiletypehere syntax highlighting (optional)
  6. :diffthis in 1 window, switch other window , run :diffthis again, , have diff

Comments

Post a Comment

Popular posts from this blog

javascript - Bootstrap Popover: iOS Safari strange behaviour -

i looking through twitter bootstrap documentation, , i'm interested in implementing dismissible popover when button clicked. here example bootstrap's docs: http://getbootstrap.com/javascript/#dismiss-on-next-click when press "dismissible popover" button os x safari browser works fine. when access same link above ios safari, button not work. is, popover not dismissed on click. why button not working ios safari? the example linked using data-trigger="focus" attribute. try changing data-trigger="click" . <a tabindex="0" class="btn btn-lg btn-danger" role="button" data-toggle="popover" data-trigger="click" title="dismissible popover" data-content="and here's amazing content. it's engaging. right?">dismissible popover</a>
Read more

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

spring cloud - How to configure SpringCloud Eureka instance to point to https on non standard port -

i using spring boot/cloud actuator, , annotate application class @enableeurekaclient, applications comes , registers correctly eureka server. however, because configure application run on https, , on port 8444, eureka instance not registered correct protocol, instead using http. example http://localhost:8761/eureka/apps/ gives me <homepageurl>http://localhost:8444/</homepageurl> <statuspageurl>http://localhost:8444/info</statuspageurl> <healthcheckurl>http://localhost:8444/health</healthcheckurl> there no such thing securehomepageurl or securestatuspageurl - securehealthcheckurl exists. check com.netflix.appinfo.eurekainstanceconfig properties transmitted server when eureka client registers. however, having home/status/health page urls not showing https protocol doesn't mean instance isn't registered. matters whether or not secure port enabled. check following properties in client configuration: eureka.instance.se...
Read more