-
Notifications
You must be signed in to change notification settings - Fork 0
Home
==========================
git4f let you manage most common develop and integartion workflows with few aliases:
* git intbr <my integration br>
* git ftrbr-start <my topic br name>
* git ftrbr-integrate
* git ftrbr-integrate-rebase
* git ftrbr-push
* git ftrbr-push-rebase
* git ftrbr-update-merge
* git ftrbr-update-rebase
The most frequent usage is:
git clone my-repo && cd my-repo
git intbr master
git ftrbr-start
... edit ...commmit ...edit ...commit ...
git ftrbr-push
Please, discover other workflows at Workflows,
-
git intbr master
-> will set it -
git intbr
-> will get it -
git chk-intbr
-> shortcut to switch on it
-
checkout integration branch
-
pull integration branch so that feature branches will always start from integration branch HEAD
-
creates the topic branch
config opt: 4f.ftrbr-prefix can be provided to prefix branch names (i.e. for prepending "ftr/")
-
checkout integration branch
-
pull integration branch so that feature branches will always be merged on top of integration branch HEAD
-
Merges topic branch onto integration branch
config opt : 4f.ftrbr-push-merge-opt can be provided to add merge options with this operation (i.e. --no-ff)
-
Pushes integration branch new HEAD back to origin