Login

Recent searches

No recent searches

Search options

Not available on photog.social.
photog.social is one of the many independent Mastodon servers you can use to participate in the fediverse.
A place for your photos and banter. Photog first is our motto Please refer to the site rules before posting.

Administered by:

Server stats:

286
active users

photog.social: AboutProfiles directoryPrivacy policy

Mastodon: AboutGet the appKeyboard shortcutsView source codev4.3.7

#git

24 posts24 participants1 post today
Public
stib

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"

#ISuckAtGit
Public
stib

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
#coding#ISuckAtGit#AskFedi
Public *
Jukka Niiranen

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 more 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

Use whatever works for you Linus Torvalds on his choice of text editor Part of it is probably, I’ve been doing it so long that I can only do things in certain ways. I’m still using the same editor that I used when I was in college because my fingers have learned one thing and there’s no going back. And I know the editor is crap and I maintain it because it’s a dead project that nobody else uses. So, I have a source tree and I compile my own version every time I install a new machine and I would suggest nobody ever use that editor but I can’t. I’ve tried multiple times finding an editor that is more modern and does fancy things like colorize my source code and do things like that. And every time I try it, I’m like, “Yeah, these hands are too old for this.” So I really hope there’s no project that comes along that makes me go, “I have to do this.”
Public
Komodore68

Es gab mal eine Zeit, da wurden Witze nicht mehr einfach so gesendet, sondern verpackt in eine #PowerPoint-Präsentation. Jede Dummheit lässt sich steigern, ein paar Stufen weiter ist ein git-CheatSheet-Papier abgefilmt und als #Youtube-Video präsentiert.

#git #IT #Entwickler #WieDoofKannManEigentlichSein

youtu.be/DKsChXqQBnk?si=-j5Y-6

YouTubeGit Cheatsheet #coding #github #shortsvideo #viralvideo #shorts #programmer #coder #programmingBy Code With Mani
Public
2something

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

Public
Ukiah Danger Smith

Help me understand why #jujutsu #jj is worth using.

I am pretty happy using #git as is. My workflows are generally pretty simple, branch, commit, PR, squash, and merge.

My biggest pain points are when, rarely, a coworker will branch my branch and then I will have to handle the merge after I've rebased -i my branch.

I don't have any issues with git concepts or mental model. I rebase -i a lot, but rarely use the reflog. Only once did I lose any real work.

Re-post for visibility #git #vcs

Public
Jonathan Matthews

TL;DR is there a way to use git to provide out-of-band *per-line* commentary on content changes? Perhaps using git-notes?

Imagine you have a plaintext document that needs review.

Broadly, a review could be "change line 42 from X to Y", which can be captured by "a git commit"; but could also include "if we change L42 from X to Y then what about effect Z?" - in other words: commentary.

Is there a #git-y way to store, transmit, & then display such per-line comments, *external* to the source doc?

SearchLive feeds
About