fix command name in ack
use checkout locally as default
add git diff
Merge remote-tracking branch 'murata/master'