* git new features: following and priority branches with new git flow
@ 2025-12-15 10:15 Milos Markovic
2025-12-15 15:13 ` Kristoffer Haugsbakk
0 siblings, 1 reply; 3+ messages in thread
From: Milos Markovic @ 2025-12-15 10:15 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git new features: following and priority branches with new git flow
2025-12-15 10:15 git new features: following and priority branches with new git flow Milos Markovic
@ 2025-12-15 15:13 ` Kristoffer Haugsbakk
2025-12-15 16:00 ` Milos Markovic
0 siblings, 1 reply; 3+ messages in thread
From: Kristoffer Haugsbakk @ 2025-12-15 15:13 UTC (permalink / raw)
To: Milos Markovic, git
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'
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git new features: following and priority branches with new git flow
2025-12-15 15:13 ` Kristoffer Haugsbakk
@ 2025-12-15 16:00 ` Milos Markovic
0 siblings, 0 replies; 3+ messages in thread
From: Milos Markovic @ 2025-12-15 16:00 UTC (permalink / raw)
To: Kristoffer Haugsbakk; +Cc: git
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:
>
> 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'
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-12-15 16:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-15 10:15 git new features: following and priority branches with new git flow Milos Markovic
2025-12-15 15:13 ` Kristoffer Haugsbakk
2025-12-15 16:00 ` Milos Markovic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox