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.
| Subject: Thanks for signing up! | |
| Date: {{date}} | |
| To: {{recipient}} | |
| From: {{sender}} | |
| MIME-Version: 1.0 | |
| Content-Type: text/plain | |
| Thanks for signing up for the Foobar service! | |
| Your email address is: {{recipient}} |
| #!/bin/bash | |
| # | |
| # Example of how to parse short/long options with 'getopt' | |
| # | |
| OPTS=`getopt -o vhns: --long verbose,dry-run,help,stack-size: -n 'parse-options' -- "$@"` | |
| if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi | |
| echo "$OPTS" |
| <?php | |
| define('APP_PATH', dirname(__FILE__)); | |
| define('DATA_FILE', APP_PATH. '/sms.htdata'); | |
| if ($_SERVER['REQUEST_METHOD'] == 'POST') { //tasker提交 | |
| if (!isset($_POST['c'])) { | |
| die('Invalid Request!'); | |
| } else { | |
| $data = ''; | |
| if (file_exists(DATA_FILE)) { //读入已有数据 |
| // this is the background code... | |
| // listen for our browerAction to be clicked | |
| chrome.browserAction.onClicked.addListener(function (tab) { | |
| // for the current tab, inject the "inject.js" file & execute it | |
| chrome.tabs.executeScript(tab.ib, { | |
| file: 'inject.js' | |
| }); | |
| }); |
| #!/usr/bin/env python | |
| # encoding: utf-8 | |
| """ | |
| python_3_email_with_attachment.py | |
| Created by Robert Dempsey on 12/6/14. | |
| Copyright (c) 2014 Robert Dempsey. Use at your own peril. | |
| This script works with Python 3.x | |
| NOTE: replace values in ALL CAPS with your own values |
| <!DOCTYPE html> | |
| <html> | |
| <head> | |
| <title>tabs demo</title> | |
| <style type="text/css"> | |
| .tabs ul { | |
| list-style-type: none; | |
| margin: 0 2em; | |
| padding: 0; | |
| cursor: pointer; |
| # Backup | |
| docker exec CONTAINER /usr/bin/mysqldump -u root --password=root DATABASE > backup.sql | |
| # Restore | |
| cat backup.sql | docker exec -i CONTAINER /usr/bin/mysql -u root --password=root DATABASE | |
| # Defaults / Configuration options for homebridge | |
| # The following settings tells homebridge where to find the config.json file and where to persist the data (i.e. pairing and others) | |
| HOMEBRIDGE_OPTS=-U /var/lib/homebridge | |
| # If you uncomment the following line, homebridge will log more | |
| # You can display this via systemd's journalctl: journalctl -f -u homebridge | |
| # DEBUG=* |
Once in a while, you may need to cleanup resources (containers, volumes, images, networks) ...
// see: https://github.com/chadoe/docker-cleanup-volumes
$ docker volume rm $(docker volume ls -qf dangling=true)
$ docker volume ls -qf dangling=true | xargs -r docker volume rm