diff --git a/git-fixup b/git-fixup
new file mode 100755
index 0000000..90c5c37
--- /dev/null
+++ b/git-fixup
@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# From https://blog.filippo.io/git-fixup-amending-an-older-commit/
+
+set -e
+
+function usage() {
+  name=$(basename "$0")
+  echo "Usage: ${name} <commit-ish> [git commit arguments]" >&2
+  exit 1
+}
+
+[[ -z "$1" ]] && usage
+
+target=$(git rev-parse "$1")
+git commit --fixup="$target" "${@:2}"
+VISUAL=true EDITOR=true git rebase -i --autostash --autosquash "$target^"