threads / discuss / 64627

git new features: following and priority branches with new git flow

Subject: git new features: following and priority branches with new git flow

## tl;dr

3 messages between Dec 15, 2025 and Dec 15, 2025.

replies: 2people: 2as markdown or json

Milos Markovic· Dec 15, 2025, 10:15 UTC · lore

Dear all,

After decades of using git (as dev, as manager and as a cto), and considering different git flows I noticed some gaps.

Briefly, different git flows perceive branches equally and shape history from developers perspective. I realized that if the perspective is written from a devops perspective ( focusing on higher priority branches, like prod first , than qa, and with least focus on dev) the source history could be organized differently ( from my perspective a bit better). We used the following approach for a couple of years.

Therefore I invite you to check the following workflow here https://github.com/k4hvd1/rebaser-flow .

It would be my pleasure to discuss new features in git and how this approach could be used. Finally if it makes sense for you I will show you other materials and we could think about implementing it in git .

Regards Milos

Kristoffer Haugsbakk· Dec 15, 2025, 15:13 UTC · re: Milos Markovic · lore

Re: git new features: following and priority branches with new git flow

On Mon, Dec 15, 2025, at 11:15, Milos Markovic wrote:

Show 22 quoted lines

> Dear all,
>
> After decades of using git (as dev, as manager and as a cto), and
> considering different git flows I noticed some gaps.
>
> Briefly, different git flows perceive branches equally and shape
> history from developers perspective. I realized that if the
> perspective is written from a devops perspective ( focusing on higher
> priority branches, like prod first , than qa, and with least focus on
> dev) the source history could be organized differently ( from my
> perspective a bit better). We used the following approach for a couple
> of years.
>
> Therefore I invite you to check the following workflow here
> https://github.com/k4hvd1/rebaser-flow .
>
> It would be my pleasure to discuss new features in git and how this
> approach could be used. Finally if it makes sense for you I will show
> you other materials and we could think about implementing it in git .
>
> Regards
> Milos

Those `gitscript.sh` should be shell functions. They will not work unless your default shell is Bash.

E.g.

    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'

Milos Markovic· Dec 15, 2025, 16:00 UTC · re: Kristoffer Haugsbakk · lore

Re: git new features: following and priority branches with new git flow

The idea is to remove script and to have commands in git directly:

 --follow-branch BRANCH_NAME // name of the branch that will always be
rebased when pull command is executed

On Mon, Dec 15, 2025 at 4:14 PM Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com> wrote:

Show 31 quoted lines

>
> On Mon, Dec 15, 2025, at 11:15, Milos Markovic wrote:
> > Dear all,
> >
> > After decades of using git (as dev, as manager and as a cto), and
> > considering different git flows I noticed some gaps.
> >
> > Briefly, different git flows perceive branches equally and shape
> > history from developers perspective. I realized that if the
> > perspective is written from a devops perspective ( focusing on higher
> > priority branches, like prod first , than qa, and with least focus on
> > dev) the source history could be organized differently ( from my
> > perspective a bit better). We used the following approach for a couple
> > of years.
> >
> > Therefore I invite you to check the following workflow here
> > https://github.com/k4hvd1/rebaser-flow .
> >
> > It would be my pleasure to discuss new features in git and how this
> > approach could be used. Finally if it makes sense for you I will show
> > you other materials and we could think about implementing it in git .
> >
> > Regards
> > Milos
>
> Those `gitscript.sh` should be shell functions. They will not work
> unless your default shell is Bash.
>
> E.g.
>
>     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'