-
-
Save bleis-tift/1324421 to your computer and use it in GitHub Desktop.
git-now
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
PREFIX="from now" | |
MESSAGE="[${PREFIX}] `date`" | |
if [ $# -eq 0 ] | |
then | |
git add -u | |
printf "${MESSAGE}\n\n%s" "`git diff --cached`" | git commit -F - | |
elif [ $1 == "--diff" ] | |
then | |
FIRST_NOW_COMMIT=`git log --pretty=oneline --grep="${PREFIX}" | tail -n 1 | cut -d " " -f 1` | |
git diff ${FIRST_NOW_COMMIT}^ | |
elif [ $1 == "--fixup" ] | |
then | |
FIRST_NOW_COMMIT=`git log --pretty=oneline --grep="${PREFIX}" | tail -n 1 | cut -d " " -f 1` | |
git reset ${FIRST_NOW_COMMIT} | |
git commit --amend -a | |
elif [ $1 != "--rebase" ] | |
then | |
git add $@ | |
printf "${MESSAGE}\n\n%s" "`git diff --cached`" | git commit -F - | |
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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
mzpのgit-nowからの変更