Skip to main content

Posts

I saw how to do this on but the information was out of date. Download and install diffmerge. I used this link:  DiffMerge . Verify you can run it from the command line: Run the following commands from the git command line git config --global diff.tool diffmerge git config --global difftool.diffmerge.cmd 'sgdm "$LOCAL" "$REMOTE"' git config --global merge.tool diffmerge git config --global mergetool.diffmerge.cmd 'sgdm --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"' git config --global mergetool.diffmerge.trustExitCode true Now use the standard git commands for launching diffs and merges git difftool filename.ext git difftool branchname filename.ext git mergetool Note:  I had to perform these steps twice.  Once running the git command line under admin and once under user.  ...

Does ticketmaster have a corner on the market?

I recently bought tickets using ticketmaster.  It wasn't my first time I have used ticketmaster.  I was just taken back that 20% of my payment was going to them.  How can I avoid paying this extra fee?  Well I looked around and short of going to the box office, I couldn't. What am I missing? Any ideas?

China to ban online impersonation accounts, enforce real-name registration | Reuters

I can't comprehend this.  I grew up in a red state so most liberal ideas are hard for me to relate to but this stuff blows my mind. We are not perfect.  Our government spies on us, tortures prisoners and etc but when it comes to light scape-goats are found and government has to regroup and find other ways to meet their ends.  In other countries, you just have to take it and take it. Today, I remember how proud and thankful I was born in America. China to ban online impersonation accounts, enforce real-name registration | Reuters : 'via Blog this'

Larry Page Lays Out His Plan for Your Future | Wired Business | Wired.com

Larry Page Lays Out His Plan for Your Future | Wired Business | Wired.com : " “Most people think companies are basically evil. They get a bad rap. And I think that’s somewhat correct,” Page said. “Companies are doing the same incremental thing that they did 50 years ago, 20 years ago. That’s not really what we need. Especially in technology, we need revolutionary change, not incremental change. ”" I agree with this wholeheartedly. gilstrac

Tools for Efficient use of my computer

This list should be based on how you use it. I am not going to go into coding, email or the rest.  I am covering some gaps I have noticed in my day to day use. I will lean toward cloud based storage, open source and cross platform tools but since these are gaps good choices may not be available. High end notepad Process Manager Maco Tool Regular Expression tester Clipboard Manager I will cover each or these in turn in following posts.