kirbysayshi

for f in $(find $1 -iname "*.wsp"); do 
    if [ -a $f ]; 
        then /opt/graphite/bin/whisper-set-aggregation-method.py $f max; 
    fi; 
done

bkeating

HOWTO: Using FileMerge (opendiff) with Git on OSX

FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.

The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.