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

python - Setting ctypes.Structure default values -

-
this doesn't work: class ifinfomsg(ctypes.structure): _fields_ = [ ('ifi_family', ctypes.c_ubyte), ('__ifi_pad', ctypes.c_ubyte), ('ifi_type', ctypes.c_ushort), ('ifi_index', ctypes.c_int), ('ifi_flags', ctypes.c_uint), ('ifi_change', ctypes.c_uint(0xffffffff)) ] it errors with: file "rtnetlink.py", line 243, in <module> class ifinfomsg(ctypes.structure): typeerror: error when calling metaclass bases second item in _fields_ tuple (index 5) must c type however can set values in __init__() : class ifinfomsg(ctypes.structure): _fields_ = [ ('ifi_family', ctypes.c_ubyte), ('__ifi_pad', ctypes.c_ubyte), ('ifi_type', ctypes.c_ushort), ('ifi_index', ctypes.c_int)...
Read more

javascript - Hide toolbar of pdf file opened inside iframe using firefox -

-
other browsers such chrome,ie working fine when given #toolbar=0.but not working in firefox. please help. this code. <html> <body> <iframe src="reports/reports.pdf#toolbar=0" width="100%;" height="80%"> </iframe> </html> i think it's dependent on application/plugin in browser opens pdf, works differently , might ignore there directives (depending on browser, plugin, platform, pdf viewer). the general recommendation here use these "directives" @ end of url: #toolbar=0&navpanes=0 you may try recommendations http://blogs.adobe.com/pdfdevjunkie/web_designers_guide : embedding using pdfobject you use basic html markup embed pdf files in page there more elegant solution out there. take @ pdfobject philip hutchison. pdfobject pretty easy scripting tool dynamically embedding pdf files web pages. uses javascript inject element dom tree of html file. there’s...
Read more

Ansible - ERROR! the field 'hosts' is required but was not set -

-
i've error when launch playbook don't found why.... error! field 'hosts' required not set there main.yml : --- - hosts: hosts - vars: - elasticsearch_java_home: /usr/lib/jmv/jre-1.7.0 - elasticsearch_http_port: 8443 - tasks: - include: tasks/main.yml - handlers: - include: handlers/main.yml and /etc/ansible/hosts : [hosts] 10.23.108.182 10.23.108.183 10.23.108.184 10.23.108.185 when test ping, : [root@poste08-08-00 elasticsearch]# ansible hosts -m ping 10.23.108.183 | success => { "changed": false, "ping": "pong" } 10.23.108.182 | success => { "changed": false, "ping": "pong" } 10.23.108.185 | success => { "changed": false, "ping": "pong" } 10.23.108.184 | success => { "changed": false, "ping": "pong" } please, me :) regards, you have syntax error in playbook. ...
Read more