git merge --no-commit --no-ff <otherbranch>
git diff --name-status
javascript:amznJQ.jQuery('body').bind('keyup',function(e){var p=amznMusic.widgets.player,k=amznJQ.jQuery.ui.keyCode;switch(e.which){case k.SPACE: p.playHash('togglePlay'); break; case k.LEFT: p.playHash('previous'); break; case k.RIGHT: p.playHash('next'); break;}}); | |
javascript:$(document).on('click','div.mediaPhoto',function(){var%20href=$(this).find('div.iImage').css('backgroundImage');href='https://images.google.com/searchbyimage?image_url='+encodeURIComponent(href.substring(4,href.length-1));window.open(href,'_blank');}); |
// **** | |
// Because I spent all week writing javascript, then I saw this: | |
// https://instagram.com/p/4DJNNbR5_P/ | |
// and needed to automate it, like so: | |
// > getNumber("Wolfgang Mozart") | |
// returns: "Your name is not a prime number: Wolfgang Mozart (178)." | |
// **** | |
var getNumber = function getNumber(nameString) { | |
var arr = nameString.toLowerCase().split(''); | |
var key = " abcdefghijklmnopqrstuvwxyz".split(''); |
An extension for Google Chrome that lets you look up words on Wordnik. | |
It's outdated—the manifest version is 1 when it should be 2—but it may work for you if you | |
• download the files | |
• go to chrome://extensions | |
• check "Developer Mode" | |
• "Load unpacked extension..." | |
The .zip file contains the following files: | |
- manifest.json | |
- background.html |
javascript:document.querySelector('div.Nags').remove(); |
#!/bin/sh | |
# Error out if anything fails. | |
set -e | |
# Make sure script is run as root. | |
if [ "$(id -u)" != "0" ]; then | |
echo "Must be run as root with sudo! Try: sudo ./install.sh" | |
exit 1 | |
fi |
<!DOCTYPE html> | |
<html> | |
<head> | |
<!-- This is a template for a landing page! | |
✓ Fill in the things between the {{double braces}}, removing the {{ and }} in the process. | |
✓ Make a logo image for the <img> tag, and take note of its width and height. | |
✓ Make a sharing image for the OpenGraph/Facebook/Twitter <meta> tags (square, 1200x1200px). | |
✓ Tweak CSS as necessary. | |
✓ Rename this file to index.html and upload it and the two images to the web root directory on your server. | |
✓ Remove this comment when done. --> |
sudo killall -9 coreaudiod
Instead of php -S localhost:8000
use php -S 0.0.0.0:8000
and you'll be able to see the server from http://<your IP address>:8000
.
<!DOCTYPE html> | |
<html> | |
<head> | |
<meta charset="utf-8"> | |
<title>timecode calculator</title> | |
<meta name="description" content=""> | |
<meta name="viewport" content="width=device-width, initial-scale=1"> | |
<style> | |
input { | |
font-size: 54px; |