git - "Open with difftool" doesn't do anything -

-

i have file local changes. right-click , select "open difftool" git extensions , nothing happens. difftool opens fine other files. file not shown neither in commit window , in git status.

i had file marked --skip-worktree. fix, run following (mind case in filepath):

git update-index --no-skip-worktree <filepath>

git gui allows adding custom commands. have 1 command --skip-worktree , other revert change.


Comments

Post a Comment

Popular posts from this blog

c++ - list<myClass<int> * > sort -

-
i cannot sort list contains pointers objects of template class. template class node{ public: node(void){} node(t choice, vector<t> & data); node(t choice, vector<t> & data, player p, int level, int pos, node<t> *pred, side); void addnodes(void); static list<node<t> * > nodes; friend class mybinomialtree<node<t>, t>; bool sorter(const node<t> * lhs, const node<t> * rhs);// * &lhs doesn't work private: node<t> * left; node<t> * right; t chosen_; vector<t> data_; bool isleaf; //... }; outside class: template<class t> bool node<t>::sorter(const node<t> * lhs, const node<t> * rhs){ if((*lhs).level_==(*rhs).level_){ return (*lhs).pos_<(*rhs).pos_; }else{ return (*lhs).level_<(*rhs).level_; } } and want sort before print, have template<class t> void node<t>::print(void){ ...
Read more

SoapUI on windows 10 - high DPI/4K scaling issue -

-
Image
soapui doesn't seem dpi-aware , displays small on high dpi screen (tiny text , buttons). other applications running fine (screen resolution 3840 x 2160). version : soapui 5.1.2 os : windows 10 i have tried: configure soapui run "disable display scaling on high dpi settings" - parts of soapui looking bigger , don't display (image) changing resolution changing font size (preferences > editor settings > select font...) therefore assume, soapui pretends dpi-aware, not scale itself. have same issue? this workaround until developers round making version dpi-aware. step 1: add registry key hkey_local_machine\software\microsoft\windows\currentversion\sidebyside\preferexternalmanifest (dword) 1 step 2: add manifest file 'soapui-5.2.1.exe.manifest' in same directory 'soapui-5.2.1.exe' content of manifest file: <?xml version="1.0" encoding="utf-8" standalone="yes"?> <assembly xml...
Read more

java - why am i getting a "cannot resolve method" error on getApplication? -

-
i believe have code in order ive been toiling on error few hours now. im trying setup basic app framework using fragments. can code work if structure project activity based , put string data along block of code below in mainactivity, doesnt me try move them fragments. in mainactivity (where same block of code works without using fragments) placed in oncreate makes no difference if place there in fragment , read placing in oncreate not proper place. im new android development, if explain answer code example greatly. thank taking time look. my entire fragment below. public class basicspagefragment extends fragment { recyclerview recyclerview; private recycler_view_adapter adapter; public basicspagefragment() { // required empty public constructor } @override public void oncreate(bundle savedinstancestate) { } @override public view oncreateview(layoutinflater inflater, viewgroup container, bundle savedinstancestate) { // inflate layou...
Read more