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

git-graft dest branch defaults to master

Browse source
This commit is contained in:
Tj Holowaychuk 2010-09-06 13:27:29 -07:00
parent 0147cc40b5
commit 8d4f55b048
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Readme.md
View file

@ -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

11
bin/git-graft
View file

@ -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
git checkout $dst \
&& git merge --no-ff $src \
&& git branch -d $src