diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..2df08c5
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,2 @@
+nnoremap <Space>gn :<C-u>w<CR>:Git now<CR>
+nnoremap <Space>gN :<C-u>w<CR>:Git now --all<CR>
\ No newline at end of file
diff --git a/git-now b/git-now
index 69e8cea..0eeef51 100644
--- a/git-now
+++ b/git-now
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREFIX="from now"
-MESSAGE="[${PREFIX}] `date`"
+MESSAGE="[${PREFIX}] `date +\"%Y/%m/%d %T\"`"
 
 if [ $# -eq 0 ]
 then
@@ -9,7 +9,13 @@ then
     printf "${MESSAGE}\n\n%s" "`git diff --cached`" | git commit -F -
 elif [ $1 != "--rebase" ]
 then
-    git add $@
+	if [ $1 != "--all" ]
+	then
+		git add $@
+	else
+		git add -u
+		git add .
+	fi
     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`