{"thread":{"id":"64627","subject":"git new features: following and priority branches with new git flow","startedAt":"2025-12-15T10:15:24Z","lastAt":"2025-12-15T16:01:08Z","messageCount":3,"participants":["Milos Markovic","Kristoffer Haugsbakk"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"532182","messageId":"CAKRouPtDrCgUk1bQeF+ao04rtK_jg8KxD6Oju8vw8H-ZYt-7Ow@mail.gmail.com","threadId":"64627","inReplyTo":null,"subject":"git new features: following and priority branches with new git flow","fromName":"Milos Markovic","fromEmail":"k4hvd1@gmail.com","sentAt":"2025-12-15T10:15:12Z","receivedAt":"2025-12-15T10:15:24Z","isPatch":false,"sender":{"key":"k4hvd1@gmail.com","avatar":null},"body":"Dear all,\n\nAfter decades of using git (as dev, as manager and as a cto), and\nconsidering different git flows I noticed some gaps.\n\nBriefly, different git flows perceive branches equally and shape\nhistory from developers perspective. I realized that if the\nperspective is written from a devops perspective ( focusing on higher\npriority branches, like prod first , than qa, and with least focus on\ndev) the source history could be organized differently ( from my\nperspective a bit better). We used the following approach for a couple\nof years.\n\nTherefore I invite you to check the following workflow here\nhttps://github.com/k4hvd1/rebaser-flow .\n\nIt would be my pleasure to discuss new features in git and how this\napproach could be used. Finally if it makes sense for you I will show\nyou other materials and we could think about implementing it in git .\n\nRegards\nMilos\n"},{"id":"532190","messageId":"8bcfe2fe-3522-413f-b4d1-13e048028296@app.fastmail.com","threadId":"64627","inReplyTo":"CAKRouPtDrCgUk1bQeF+ao04rtK_jg8KxD6Oju8vw8H-ZYt-7Ow@mail.gmail.com","subject":"Re: git new features: following and priority branches with new git flow","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2025-12-15T15:13:56Z","receivedAt":"2025-12-15T15:14:18Z","isPatch":false,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Mon, Dec 15, 2025, at 11:15, Milos Markovic wrote:\n> Dear all,\n>\n> After decades of using git (as dev, as manager and as a cto), and\n> considering different git flows I noticed some gaps.\n>\n> Briefly, different git flows perceive branches equally and shape\n> history from developers perspective. I realized that if the\n> perspective is written from a devops perspective ( focusing on higher\n> priority branches, like prod first , than qa, and with least focus on\n> dev) the source history could be organized differently ( from my\n> perspective a bit better). We used the following approach for a couple\n> of years.\n>\n> Therefore I invite you to check the following workflow here\n> https://github.com/k4hvd1/rebaser-flow .\n>\n> It would be my pleasure to discuss new features in git and how this\n> approach could be used. Finally if it makes sense for you I will show\n> you other materials and we could think about implementing it in git .\n>\n> Regards\n> Milos\n\nThose `gitscript.sh` should be shell functions. They will not work\nunless your default shell is Bash.\n\nE.g.\n\n    git config --global alias.pld  '![[ $(git rev-parse --abbrev-ref HEAD) == \"dev\" ]] && git fetch --all &&  git rebase origin/dev && git rebase origin/qa && git rebase origin/production'\n"},{"id":"532192","messageId":"CAKRouPs+TSfg-HGnEgr9KBq_-1xMVktty963v+A31YWFTnPj_g@mail.gmail.com","threadId":"64627","inReplyTo":"8bcfe2fe-3522-413f-b4d1-13e048028296@app.fastmail.com","subject":"Re: git new features: following and priority branches with new git flow","fromName":"Milos Markovic","fromEmail":"k4hvd1@gmail.com","sentAt":"2025-12-15T16:00:56Z","receivedAt":"2025-12-15T16:01:08Z","isPatch":false,"sender":{"key":"k4hvd1@gmail.com","avatar":null},"body":"The idea is to remove script and to have commands in git directly:\n\n --follow-branch BRANCH_NAME // name of the branch that will always be\nrebased when pull command is executed\n\nOn Mon, Dec 15, 2025 at 4:14 PM Kristoffer Haugsbakk\n<kristofferhaugsbakk@fastmail.com> wrote:\n>\n> On Mon, Dec 15, 2025, at 11:15, Milos Markovic wrote:\n> > Dear all,\n> >\n> > After decades of using git (as dev, as manager and as a cto), and\n> > considering different git flows I noticed some gaps.\n> >\n> > Briefly, different git flows perceive branches equally and shape\n> > history from developers perspective. I realized that if the\n> > perspective is written from a devops perspective ( focusing on higher\n> > priority branches, like prod first , than qa, and with least focus on\n> > dev) the source history could be organized differently ( from my\n> > perspective a bit better). We used the following approach for a couple\n> > of years.\n> >\n> > Therefore I invite you to check the following workflow here\n> > https://github.com/k4hvd1/rebaser-flow .\n> >\n> > It would be my pleasure to discuss new features in git and how this\n> > approach could be used. Finally if it makes sense for you I will show\n> > you other materials and we could think about implementing it in git .\n> >\n> > Regards\n> > Milos\n>\n> Those `gitscript.sh` should be shell functions. They will not work\n> unless your default shell is Bash.\n>\n> E.g.\n>\n>     git config --global alias.pld  '![[ $(git rev-parse --abbrev-ref HEAD) == \"dev\" ]] && git fetch --all &&  git rebase origin/dev && git rebase origin/qa && git rebase origin/production'\n"}]}