From 799c7633d8fb5eb4774c0780a3ab3290c68cf413 Mon Sep 17 00:00:00 2001
From: Toshiyuki Kawanishi <toshi.kawanishi@gmail.com>
Date: Thu, 18 Nov 2010 10:44:16 -0800
Subject: [PATCH]

---
 git-now | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 git-now

diff --git a/git-now b/git-now
new file mode 100644
index 0000000..5efa24f
--- /dev/null
+++ b/git-now
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+PREFIX="from now"
+MESSAGE="[${PREFIX}] `date`"
+
+if [ $# -eq 0 ]
+then
+    git commit -a -m "${MESSAGE}"
+elif [ $1 != "--rebase" ]
+then
+    git add $@
+    git commit -m "${MESSAGE}"
+else
+    FIRST_NOW_COMMIT=`git log --pretty=oneline | grep "${PREFIX}" | tail -n 1 | cut -d " " -f 1`
+    INITIAL_COMMIT=`git log --pretty=oneline | tail -n 1 | cut -d " " -f 1`
+
+    if [ ${FIRST_NOW_COMMIT} != ${INITIAL_COMMIT} ]
+    then
+	git rebase -i ${FIRST_NOW_COMMIT}^
+    else
+        WORKING_BRANCH=`git branch -l | grep "*" | cut -d " " -f 2`
+
+	git checkout ${FIRST_NOW_COMMIT}
+	git commit --amend
+	git rebase --onto HEAD ${FIRST_NOW_COMMIT} ${WORKING_BRANCH}
+    fi
+fi