diff --git a/Readme.md b/Readme.md index 8371924..448eb15 100644 --- a/Readme.md +++ b/Readme.md @@ -156,29 +156,30 @@ Outputs a repo summary: ... added '*.o' ... added '*.log' -## git delete-branch <name> +## git-delete-branch <name> Deletes local and remote branch _name_. $ git delete-branch integration -## git delete-tag <name> +## git-delete-tag <name> Deletes local and remote tag _name_. $ git delete-tag 0.0.1 -## git fresh-branch <name> +## git-fresh-branch <name> Creates empty local branch _name_. $ git fresh-branch docs -## git graft <from-branch> <to-branch> +## git-graft <src-branch> <dest-branch> - Merge commits _from-branch_ into _to-branch_, then branch-deletes _from-branch_. + Merge commits from _src-branch_ into _dest-branch_ which defaults to _master_. - $ git graft new_feature master + $ git graft new_feature dev + $ git graft new_feature ## git-changelog diff --git a/bin/git-graft b/bin/git-graft index 568766c..ad212f7 100755 --- a/bin/git-graft +++ b/bin/git-graft @@ -1,8 +1,9 @@ #!/bin/sh -test -z $1 && echo "foreign branch required." && exit 1 -test -z $2 && echo "merge branch required." && exit 1 +test -z $1 && echo "source branch required." && exit 1 +src=$1 +dst=${2-master} -git checkout $2 \ - && git merge --no-ff $1 \ - && git delete-branch $1 \ No newline at end of file +git checkout $dst \ + && git merge --no-ff $src \ + && git branch -d $src \ No newline at end of file