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

javascript - After add transform scale, I can't set the section to center -

-
if don't use javascript listen event of resize. method center div? the css structure contain 3 state. normal , under 900px, under 550px. when width on 550px. can set section center. when screen under 550px. used scale reduce size , unable set center. i tried change position fixed/relative, left/ float/transform-origin/translatex/use vw/margin/padding... must use javascript listen window resize , change left property css of section? my website on http://php-kkhchan.rhcloud.com css: @media screen , (max-width: 900px) { .box { width: 520px; height: 650px; } #tabs { width:520px ; height: 650px; position: static; margin: 0 auto; padding-top: 1em; } } @media screen , (max-width: 550px) { #tabs, .box { transform: scale(0.6,0.6); left: -14%; position: relative; } } html: <section id="tabs"> <article class="c_tab box" id="tab0...
Read more