Add trunk as supported main branch name for git-flow

[snoweuph]

Trunk Based Development is an easyfied version of git-flow, useful for smaller projects.

It is a quite common convention to call the main branch trunk, to directly show that the project uses trunk based Development.

This PR adds trunk as a possible name for the main branch in gitflow, so it's also correctly shown on the complete left.

[GottZ]

and I'm here like.. using "root" as main branch name, wondering if I should change that.
how about.. taking the output of git config --get init.defaultbranch into the mix too?

[snoweuph]

good idea, tbh, this is just me trying to upstream another git branching schema.

I like your idea though, how about opening up a pr with an implementation (though it doesnt look likes this that fast maintained, looking at how long this pr is open)

[mlange-42]

Hi @snoweuph!
thank you for your PR! I am willing to merge it. Just adjusted the CI to run on PRs from forks, so could you please rebase this onto master?

Regarding project maintenance, I do currently not have the capacity nor interest to do a lot of Rust coding here. Which is a pitty, as git-graphs seems to have quite a few users.

PRs, particularly those fixing some of the reported issues, are highly welcome. This one slipped through, so apologize for the late reply.

[snoweuph]

Luckly I'm still awake, one rebause soon coming up xD

[snoweuph]

rebase done, though not signed, because I moved most of my stuff over to codeberg/euph-forge, and thus didn't notice my gpg key for github is no longer up to date xD

[snoweuph]

Regarding project maintenance, I do currently not have the capacity nor interest to do a lot of Rust coding here. Which is a pitty, as git-graphs seems to have quite a few users.

how about moving it to an org after collecting some core maintainers for it? (you could even move over to codeberg to xD)

[snoweuph]

We prolly should add a Justfile or Makefile to this project

[mlange-42]

We prolly should add a Justfile or Makefile to this project

Why? Isn't cargo sufficient?

[snoweuph]

well its more about convenince and nowing where to start in a project

like doing a

make help or just help,
to get an overview of whats used in this project.

for example this project use fmt as lint and does testing.

so a just help could show that theres lint and test, directly showing the contributor, about what he should do first locally.

[mlange-42]

@snoweuph That's also shown by the CI script. But maybe I just underestimate it, as I am quite C++ averse and don't have a lot of experience with Makefiles. So feel free to make a PR.

[snoweuph]

@snoweuph That's also shown by the CI script. But maybe I just underestimate it, as I am quite C++ averse and don't have a lot of experience with Makefiles. So feel free to make a PR.

well, I personally hate it when I only notice such stuff after pushing. and most people dont look into the ci folders.

Make and Justfiles (Just is a more modern replacements)
basicly are a collection of shell scripts with some nice uttilities

[GottZ]

good idea, tbh, this is just me trying to upstream another git branching schema.
I like your idea though, how about opening up a pr with an implementation
ye. I could dig into that but currently lack the time capacity to do it myself.
I did take ownership of the Archlinux AUR package for this repository tho so I have to stick around anyways... I'll see what I can do.

@mlange-42 I've seen your activity on github going up again so.. I guess I don't need to ask you for a contact so I can push a PR here :)

[mlange-42]

@GottZ PRs are welcome. I will probably not do a lot of development here any time soon, but will try better maintain it compared to the last years.