nrw.social ist einer von vielen unabhängigen Mastodon-Servern, mit dem du dich im Fediverse beteiligen kannst.
Wir sind eine freundliche Mastodon Instanz aus Nordrhein-Westfalen. Ob NRW'ler oder NRW-Sympathifanten, jeder ist hier willkommen.

Serverstatistik:

2,8 Tsd.
aktive Profile

#git

57 Beiträge55 Beteiligte0 Beiträge heute

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

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

Antwortete im Thread
So, I made a #pr on #esphome #git #repository to add support to the #waveshare 7,5 inch BWR #epaper display, now let's wait for a review: https://github.com/esphome/esphome/pull/8556/commits/740253762d5c4d79920f5838bd083af435cbb764
I never contributed to esphome, nor to a C project, nor to an #embedded project in general, so I hope my #code is adequate, but I would not be surprised if I need to change something...
Let's see!

For some reason, this morning is the day I've (finally) decided to take some time to actually learn #git in a more systematic way than my current approach of googling as I go along and inevitably forgetting how I solved the last problem... 🙈

I enjoyed reading and answering the quiz questions of the W3 schools tutorial (w3schools.com/git/) and I'm grateful to the #Stackoverflow peeps who have asked the same silly questions that I've been asking myself and to the kind people who patiently answered them. Now I know that "origin" doesn't have a particular meaning, it's just an alias for a URL and that there is a system to the use of one or two dashes in git commands (okay, I could have admittedly worked that one out by myself but trial-and-error served me just fine for the past few years... 🙃).

www.w3schools.comW3Schools.comW3Schools offers free online tutorials, references and exercises in all the major languages of the web. Covering popular subjects like HTML, CSS, JavaScript, Python, SQL, Java, and many, many more.

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?

Poll #git: are you using a mergetool?

I personally just use the builtin `conflictstyle = zdiff3`, and emacs recognize it well by default, but I'm curious.

If using a mergetool please tell which one, for how long, and how helpfull it feels :)

(Boost for reach maybe?)