{"id":18729301,"url":"https://github.com/hantrungkien/gitflow","last_synced_at":"2025-11-12T06:30:18.909Z","repository":{"id":204149970,"uuid":"319002342","full_name":"hantrungkien/GitFlow","owner":"hantrungkien","description":"GitFlow - to keeps linear or semi-linear git history cleaner and more readable.","archived":false,"fork":false,"pushed_at":"2021-09-27T02:57:12.000Z","size":5,"stargazers_count":3,"open_issues_count":0,"forks_count":0,"subscribers_count":2,"default_branch":"main","last_synced_at":"2024-12-28T14:33:52.058Z","etag":null,"topics":["git","git-linear-history","git-semi-linear-history","gitflow"],"latest_commit_sha":null,"homepage":"","language":null,"has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":null,"status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/hantrungkien.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":null,"code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null}},"created_at":"2020-12-06T10:06:44.000Z","updated_at":"2024-01-31T09:12:23.000Z","dependencies_parsed_at":null,"dependency_job_id":"a4830e3e-d87b-4210-a73b-efb147f943ca","html_url":"https://github.com/hantrungkien/GitFlow","commit_stats":null,"previous_names":["hantrungkien/gitflow"],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/hantrungkien%2FGitFlow","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/hantrungkien%2FGitFlow/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/hantrungkien%2FGitFlow/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/hantrungkien%2FGitFlow/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/hantrungkien","download_url":"https://codeload.github.com/hantrungkien/GitFlow/tar.gz/refs/heads/main","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":239599041,"owners_count":19665911,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["git","git-linear-history","git-semi-linear-history","gitflow"],"created_at":"2024-11-07T14:26:37.975Z","updated_at":"2025-11-12T06:30:18.871Z","avatar_url":"https://github.com/hantrungkien.png","language":null,"readme":"# GitFlow - to keeps linear or semi-linear git history cleaner and more readable.\n\n### https://dev.to/scottshipp/war-of-the-git-flows-3ec2\n### https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow\n\n* init\n\n```\n$ git init\n$ git add .\n$ git commit -m \"init with README.md\"\n...\n$ git commit --amend -m \"change last commit message\"\n```\n\n* create develop branch\n\n```\n$ git checkout -b develop master\n$ git push --set-upstream origin develop\n```\n\n* create feature branch\n\n```\n$ git checkout -b feature/[feature_name] develop\n$ git add .\n$ git commit -m \"[feature_name] message \"\n$ git push --set-upstream origin feature/[feature_name]\n...\n$ git pull --rebase\n...\n$ git rebase develop\n...\n$ git rebase -i HEAD~4 (last 4 commits)\n$ git push --force-with-lease origin\n```\n\n* stash\n\n```\n$ git stash save\n$ git stash list (-p to show all changes)\n$ git stash show [stash_id]\n$ git stash apply [stash_id]\n$ git stash clear\n```\n\n* merge feature into develop\n\n```\n$ git checkout develop\n$ git merge --no-ff feature/[feature_name] (semi-linear history)\n$ git merge --ff-only feature/[feature_name] (linear history)\n```\n\n* create release branch\n\n```\n$ git checkout -b release/[version] develop\n$ git tag [version]\n```\n\n* create hotfix branch\n\n```\n$ git checkout -b hotfix/[version] master\n$ git tag [version]+1 (ex. 1.0.0+1)\n```\n\n* merge release/hotfix into master/develop\n\n```\n$ git checkout master\n$ git merge --ff-only [release/[version] | hotfix/[version]]\n$ git push origin --tag\n```\n\n```\n$ git checkout develop\n$ git merge --no-ff [release/[version] | hotfix/[version]] (semi-linear history)\n$ git merge --ff-only [release/[version] | hotfix/[version]] (linear history)\n```\n\n","funding_links":[],"categories":[],"sub_categories":[],"project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fhantrungkien%2Fgitflow","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fhantrungkien%2Fgitflow","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fhantrungkien%2Fgitflow/lists"}