Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/hantrungkien/gitflow
GitFlow - to keeps linear or semi-linear git history cleaner and more readable.
https://github.com/hantrungkien/gitflow
git git-linear-history git-semi-linear-history gitflow
Last synced: 13 days ago
JSON representation
GitFlow - to keeps linear or semi-linear git history cleaner and more readable.
- Host: GitHub
- URL: https://github.com/hantrungkien/gitflow
- Owner: hantrungkien
- Created: 2020-12-06T10:06:44.000Z (about 4 years ago)
- Default Branch: main
- Last Pushed: 2021-09-27T02:57:12.000Z (over 3 years ago)
- Last Synced: 2024-11-07T14:30:23.664Z (2 months ago)
- Topics: git, git-linear-history, git-semi-linear-history, gitflow
- Homepage:
- Size: 4.88 KB
- Stars: 3
- Watchers: 2
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# GitFlow - to keeps linear or semi-linear git history cleaner and more readable.
### https://dev.to/scottshipp/war-of-the-git-flows-3ec2
### https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow
* init
```
$ git init
$ git add .
$ git commit -m "init with README.md"
...
$ git commit --amend -m "change last commit message"
```
* create develop branch
```
$ git checkout -b develop master
$ git push --set-upstream origin develop
```
* create feature branch
```
$ git checkout -b feature/[feature_name] develop
$ git add .
$ git commit -m "[feature_name] message "
$ git push --set-upstream origin feature/[feature_name]
...
$ git pull --rebase
...
$ git rebase develop
...
$ git rebase -i HEAD~4 (last 4 commits)
$ git push --force-with-lease origin
```
* stash
```
$ git stash save
$ git stash list (-p to show all changes)
$ git stash show [stash_id]
$ git stash apply [stash_id]
$ git stash clear
```
* merge feature into develop
```
$ git checkout develop
$ git merge --no-ff feature/[feature_name] (semi-linear history)
$ git merge --ff-only feature/[feature_name] (linear history)
```
* create release branch
```
$ git checkout -b release/[version] develop
$ git tag [version]
```
* create hotfix branch
```
$ git checkout -b hotfix/[version] master
$ git tag [version]+1 (ex. 1.0.0+1)
```
* merge release/hotfix into master/develop
```
$ git checkout master
$ git merge --ff-only [release/[version] | hotfix/[version]]
$ git push origin --tag
```
```
$ git checkout develop
$ git merge --no-ff [release/[version] | hotfix/[version]] (semi-linear history)
$ git merge --ff-only [release/[version] | hotfix/[version]] (linear history)
```