Skip to content

Instantly share code, notes, and snippets.

@toshi-kawanishi
Created November 18, 2010 18:44
Show Gist options
  • Save toshi-kawanishi/705408 to your computer and use it in GitHub Desktop.
Save toshi-kawanishi/705408 to your computer and use it in GitHub Desktop.
making convenient git commit
#!/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 != "--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
;;; git-now.el - Call "git now" command
(provide 'git-now)
(defun now ()
(interactive)
(call-process "git" nil "*git now*" nil "now")
(pop-to-buffer "*git now*" t nil)
(other-window -1)
(message "git now!"))
#!/bin/sh
PREFIX="from now"
if [ ! "`git log --pretty=oneline $3 | head -n 1 | grep "${PREFIX}"`" ]
then
exit 0
else
echo "error: There are tmp log messages in the received objects." 1>&2
echo "error: Change these messages by 'git now --rebase'." 1>&2
exit 1
fi
@toshi-kawanishi
Copy link
Author

This is initial git-now codes. Current codes are moved to https://github.com/toshi-kawanishi/git-now .

このコードは git-now のはじめのコードです。最新のコードはこちら => https://github.com/toshi-kawanishi/git-now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment