PSA: If you are running gotwebd from #gameoftrees -portable 0.111 (released 2025-04-22) or later on a machine which contains unrelated #git repositories that are supposed to remain secret you should ensure that the _gotwebd user cannot read those repositories, or stop gotwebd altogether until we have shipped a fix.
Servers running #OpenBSD are not affected by this problem.
Continuing work on my #git & CI server built on #illumos primitives. I have a preliminary version of the git view.
Next up: trigger pipelines on git push.

Create your own Octocat by visiting
https://myoctocat.com/
#octocat #github #git #cat #create #fun

New video: Clean multi-branch merges in Git -- octopus merge explained with SmartGit on Windows, macOS, and Linux. Keep your history tidy and merge several branches at once. Watch now: https://www.youtube.com/watch?v=raVUw8hyJlU #SmartGit #Git #DevTools
Strategii zarządzania gałęziami w repozytorium #Git jest mnóstwo. Większość z nas zna kilka, ale jest też kilka mniej popularnych. Można zerknąć na następujące zestawienie.
#SoftwareEngineering #InzynieriaOprogramowania
https://dev.to/karmpatel/git-branching-strategies-a-comprehensive-guide-24kh
I'm working on a presentation advocating for creatives to adopt #Git. The short version is that commits on a markdown document are a better system than Final_forrealthistime_noactually_v7.docx
So I need a really simple Git GUI (I taught some of these people about alt-tab yesterday). It should be easy to see all commits on the current and ideally other branches, to compare the working tree to any given commit, and to create and merge branches. Work tree support is a bonus. Any suggestions?
Терминал — ваш лучший друг: 5 утилит командной строки, которые заменят вам GUI
Вы когда-нибудь задумывались, сколько времени уходит на переключение между окнами, клики мышью и поиск нужной кнопки в GUI? В мире, где каждая секунда на счету, терминал остается самым мощным и недооцененным инструментом разработчика. Но стандартного набора команд часто недостаточно. Я подготовил для вас список из пяти утилит, которые не просто ускорят вашу работу, а полностью изменят ваше представление о возможностях командной строки. После их освоения вы будете смотреть на коллег, тянущихся к мыши, с легким недоумением.
https://habr.com/ru/articles/944736/
#IT #cli #продуктивность #программирование #git #github #агент #backend #frontend #python
I have been using #git for long, but I was not using it fully until I found this https://learngitbranching.js.org/
that's a type of guy who says that conventional commits are not necessary.
From: @masukomi
https://connectified.com/@masukomi/115163430957933678
So! It happened! Now you can download already built executables of Birdy! 🥳 🐦
P.S: But only for Linux yet...
You can download it from:
Gamejolt: https://gamejolt.com/games/birdyncrisps/1003785
or itch.io: https://xolatgames.itch.io/birdyncrisps
#sdl #sdl2 #box2d #opensource #gamedev #indiedev #indiegame #games #adventure #game #codeberg #git #indie #devlog #cpp #cplusplus #svg #inkscape #tiled #itch #itch_io #gamejolt #adventure #minigames #development #2d #singleplayer

The next step in my git worktree learning journey: syncing diverged branches.
I created a worktree for a feature while cleaning up my main branch history. After squashing/reordering commits, they diverged. How do I bring the cleaned-up changes into the worktree without affecting the main branch?
Lesson learned: the "thing" I am merging into is the branch, not the worktree. The worktree is merely a container for the second branch; a filesystem location where I may check out and work on another branch.
This means that the two branches may be synced using the same technique as if they were in the same workspace, typically using a merge or a rebase.
However, all the interactive rebasing I did on the main branch broke the parent-child relationship between the two branches. Therefore, rebasing is the more appropriate choice. I want to replay the feature commits on top of the cleaned-up branch so it's as if I wrote the feature on top of the cleaned-up branch to start with.
```bash
cd worktree
git checkout feature-branch
git rebase main-branch
```
#gitworktree #git #learning #TIL #devlife