Merge remote branch 'drewr/master'

Author: jwiegley

git-apply-url

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Copyright (c) 2008 Andrew Raines
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+# Pastebin -> code.
+#
+#    git apply-url https://gist.github.com/raw/.../...53b5
+#    git apply-url http://paste.lisp.org/display/99999999/raw
+#    etc.
+
+URL=$1
+
+function error {
+  echo $*
+  exit 1
+}
+
+if [[ ! $URL ]]; then
+  error $0 URL
+fi
+
+if [[ -x $(which curl) && $(curl -V | grep https) ]]; then
+  fetch="curl -s"
+elif [[ -x $(which wget) ]]; then
+  fetch="wget -O - -q --no-check-certificate"
+else
+  error need curl or wget
+fi
+
+$fetch $URL | patch -p1

git-children-of

@@ -2,9 +2,9 @@
 
 commit=$1
 branch=$2
-if [[ -z "$branch" ]]; then
-    branch=HEAD
-fi
 
-git rev-list --children $branch --not $commit^@ | \
-    awk "/^$commit/ { print \$2 }"
+[ -z "$branch" ] && branch=HEAD
+
+git rev-list --children $branch --not $commit^@ \
+   | awk "/^$commit/ { print \$2 }"
+

git-push-home

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Assumes you have done:
+#
+#    git remote add backup your-other-host:r/home.git
+
+git push backup

git-save-file

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ $# != 2 ]; then
+  echo "save-file FILE MSG" >&2
+  exit 1
+fi
+
+FILE="$1"
+MSG="$2"
+
+git add -f "$FILE"
+git commit -m "$MSG"

git-save-home

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# If you keep your home directory version-controlled, you likely don't
+# want to version every single file.  Things like editor
+# configuration, notes files, and html are likely candidates, while
+# music, video, and random downloads are not.  In order to accommodate
+# this scenario, you can ignore everything like so:
+#
+#   $ more ~/.gitignore 
+#   *
+#
+# Then, force git-add to track files you care about.  Unfortunately
+# with git-add you have to add a -f every time the file is modified.
+# I don't understand why since git is already tracking the contents.
+
+MODIFIED=$(git status | grep modified | cut -d " " -f 3-)
+
+if [ "x$MODIFIED" == x ]; then
+  echo no changes
+else
+  git add -f $MODIFIED \
+    && git commit -q -m "Save home." \
+    && git diff --stat head^
+fi