mastodon.xyz is one of the many independent Mastodon servers you can use to participate in the fediverse.
A Mastodon instance, open to everyone, but mainly English and French speaking.

Administered by:

Server stats:

811
active users

#git

45 posts45 participants0 posts today
Continued thread

Si il y'en a qui sont au courant, je cherche un moyen d'utiliser #emacs natif sous android (pas la version console termux) + #termux + #termuxapi.

Pour les deux premiers, j'ai trouvé des builds spéciaux d'emacs et termux avec des apk signés par la même clef. Ça permet à emacs de pouvoir utiliser des programmes installés via termux (pkg install xxx), utils pour plein de fonctionnalité (#gnuplot, #gnupg, export #latex pdf, #git, etc..).
sourceforge.net/projects/andro

Par contre, je n'ai pas trouvé d'apk de termux-api avec cette même clef. Si il y a rien, je vais devoir déconstruire l'apk et la re-signer avec la bonne clef, mais j'aimerai éviter si c'est possible..

sourceforge.netAndroid ports for GNU Emacs - Browse /termux at SourceForge.net

#Git mini tip:

Acknowledge co-authors with a 'co-authored-by' trailer at the end of your commit message, like:

co-authored-by: Otter Coder <otter@coolmail.example>

GitHub, GitLab, and some other Git hosts will parse such trailers and show co-authors’ avatars alongside your own for that commit.

me: Hi #git, please just take the stuff I changed and put it on the webernet.

Git: Some updates were rejected because you have un-sprongled verterbrae in your sub-spline. Either extrapolate your tips or re-fling your local branch, using git reblog --ff-no-ice. If you want to recapitulate your local flange, then your diversionary remote can't be submitted without stripping the exoplanet, with potential universal anguish.
hint: Disable this message with "git config set advice.flagelate false"

Continued thread

- Push changes with comprehensive messages in @github
PRs for human review.
- No #Git, no technical notions needed 😉
- Faster bug resolution for happier customers!
(Next step, implement the @qdrant_engine
database integration to power-boost the @AnthropicAI
#AI model) #IA

Watch our #hackathon pitch video to see the agent in action: youtube.com/watch?v=_nifTEl5JX

A huge thank you to the organizers #Dust, #Qdrant and #qonto for making this possible!

So I'm trying to get better at #git. I added a Development branch to one of my repositories for me to muck around with, leaving the Main branch for people to download.
But I just finished working on a new script which is ready for beta, added it to main and pushed it up to the repository, then remembered to fill out some metadata in the header, changed it and pushed the changes while still on Main.
So now Main has some tweaks that aren't in Development. How do I synch up my development branch with main now, without losign all the bits and bobs that are in Development but not in Main?

BTW if you want to download a hot off the press GPU-accelerated tiling plugin for #BlackMagicFusion it's at codeberg.org/stib/stibs_fuses

Summary card of repository stib/stibs_fuses
Codeberg.orgstibs_fusesFuses for DaVinci Resolve and Fusion

Feels a bit dangerous, but I just dealt with #git complaining about local untracked files that would be overwritten by a `git pull` by selecting the list, copying it, then doing `pbpaste | xargs rm`. I assumed I'd get asked for confirmation for each one... but it just deleted them all! Eek! #bash #xargs

The best part of the 20 years of Git celebration interview with Linus Torvalds was this bit about his choice of text editor. Which is MicroEMACS from 40 years ago, not used by anyone else today.

Instead of the endless rush to adopt whatever is the hyped tech of the day, you could choose to be nore like Linus. Make your own choices based on what you really need.

If it worked for the guy who created #Linux and #Git, why couldn't it work for you?

github.blog/open-source/git/gi

More on #git
Your push can be rejected
since you might be working with
a bot/ person . action .. ( --force-with-lease)
on the same page at the same time or the same remote path and same branch or any such possibility ( unlikely but possible)

then your can
- see the diff bw remote & your local with
git remote branch:branch
or
git diff @{upstream-of-the-remote}

-- Basically when a tool has a feature in all cases for a purpose, you need know howto for any ambiguity which could arise out any sequence of those possible case.
There s no way to have it in advance
and hence a good or bad dev #UX or #repl are so important
eg --porcelain disables the summary's "helpful" habit of simplifying refs/heads in ways that make them ambiguous if you've made a mistake in your config.

Fedi, is there a way to view which version of git a particular Forgejo server is running, assuming I am an ordinary user and not an admin? api/v1/version shows the Forgejo version, but not the git version.

This is mainly for my curiosity and not for a practical purpose.

#git #Forgejo