Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > comp.programming > #16884 > unrolled thread
| Started by | 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> |
|---|---|
| First post | 2026-04-17 08:00 +0200 |
| Last post | 2026-06-09 07:53 +0000 |
| Articles | 18 — 8 participants |
Back to article view | Back to comp.programming
Git own serwer: How To Protect master Branch? 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> - 2026-04-17 08:00 +0200
Re: Git own serwer: How To Protect master Branch? Pancho <Pancho.Jones@protonmail.com> - 2026-04-17 10:21 +0100
Re: Git own serwer: How To Protect master Branch? Pancho <Pancho.Jones@protonmail.com> - 2026-04-17 10:24 +0100
Re: Git own serwer: How To Protect master Branch? 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> - 2026-04-18 00:38 +0200
Re: Git own serwer: How To Protect master Branch? Keith Thompson <Keith.S.Thompson+u@gmail.com> - 2026-04-17 16:42 -0700
Re: Git own serwer: How To Protect master Branch? 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> - 2026-04-18 05:03 +0200
Re: Git own serwer: How To Protect master Branch? Keith Thompson <Keith.S.Thompson+u@gmail.com> - 2026-04-17 22:26 -0700
Re: Git own serwer: How To Protect master Branch? Pancho <Pancho.Jones@proton.me> - 2026-04-18 07:08 +0100
Re: Git own serwer: How To Protect master Branch? Julio Di Egidio <julio@diegidio.name> - 2026-04-18 09:28 +0200
Re: Git own serwer: How To Protect master Branch? Lumin Etherlight <lumin@etherlight.link> - 2026-06-09 01:59 +0300
Re: Git own serwer: How To Protect master Branch? 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> - 2026-06-09 12:35 +0200
Re: Git own serwer: How To Protect master Branch? Lumin Etherlight <lumin+usenet@etherlight.link> - 2026-06-14 08:28 +0300
Re: Git own serwer: How To Protect master Branch? 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> - 2026-06-16 00:27 +0200
Re: Git own serwer: How To Protect master Branch? 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> - 2026-06-16 00:32 +0200
Re: Git own serwer: How To Protect master Branch? Keith Thompson <Keith.S.Thompson+u@gmail.com> - 2026-06-15 17:01 -0700
Re: Git own serwer: How To Protect master Branch? Lawrence D’Oliveiro <ldo@nz.invalid> - 2026-06-16 00:31 +0000
Re: Git own serwer: How To Protect master Branch? Lumin Etherlight <lumin+usenet@etherlight.link> - 2026-06-17 11:23 +0300
Re: Git own serwer: How To Protect master Branch? Lawrence D’Oliveiro <ldo@nz.invalid> - 2026-06-09 07:53 +0000
| From | 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> |
|---|---|
| Date | 2026-04-17 08:00 +0200 |
| Subject | Git own serwer: How To Protect master Branch? |
| Message-ID | <_4ScnSN_XI8aUXz0nZ2dnZfqn_WdnZ2d@giganews.com> |
Hello! I wish to know: How to correctly setup my own git serwer with access via ssh for small programmers team? I wish configure git server in the way that only team leader can merge in to master branch. I know git command, but I don't know how can I protect master branch on vanilla git server. NOTE: I want to avoid github.com nor gitlab.com. -- Thanks in advance! Jacek Marcin Jaworski, Pruszcz Gd., woj. Pomorskie, Polska 🇵🇱, EU 🇪🇺; tel.: +48-609-170-742, najlepiej w godz.: 5:00-5:55 lub 16:00-17:25; <jmj@energokod.gda.pl>, gpg: 4A541AA7A6E872318B85D7F6A651CC39244B0BFA; Domowa s. WWW: <https://energokod.gda.pl>; Mini Netykieta: <https://energokod.gda.pl/MiniNetykieta.html>; Mailowa Samoobrona: <https://emailselfdefense.fsf.org/pl>. UWAGA: NIE ZACIĄGAJ "UKRYTEGO DŁUGU"! PŁAĆ ZA PROG. FOSS I INFO. INTERNETOWE! CZYTAJ DARMOWY: "17. Raport Totaliztyczny - Patroni Kontra Bankierzy": <https://energokod.gda.pl/raporty-totaliztyczne/17.%20Patroni%20Kontra%20Bankierzy.pdf>
[toc] | [next] | [standalone]
| From | Pancho <Pancho.Jones@protonmail.com> |
|---|---|
| Date | 2026-04-17 10:21 +0100 |
| Message-ID | <10rsu3m$2bakt$1@dont-email.me> |
| In reply to | #16884 |
On 4/17/26 07:00, 🇵🇱Jacek Marcin Jaworski🇵🇱 wrote: > Hello! > > I wish to know: How to correctly setup my own git serwer with access via > ssh for small programmers team? I wish configure git server in the way > that only team leader can merge in to master branch. I know git command, > but I don't know how can I protect master branch on vanilla git server. > NOTE: I want to avoid github.com nor gitlab.com. > <https://hub.docker.com/r/gitea/gitea> Setting up ssh on port 22 was a little involved, but I can explain a way to do it if you are interested. It is a bit irritating when you mess with followups.
[toc] | [prev] | [next] | [standalone]
| From | Pancho <Pancho.Jones@protonmail.com> |
|---|---|
| Date | 2026-04-17 10:24 +0100 |
| Message-ID | <10rsu8c$2bbsv$1@dont-email.me> |
| In reply to | #16884 |
On 4/17/26 10:21, Pancho wrote: > On 4/17/26 07:00, 🇵🇱Jacek Marcin Jaworski🇵🇱 wrote: >> Hello! >> >> I wish to know: How to correctly setup my own git serwer with access >> via ssh for small programmers team? I wish configure git server in the >> way that only team leader can merge in to master branch. I know git >> command, but I don't know how can I protect master branch on vanilla >> git server. >> NOTE: I want to avoid github.com nor gitlab.com. >> > > <https://hub.docker.com/r/gitea/gitea> > > Setting up ssh on port 22 was a little involved, but I can explain a way > to do it if you are interested. > > It is a bit irritating when you mess with followups.
[toc] | [prev] | [next] | [standalone]
| From | 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> |
|---|---|
| Date | 2026-04-18 00:38 +0200 |
| Message-ID | <CqacnewjlsTGK3_0nZ2dnZfqn_ednZ2d@giganews.com> |
| In reply to | #16886 |
W dniu 17.04.2026 o 11:24, Pancho pisze: > <https://hub.docker.com/r/gitea/gitea> > > Setting up ssh on port 22 was a little involved, but I can explain a way > to do it if you are interested. Thanks for answer. But on the above linked WWW site there is no info about the Gitea proj. - if it is home page then it explain exactly nothing. Gitolite WWW site, linked by Lawrence D’Oliveiro <ldo@nz.invalid>, is much more user friendly and it is much more self explanatory. > It is a bit irritating when you mess with followups. I no mess, but I just follow up netiquette: <https://en.wikipedia.org/wiki/Crossposting> NOTE: Links in references lead in to Netiquette related sites - this is prove that crossposting is part of it. -- Jacek Marcin Jaworski, Pruszcz Gd., woj. Pomorskie, Polska 🇵🇱, EU 🇪🇺; tel.: +48-609-170-742, najlepiej w godz.: 5:00-5:55 lub 16:00-17:25; <jmj@energokod.gda.pl>, gpg: 4A541AA7A6E872318B85D7F6A651CC39244B0BFA; Domowa s. WWW: <https://energokod.gda.pl>; Mini Netykieta: <https://energokod.gda.pl/MiniNetykieta.html>; Mailowa Samoobrona: <https://emailselfdefense.fsf.org/pl>. UWAGA: NIE ZACIĄGAJ "UKRYTEGO DŁUGU"! PŁAĆ ZA PROG. FOSS I INFO. INTERNETOWE! CZYTAJ DARMOWY: "17. Raport Totaliztyczny - Patroni Kontra Bankierzy": <https://energokod.gda.pl/raporty-totaliztyczne/17.%20Patroni%20Kontra%20Bankierzy.pdf>
[toc] | [prev] | [next] | [standalone]
| From | Keith Thompson <Keith.S.Thompson+u@gmail.com> |
|---|---|
| Date | 2026-04-17 16:42 -0700 |
| Message-ID | <87h5p9rw5z.fsf@kst.eternal-september.org> |
| In reply to | #16887 |
🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes:
> W dniu 17.04.2026 o 11:24, Pancho pisze:
>> <https://hub.docker.com/r/gitea/gitea>
>> Setting up ssh on port 22 was a little involved, but I can explain a
>> way to do it if you are interested.
>
> Thanks for answer. But on the above linked WWW site there is no info
> about the Gitea proj. - if it is home page then it explain exactly
> nothing. Gitolite WWW site, linked by Lawrence D’Oliveiro
> <ldo@nz.invalid>, is much more user friendly and it is much more self
> explanatory.
For information about Gitea, see <https://about.gitea.com/>.
[...]
--
Keith Thompson (The_Other_Keith) Keith.S.Thompson+u@gmail.com
void Void(void) { Void(); } /* The recursive call of the void */
[toc] | [prev] | [next] | [standalone]
| From | 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> |
|---|---|
| Date | 2026-04-18 05:03 +0200 |
| Message-ID | <s7mdnU1MccrkaX_0nZ2dnZfqn_idnZ2d@giganews.com> |
| In reply to | #16888 |
W dniu 18.04.2026 o 01:42, Keith Thompson pisze: > 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes: >> W dniu 17.04.2026 o 11:24, Pancho pisze: >>> <https://hub.docker.com/r/gitea/gitea> >>> Setting up ssh on port 22 was a little involved, but I can explain a >>> way to do it if you are interested. >> >> Thanks for answer. But on the above linked WWW site there is no info >> about the Gitea proj. - if it is home page then it explain exactly >> nothing. Gitolite WWW site, linked by Lawrence D’Oliveiro >> <ldo@nz.invalid>, is much more user friendly and it is much more self >> explanatory. > > For information about Gitea, see <https://about.gitea.com/>. Thank you for the link! But Gitea seems to be another github.com or gitlab.com, so it is not meet my requirements, quote: > I wish configure git server in the way that only team leader can merge in to master branch. > [...] > NOTE: I want to avoid github.com nor gitlab.com. -- Jacek Marcin Jaworski, Pruszcz Gd., woj. Pomorskie, Polska 🇵🇱, EU 🇪🇺; tel.: +48-609-170-742, najlepiej w godz.: 5:00-5:55 lub 16:00-17:25; <jmj@energokod.gda.pl>, gpg: 4A541AA7A6E872318B85D7F6A651CC39244B0BFA; Domowa s. WWW: <https://energokod.gda.pl>; Mini Netykieta: <https://energokod.gda.pl/MiniNetykieta.html>; Mailowa Samoobrona: <https://emailselfdefense.fsf.org/pl>. UWAGA: NIE ZACIĄGAJ "UKRYTEGO DŁUGU"! PŁAĆ ZA PROG. FOSS I INFO. INTERNETOWE! CZYTAJ DARMOWY: "17. Raport Totaliztyczny - Patroni Kontra Bankierzy": <https://energokod.gda.pl/raporty-totaliztyczne/17.%20Patroni%20Kontra%20Bankierzy.pdf>
[toc] | [prev] | [next] | [standalone]
| From | Keith Thompson <Keith.S.Thompson+u@gmail.com> |
|---|---|
| Date | 2026-04-17 22:26 -0700 |
| Message-ID | <878qaksusg.fsf@kst.eternal-september.org> |
| In reply to | #16889 |
🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes:
> W dniu 18.04.2026 o 01:42, Keith Thompson pisze:
>> 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes:
>>> W dniu 17.04.2026 o 11:24, Pancho pisze:
>>>> <https://hub.docker.com/r/gitea/gitea>
>>>> Setting up ssh on port 22 was a little involved, but I can explain a
>>>> way to do it if you are interested.
>>>
>>> Thanks for answer. But on the above linked WWW site there is no info
>>> about the Gitea proj. - if it is home page then it explain exactly
>>> nothing. Gitolite WWW site, linked by Lawrence D’Oliveiro
>>> <ldo@nz.invalid>, is much more user friendly and it is much more self
>>> explanatory.
>> For information about Gitea, see <https://about.gitea.com/>.
>
> Thank you for the link! But Gitea seems to be another github.com or
> gitlab.com, so it is not meet my requirements, quote:
>
>> I wish configure git server in the way that only team leader can merge in to master branch. > [...]
>> NOTE: I want to avoid github.com nor gitlab.com.
github.com and gitlab.com are sites that host git repos. gitlab can
also be self-hosted; you can set up your own instance.
gitea is software that lets you self-host a git service.
<https://about.gitea.com/products/>
I haven't used it.
I have git repos on my home system, accessed via ssh, with no extra
software required. I'm the only one using them, so I don't know
whether it would meet your requirements. I'm not entirely clear
on what your requirements are.
--
Keith Thompson (The_Other_Keith) Keith.S.Thompson+u@gmail.com
void Void(void) { Void(); } /* The recursive call of the void */
[toc] | [prev] | [next] | [standalone]
| From | Pancho <Pancho.Jones@proton.me> |
|---|---|
| Date | 2026-04-18 07:08 +0100 |
| Message-ID | <10rv74r$3081i$1@dont-email.me> |
| In reply to | #16890 |
On 18/04/2026 06:26, Keith Thompson wrote: > 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes: >> W dniu 18.04.2026 o 01:42, Keith Thompson pisze: >>> 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes: >>>> W dniu 17.04.2026 o 11:24, Pancho pisze: >>>>> <https://hub.docker.com/r/gitea/gitea> >>>>> Setting up ssh on port 22 was a little involved, but I can explain a >>>>> way to do it if you are interested. >>>> >>>> Thanks for answer. But on the above linked WWW site there is no info >>>> about the Gitea proj. - if it is home page then it explain exactly >>>> nothing. Gitolite WWW site, linked by Lawrence D’Oliveiro >>>> <ldo@nz.invalid>, is much more user friendly and it is much more self >>>> explanatory. >>> For information about Gitea, see <https://about.gitea.com/>. >> >> Thank you for the link! But Gitea seems to be another github.com or >> gitlab.com, so it is not meet my requirements, quote: >> >>> I wish configure git server in the way that only team leader can merge in to master branch. > [...] >>> NOTE: I want to avoid github.com nor gitlab.com. > > github.com and gitlab.com are sites that host git repos. gitlab can > also be self-hosted; you can set up your own instance. > > gitea is software that lets you self-host a git service. > > <https://about.gitea.com/products/> > > I haven't used it. > > I have git repos on my home system, accessed via ssh, with no extra > software required. I'm the only one using them, so I don't know > whether it would meet your requirements. I'm not entirely clear > on what your requirements are. > I've used but Gitea and Gitlab self hosted. Gitea is much lighter on resources (RAM) and I think much quicker. I switched maybe 5 years ago. Jacek wanted specific branch permissions, which AIUI plain git does not provide. The docker version of Gitea is easy to install and runs fine on my rPi4. You can lead a horse to water...
[toc] | [prev] | [next] | [standalone]
| From | Julio Di Egidio <julio@diegidio.name> |
|---|---|
| Date | 2026-04-18 09:28 +0200 |
| Message-ID | <10rvbqh$31i0i$1@dont-email.me> |
| In reply to | #16884 |
On 17/04/2026 08:00, 🇵🇱Jacek Marcin Jaworski🇵🇱 wrote: > Hello! > > I wish to know: How to correctly setup my own git serwer with access via > ssh for small programmers team? I wish configure git server in the way > that only team leader can merge in to master branch. I know git command, > but I don't know how can I protect master branch on vanilla git server. > NOTE: I want to avoid github.com nor gitlab.com. <https://git-scm.com/docs/gitfaq#Documentation/gitfaq.txt-HowdoIusehookstopreventusersfrommakingcertainchanges> <https://git-scm.com/docs/git-receive-pack.html#_pre_receive_hook> Then you can search for examples/tutorials, e.g. <https://git-scm.com/book/en/v2/Customizing-Git-An-Example-Git-Enforced-Policy> <https://stackoverflow.com/questions/50505459/how-to-setup-server-side-pre-receive-hook> HTH, Julio
[toc] | [prev] | [next] | [standalone]
| From | Lumin Etherlight <lumin@etherlight.link> |
|---|---|
| Date | 2026-06-09 01:59 +0300 |
| Message-ID | <W/pu9jnibrAPS5juDw/0NQBxMQdnPlFL@etherlight.link> |
| In reply to | #16884 |
🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes:
> I wish to know: How to correctly setup my own git
> serwer with access via ssh for small programmers
> team? I wish configure git server in the way that
> only team leader can merge in to master branch. I
> know git command, but I don't know how can I
> protect master branch on vanilla git server.
> NOTE: I want to avoid github.com nor gitlab.com.
The answer is to not have them share the git
repo. That's how the actual Linux project does
it. You give each developer their own account,
with SSH access only to their own user. They have
their own git repo, and they only push there.
When they want their own changes pulled to
master, they ask the leader (i.e. send him a "pull
request" by sending him an email or chat message),
and the leader would then git pull from their repo
to master. All personal repos would allow read
access to other users, but no write access to any
but their owner.
For example, some rough command list:
useradd leader
useradd john # normal developer
useradd mira # normal developer
they would have the following repos:
/var/git/leader/coolproject
/var/git/john/coolproject
/var/git/mira/coolproject
# Give users ownership over their git path.
chown -R leader:git /var/git/leader/
chown -R john:git /var/git/john/
chown -R mira:git /var/git/mira/
# Allow read for group, nothing for others.
chmod g+r-wx /var/git/*/
chmod o-rwx /var/git/*/
# Set the setgid bit to keep all child files
# and directories owned by the git group.
find /var/git -type d -exec chmod g+s {} \;
# for shorted URLs:
ln -s /var/git /git
Now, john for example would have his repo remotes:
git remote show origin
-> john@company.com:/git/john/coolproject
git remote show upstream
-> john@company.com:/git/leader/coolproject
If john wants to pull from upstream they do:
git pull upstream
John only pushes changes to john's repo:
git push origin # works
git push upstream # error: no write perm
If changes are good, and ready to merge to
master, then John asks Leader to "pull them", and
Leader then does the following:
git remote add john \
leader@company.com/git/john/coolproject
git pull john
Leader then reviews John's own changes, and
merges to master appropriately, and then does:
git push origin
Where:
git remote show origin
-> leader@company.com/git/leader/coolproject
This is a simplified workflow, of course,
but it illustrates the point. Another option is
for developers to send their changes as patches in
an email message, which is also used a lot by the
Linux project, and many others. Git has built-in
support for sending such emails, and applying the
patches too. John uses git send-email to send the
commits to Leader, and Leader then uses `git am'
to apply the patches and review them, then pushes
to his origin normally.
You can't rely on git hooks, because you're
giving write access to the repo to multiple people
using one UNIX user, so they can modify them, mess
with the git history, etc. And no, you don't need
Gitea, or GitHub, or GitLab, or whatever is the
latest git wrapper that made people forget how to
use git and UNIX. This is all doable using simple
account permissions. The whole point of git is to
decentralize development, not be the communication
protocol of centralized forges; all developers get
their own repos to do their own development. Each
developer's repo can be on their local machine, or
their own server, or their own user in some shared
server, it all doesn't matter to git.
Best Regards,
Lumin Etherlight
[toc] | [prev] | [next] | [standalone]
| From | 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> |
|---|---|
| Date | 2026-06-09 12:35 +0200 |
| Message-ID | <p6ecndlL3OLacbr3nZ2dnZfqnPednZ2d@giganews.com> |
| In reply to | #16895 |
W dniu 9.06.2026 o 00:59, Lumin Etherlight pisze: > This is a simplified workflow, of course, > but it illustrates the point. Thank you for your great, and amazing git idea explanation!!! I have questions: > If changes are good, and ready to merge to > master, then John asks Leader to "pull them", and > Leader then does the following: > > git remote add john \ > leader@company.com/git/john/coolproject > > git pull john Did you mean leader pull john changes into leader local machine? But in this way john can add something to master branch without any notice. Leader can pull accidentally john master changes locally, and then push them to the server master branch. Is this scenario impossible? > Leader then reviews John's own changes, # Did you mean: git checkout john-branch git diff MASTER_HASH ? > and > merges to master appropriately # Did you mean: git checkout master git merge john-branch ? -- Z totaliztycznym salutem! Jacek Marcin Jaworski, Pruszcz Gd., woj. Pomorskie, Polska 🇵🇱, UE 🇪🇺; tel.: +48-609-170-742, najlepiej w godz.: 5:00-5:55 lub 16:00-17:25; <jmj@energokod.gda.pl>, gpg: 4A541AA7A6E872318B85D7F6A651CC39244B0BFA; Domowa s. WWW: <https://energokod.gda.pl>; Mini Netykieta: <https://energokod.gda.pl/MiniNetykieta.html>; Mailowa Samoobrona: <https://emailselfdefense.fsf.org/pl>. UWAGA: NIE ZACIĄGAJ "UKRYTEGO DŁUGU"! PŁAĆ ZA PROG. FOSS I INFO. INTERNETOWE! CZYTAJ DARMOWY: "17. Raport Totaliztyczny - Patroni Kontra Bankierzy": <https://energokod.gda.pl/raporty-totaliztyczne/17.%20Patroni%20Kontra%20Bankierzy.pdf>
[toc] | [prev] | [next] | [standalone]
| From | Lumin Etherlight <lumin+usenet@etherlight.link> |
|---|---|
| Date | 2026-06-14 08:28 +0300 |
| Message-ID | <JTOHtPGSPaHzu6DjqiF/QeRtKl/XlimS@etherlight.link> |
| In reply to | #16897 |
🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes:
> I have questions:
>
>> If changes are good, and ready to merge to
>> master, then John asks Leader to "pull them", and
>> Leader then does the following:
>>
>> git remote add john \
>> leader@company.com/git/john/coolproject
>> git pull john
>
> Did you mean leader pull john changes into leader
> local machine? But in this way john can add
> something to master branch without any notice.
> Leader can pull accidentally john master changes
> locally, and then push them to the server master
> branch. Is this scenario impossible?
Yes, John's changes are pulled into leader's
local machine for review. John can still modify
the branch john/master, but not leader/master.
The Leader should /not/ have john/master as
upstream for master, so when he pulls john/master
it does /not/ automatically update local master.
Leader should have john/master, mira/master, etc.
As branches on his local machine, with remotes set
to leader@company.com/git/john/coolproject/master
and leader@company.com/git/mira/coolproject/master
for example.
>> Leader then reviews John's own changes,
>
> # Did you mean:
> git checkout john-branch
> git diff MASTER_HASH
Yes. I usually do something like:
git checkout john/master
git log --graph john/master
git log -p john/master
>> and merges to master appropriately
>
> # Did you mean:
> git checkout master
> git merge john-branch
> ?
Yes, that's one way to do it. I usually ask
john to first /rebase/ his branch on top of latest
changes on leader/master, and then ask me for the
review, to minimize conflicts. I most of the time
then just reset leader/master to john/master, or,
I cherry-pick the commits I want from john/master
to leader/master. But git merge works too.
git reset # is kinda fun
git cherry-pick # is even more fun
If there are big conflicts between John and
Mira for example, and it's too much for Leader to
handle, Leader can instead ask Mira and John to
rebase on latest leader/master, pull each other's
changes, and resolve the conflicts themselves.
Leader then pulls and merges one of their repos
without conflicts.
By the way, I also recommend having a repo like:
company.com/git/company/coolproject
This one is for /production/. I usually
keep the leader's repo as development repo, and if
we're ready for a public release we merge from the
Leader repo to Company repo, then we make a fork
for the release:
# on company/coolproject
git checkout master
git branch release/v1.2
This allows us to cherry-pick patches to the
release branch even as we develop the next major
version on master. Some form of Release Flow[1],
and Semantic Versioning[2].
[1]: http://releaseflow.org/
[2]: https://semver.org/spec/v2.0.0.html
Anyway, have fun, and enjoy decentralized git :)
Best Regards,
Lumin Etherlight
[toc] | [prev] | [next] | [standalone]
| From | 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> |
|---|---|
| Date | 2026-06-16 00:27 +0200 |
| Message-ID | <GEadnXqS5Ina4a33nZ2dnZfqnPadnZ2d@giganews.com> |
| In reply to | #16898 |
W dniu 14.06.2026 o 07:28, Lumin Etherlight pisze: > Anyway, have fun, and enjoy decentralized git :) Thank you very much! You make working with git straight and independent! I document your "git way" in my monograph under title "Konf. i Zabezp. Sys. Op. z Rodz. Ubuntu" (in Eng.: "Config And Protection Ubuntu OS"), in chapter "7.4 Instalacja i Konf. Sys. Wersjonowania Git" (in Eng. "Installation And Config Git Versioning System"). I wrote it in Polish. I verify all your shell commands and with help ChatGPT I added missing ones. You are mentioned at the beginning of the chapter as source of my information. The monograph is available from my WWW home site: <https://energokod.gda.pl/monografie/Konf.%20i%20Zabezp.%20Sys.%20Op.%20z%20Rodz.%20Ubuntu.pdf> , it is available completely at no cost (for free as free beer). I wrote it in order to be smart Linux user and employee, and in order to promote Linux in Poland. BTW: I am wonder why Linus do not work this way?!? I is unbelievable, but he use: <https://github.com/torvalds> Why he did such mean thing? He do not realize it use Micro$lop server?!? -- Z totaliztycznym salutem! Jacek Marcin Jaworski, Pruszcz Gd., woj. Pomorskie, Polska 🇵🇱, UE 🇪🇺; tel.: +48-609-170-742, najlepiej w godz.: 5:00-5:55 lub 16:00-17:25; <jmj@energokod.gda.pl>, gpg: 4A541AA7A6E872318B85D7F6A651CC39244B0BFA; Domowa s. WWW: <https://energokod.gda.pl>; Mini Netykieta: <https://energokod.gda.pl/MiniNetykieta.html>; Mailowa Samoobrona: <https://emailselfdefense.fsf.org/pl>. UWAGA: NIE ZACIĄGAJ "UKRYTEGO DŁUGU"! PŁAĆ ZA PROG. FOSS I INFO. INTERNETOWE! CZYTAJ DARMOWY: "17. Raport Totaliztyczny - Patroni Kontra Bankierzy": <https://energokod.gda.pl/raporty-totaliztyczne/17.%20Patroni%20Kontra%20Bankierzy.pdf>
[toc] | [prev] | [next] | [standalone]
| From | 🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> |
|---|---|
| Date | 2026-06-16 00:32 +0200 |
| Message-ID | <u3SdnRff76Mu4K33nZ2dnZfqnPGdnZ2d@giganews.com> |
| In reply to | #16899 |
W dniu 16.06.2026 o 00:27, 🇵🇱Jacek Marcin Jaworski🇵🇱 pisze: > BTW: I am wonder why Linus do not work this way?!? I is unbelievable, > but he use: > > <https://github.com/torvalds> > > Why he did such mean thing? He do not realize it use Micro$lop server?!? Is he do not realize he is de facto Micro$lop user?!? -- Z totaliztycznym salutem! Jacek Marcin Jaworski, Pruszcz Gd., woj. Pomorskie, Polska 🇵🇱, UE 🇪🇺; tel.: +48-609-170-742, najlepiej w godz.: 5:00-5:55 lub 16:00-17:25; <jmj@energokod.gda.pl>, gpg: 4A541AA7A6E872318B85D7F6A651CC39244B0BFA; Domowa s. WWW: <https://energokod.gda.pl>; Mini Netykieta: <https://energokod.gda.pl/MiniNetykieta.html>; Mailowa Samoobrona: <https://emailselfdefense.fsf.org/pl>. UWAGA: NIE ZACIĄGAJ "UKRYTEGO DŁUGU"! PŁAĆ ZA PROG. FOSS I INFO. INTERNETOWE! CZYTAJ DARMOWY: "17. Raport Totaliztyczny - Patroni Kontra Bankierzy": <https://energokod.gda.pl/raporty-totaliztyczne/17.%20Patroni%20Kontra%20Bankierzy.pdf>
[toc] | [prev] | [next] | [standalone]
| From | Keith Thompson <Keith.S.Thompson+u@gmail.com> |
|---|---|
| Date | 2026-06-15 17:01 -0700 |
| Message-ID | <110q3pr$o2ac$1@kst.eternal-september.org> |
| In reply to | #16899 |
🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes:
> W dniu 14.06.2026 o 07:28, Lumin Etherlight pisze:
[...]
> BTW: I am wonder why Linus do not work this way?!? I is unbelievable,
> but he use:
>
> <https://github.com/torvalds>
>
> Why he did such mean thing? He do not realize it use Micro$lop server?!?
GitHub was launched in 2008, and acquired by Microsoft in 2018.
I presume Linus started using GitHub before its acquisition. I won't
speculate on why he still uses it, beyond the obvious facts that (a)
GitHub is still free-as-in-beer and (b) users would be inconvenienced
if the GitHub repos were removed.
There are also git repos for Git and Linux on git.kernel.org.
I don't know whether the kernel.org or github.org is considered
definitive, if that's even meaningful. They both appear to be
up to date. If you choose to boycott GitHub for whatever reason,
you can use the repos on kernel.org (though of course you'll miss
out on a lot of things that are hosted only on GitHub).
--
Keith Thompson (The_Other_Keith) Keith.S.Thompson+u@gmail.com
void Void(void) { Void(); } /* The recursive call of the void */
[toc] | [prev] | [next] | [standalone]
| From | Lawrence D’Oliveiro <ldo@nz.invalid> |
|---|---|
| Date | 2026-06-16 00:31 +0000 |
| Message-ID | <110q5gg$o45a$9@dont-email.me> |
| In reply to | #16899 |
On Tue, 16 Jun 2026 00:27:06 +0200, 🇵🇱Jacek Marcin Jaworski🇵🇱 wrote: > BTW: I am wonder why Linus do not work this way?!? I is > unbelievable, but he use: > > <https://github.com/torvalds> > > Why he did such mean thing? He do not realize it use Micro$lop > server?!? That GitHub repo is just a passive mirror. Note you can’t submit bug reports or pull requests. What Linus Torvalds thinks of GitHub’s “pull requests”: <https://web.archive.org/web/20260105030930/https://github.com/torvalds/linux/pull/17>
[toc] | [prev] | [next] | [standalone]
| From | Lumin Etherlight <lumin+usenet@etherlight.link> |
|---|---|
| Date | 2026-06-17 11:23 +0300 |
| Message-ID | <nCtQLGQScswUokB75mVGCN38zGxGU6+n@etherlight.link> |
| In reply to | #16899 |
🇵🇱Jacek Marcin Jaworski🇵🇱 <jmj@energokod.gda.pl> writes:
> it is available completely at no cost (for free as
> free beer). I wrote it in order to be smart Linux
> user and employee, and in order to promote Linux
> in Poland.
Looks very cool. Thank you for you work on
spreading good free software ideas to the Polish
community, and thank you for mentioning me :)
Good luck on your endeavors~
Best Regards,
Lumin Etherlight
[toc] | [prev] | [next] | [standalone]
| From | Lawrence D’Oliveiro <ldo@nz.invalid> |
|---|---|
| Date | 2026-06-09 07:53 +0000 |
| Message-ID | <1108gpj$3qdvc$1@dont-email.me> |
| In reply to | #16884 |
On Fri, 17 Apr 2026 08:00:54 +0200, 🇵🇱Jacek Marcin Jaworski🇵🇱 wrote: > I wish to know: How to correctly setup my own git serwer with access > via ssh for small programmers team? I wish configure git server in > the way that only team leader can merge in to master branch. <https://github.com/sitaramc/gitolite>
[toc] | [prev] | [standalone]
Back to top | Article view | comp.programming
csiph-web