{"id":13852654,"url":"https://github.com/felipec/git-reintegrate","last_synced_at":"2026-01-10T19:34:13.411Z","repository":{"id":11556259,"uuid":"14042294","full_name":"felipec/git-reintegrate","owner":"felipec","description":"Tool that allows the regeneration of integration branches","archived":false,"fork":false,"pushed_at":"2023-05-14T22:52:42.000Z","size":102,"stargazers_count":22,"open_issues_count":3,"forks_count":8,"subscribers_count":5,"default_branch":"master","last_synced_at":"2024-11-22T07:37:02.716Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":null,"language":"Shell","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/felipec.png","metadata":{"files":{"readme":"README.asciidoc","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}},"created_at":"2013-11-01T12:14:45.000Z","updated_at":"2023-07-13T06:03:12.000Z","dependencies_parsed_at":"2024-01-18T11:04:00.819Z","dependency_job_id":"5d23b304-a339-4ca5-9ceb-a807975d4df5","html_url":"https://github.com/felipec/git-reintegrate","commit_stats":null,"previous_names":[],"tags_count":4,"template":false,"template_full_name":null,"purl":"pkg:github/felipec/git-reintegrate","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/felipec%2Fgit-reintegrate","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/felipec%2Fgit-reintegrate/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/felipec%2Fgit-reintegrate/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/felipec%2Fgit-reintegrate/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/felipec","download_url":"https://codeload.github.com/felipec/git-reintegrate/tar.gz/refs/heads/master","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/felipec%2Fgit-reintegrate/sbom","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":265098887,"owners_count":23711217,"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":[],"created_at":"2024-08-04T22:01:30.598Z","updated_at":"2025-07-13T06:30:47.701Z","avatar_url":"https://github.com/felipec.png","language":"Shell","funding_links":[],"categories":["Shell"],"sub_categories":[],"readme":"= git-reintegrate =\n\nThis tool helps to manage integration branches.\n\nFor example, say you have a repository with three branches:\n\n * feature-a\n * feature-b\n * maint\n\nAnd you have an integration branch named 'integration' where you merge all\nthese branches on top of 'master'.\n\nYou can generate the instructions needed by `git reintegrate` with this\ncommand:\n\n------------\ngit reintegrate --generate integration master\n------------\n\nWhich would generate instructions like:\n\n------------\nbase master\nmerge feature-a\n\n Merge work in progress feature-a\n\nmerge feature-b\n\n Merge feature-b\n\nmerge maint\n\n Merge good stuff\n------------\n\nYou can edit the instructions with `git reintegrate --edit`.\n\nThe simplest way to begin an integration branch is with:\n\n------------\ngit reintegrate --create integration master\ngit reintegrate --add=branch1 --add=branch2 --add=branch3\n------------\n\nTo regenerate the integration branch run `git reintegrate --rebuild`, if there\nare merge conflicts, solve them and continue with `git reintegrate --continue`.\n\nYou probably want to configure `git rerere` so that each time you resolve a\nconflict it gets automatically stored, so the next time Git sees the conflict,\nit's resolved automatically:\n\n------------\ngit config --global rerere.enabled true\n------------\n\n== Installation ==\n\nSimply copy the script anywhere in your '$PATH' and make it executable, or run\n`make install` which will install it by default to your '~/bin/' directory\n(make sure it's in your '$PATH').\n\n== Acknowledgements ==\n\nThis is a rewrite of John Keeping's `git integration` tool\n(https://github.com/johnkeeping/git-integration[link]) , that provides a\none-to-one mapping of functionality, plus some extras. Also, it borrows ideas\nfrom git.git's integration scripts.\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Ffelipec%2Fgit-reintegrate","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Ffelipec%2Fgit-reintegrate","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Ffelipec%2Fgit-reintegrate/lists"}