utils-code/iwata.git-now
1
0
Fork 0
mirror of https://github.com/iwata/git-now.git synced 2026-09-10 07:26:29 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/0.0.4.2' into develop

Browse source
This commit is contained in:
Motonori Iwata 2011-09-14 09:40:46 +09:00
parent f38a49bf71 c006ccbe4e
commit 190dfa4e39
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git-now-grep
View file

@ -1,5 +1,5 @@
usage() {
echo "usage: git now grep [--patch|-p] [--stat|-s] [--author|-a] [<base-branch>]"
echo "usage: git now grep [--patch|-p] [--stat|-s] [--mine|-m] [<base-branch>]"
}
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

8
git-now-rebase
View file

@ -1,5 +1,5 @@
usage() {
echo "usage: git now rebase [--author|-a] [<base-branch>]"
echo "usage: git now rebase [--mine|-m] [<base-branch>]"
#echo " git now rebase --push [<base-branch>]"
#echo " git now rebase --push --upstream <remote> [<base-branch>]"
#echo " git now rebase --push --remove <remote> [<base-branch>]"
@ -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' ''