2026-01-04 09:31:23
Here's a #PixelFed update #git issue I didn't expect: installed on an rpi5, the git was cloned to the sdcard, but after installation I had to move /storage to a USB drive and so symlinked the path. I also had to modify database.php to use pgsql.
Now, when I attempt a pull, I'm told to stash my changes, but stash throws an error because composer.lock was changed and /storage/app/.gitignore is now a symlink.
error: 'storage/app/.gitignore' is beyond a symbolic link
fatal: Unable to process path storage/app/.gitignore
Whatever this stash test is, it doesn't obey root .gitignore, and I did a git rm --cached on that file which shouldn't be IN the repo anyway, and wasn't. Google and DDG refuse to understand that this isn't about adding filenames to .gitignore and git itself has no obvious override.
So I'm stuck 😞
Does anyone have experience with #gitSubRepo? It seems to be a more ergonomic version of #gitSubTree that e.g. remembers remote urls to spare you lengthy syncing commands.
I don't know what a L-cone is, but I seem to really want to use #git with it.
Learned a neat git thing today. Reverting changes to ONE file in a PR
`git checkout origin/main -- config/services.php`
Revert the changes to `services.php` in my current branch/PR.
#git
Today I’ve completed the migration from #portainer to #komodo as #docker manager. The #git integ…
{piggyback} makes it easier to attach large files (e.g. input data) to code in github repos: #rstats
I'm using #git subtree for the first time in a real setting. It feels nicer than git submodules, because you can just commit and everything downstream is included. You can then push the individual subtrees later and it'll pick only the commits that actually touched their directories. `git log` gets a bit crowded though with duplicate commits (from parent and subtree repos). And there's no …
For hosting our internal source code repositories, we're using #gitea. There are a bunch of other options and all of them seem to mimic github's look and feel. Gitea was the one I found out about first some years ago and it stuck. It has an issue tracker and works well for doing pull requests and reviewing them online.
There's a commercial cloud hosting offer and an enterprise opt…
At @… we're running many linter-ish tools in CI that I'd like to have easy to apply (codespell, various indentation/sorting stuff, cargo clippy --fix). Are there existing tools that I can wrap those in, so that at the end of a PR's CI run, I get a neat set of "fixup!" #git
Some more `git subtree push` quirks:
• `git subtree push` (obviously) does not push :gitannex: #gitAnnex files to the remote. Syncing annexed files there is unergonomic.
• git subtree push` also strips commit signatures (e.g. GPG and as such #OpenTimeStamps timestamps). The truth lies…
Codeberg is a non-profit, community-led effort that provides #Git #hosting and other services for #free and #opensource …