From c006ccbe4e922756d630628ed7f2af61d7d45862 Mon Sep 17 00:00:00 2001 From: Motonori Iwata Date: Wed, 14 Sep 2011 09:40:19 +0900 Subject: [PATCH] rename author option to mine --- git-now-grep | 4 ++-- git-now-rebase | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/git-now-grep b/git-now-grep index 27de185..db8af70 100644 --- a/git-now-grep +++ b/git-now-grep @@ -1,5 +1,5 @@ usage() { - echo "usage: git now grep [--patch|-p] [--stat|-s] [--author|-a] []" + echo "usage: git now grep [--patch|-p] [--stat|-s] [--mine|-m] []" } cmd_default() { @@ -18,7 +18,7 @@ parse_args() { # parse options DEFINE_boolean 'patch' false 'generate diff in patch format' 'p' DEFINE_boolean 'stat' false 'generate diffstat instead of patch' 's' - DEFINE_boolean 'author' false 'limit git-now commits by your name' 'a' + DEFINE_boolean 'mine' false 'limit git-now commits by my name' 'm' FLAGS "$@" || exit $? eval set -- "${FLAGS_ARGV}" # read arguments into global variables diff --git a/git-now-rebase b/git-now-rebase index e3078eb..451b0f6 100644 --- a/git-now-rebase +++ b/git-now-rebase @@ -1,5 +1,5 @@ usage() { - echo "usage: git now rebase [--author|-a] []" + echo "usage: git now rebase [--mine|-m] []" #echo " git now rebase --push []" #echo " git now rebase --push --upstream []" #echo " git now rebase --push --remove []" @@ -14,7 +14,7 @@ cmd_default() { if [ -n "$BASE_BRANCH" ]; then COMMON_ANCESTOR_COMMIT=`git merge-base ${BASE_BRANCH} ${WORKING_BRANCH}` - if flag author; then + if flag mine; then FIRST_NOW_COMMIT=$(git_now_my_first_commit $COMMON_ANCESTOR_COMMIT) else FIRST_NOW_COMMIT=$(git_now_first_commit $COMMON_ANCESTOR_COMMIT) @@ -28,7 +28,7 @@ cmd_default() { git rebase --onto HEAD ${FIRST_NOW_COMMIT} ${WORKING_BRANCH} fi else - if flag author; then + if flag mine; then FIRST_NOW_COMMIT=$(git_now_my_first_commit) else FIRST_NOW_COMMIT=$(git_now_first_commit) @@ -62,7 +62,7 @@ cmd_help() { parse_args() { # parse options - DEFINE_boolean 'author' false 'limit git-now commits by your name' 'a' + DEFINE_boolean 'mine' false 'limit git-now commits by my name' 'm' #DEFINE_boolean 'push' false 'push to remote repository finally' '' #DEFINE_string 'remove' '' 'remote name to remove the remote branch before push' '' #DEFINE_string 'upstream' '' 'remote name for --set-upstream' ''