Urbanists.Social

.:\dGh/:.Let's see what the PHP gods say about that "bug"<a href="https://github.com/php/php-src/issues/18341" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://github.com/php/php-src/issues/18341</a><a href="https://mastodon.social/tags/PHP" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#PHP</a> <a href="https://mastodon.social/tags/Programming" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Programming</a> <a href="https://mastodon.social/tags/SoftwareDevelopment" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#SoftwareDevelopment</a> <a href="https://mastodon.social/tags/Development" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Development</a> <a href="https://mastodon.social/tags/Coding" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Coding</a> <a href="https://mastodon.social/tags/Code" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Code</a> <a href="https://mastodon.social/tags/Software" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Software</a> <a href="https://mastodon.social/tags/WebDevelopment" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#WebDevelopment</a> <a href="https://mastodon.social/tags/WebDev" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#WebDev</a> <a href="https://mastodon.social/tags/Bug" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Bug</a> <a href="https://mastodon.social/tags/GitHub" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#GitHub</a> <a href="https://mastodon.social/tags/Git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Git</a>

Hacker News 50Bauplan – Git-for-data pipelines on object storageLink: <a href="https://docs.bauplanlabs.com/en/latest/" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://docs.bauplanlabs.com/en/latest/</a> Discussion: <a href="https://news.ycombinator.com/item?id=43705991" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://news.ycombinator.com/item?id=43705991</a><a href="https://social.lansky.name/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a>

Benjamin Carr, Ph.D. 👨🏻‍💻🧬<a href="https://hachyderm.io/tags/LinusTorvalds" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#LinusTorvalds</a> built <a href="https://hachyderm.io/tags/Git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Git</a> in 10 days - and never imagined it would last 20 years In a mere 10 days, he developed a working version of Git, which was first committed on April 7, 2005. Of course, he'd been thinking about it for a while. BitKeeper conflict had been brewing almost since the start. In a recent GitHub interview, <a href="https://hachyderm.io/tags/Torvalds" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Torvalds</a> had been facing a question, "How do I do something that works even better than BitKeeper does but doesn't do it the way BitKeeper does it?" <a href="https://www.zdnet.com/article/linus-torvalds-built-git-in-10-days-and-never-imagined-it-would-last-20-years/?utm_source=changelog-news" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://www.zdnet.com/article/linus-torvalds-built-git-in-10-days-and-never-imagined-it-would-last-20-years/?utm_source=changelog-news</a>

Adam Johnson :django: :python:<a href="https://fosstodon.org/tags/Git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Git</a> 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.

stibme: Hi <a href="https://aus.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a>, 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"<a href="https://aus.social/tags/ISuckAtGit" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#ISuckAtGit</a>

Ross A. BakerNeeded to merge one git repository into another for the umpteenth time. This way retains history and issue links:<a href="https://rossabaker.com/articles/merge-two-git-repositories-with-history/" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://rossabaker.com/articles/merge-two-git-repositories-with-history/</a><a href="https://social.rossabaker.com/tags/Git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Git</a>

stibSo I'm trying to get better at <a href="https://aus.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a>. 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 <a href="https://aus.social/tags/BlackMagicFusion" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#BlackMagicFusion</a> it's at <a href="https://codeberg.org/stib/stibs_fuses" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://codeberg.org/stib/stibs_fuses</a><a href="https://aus.social/tags/coding" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#coding</a> <a href="https://aus.social/tags/ISuckAtGit" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#ISuckAtGit</a> <a href="https://aus.social/tags/AskFedi" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#AskFedi</a>

Rod2ik 🇪🇺 🇨🇵 🇪🇸 🇺🇦 🇨🇦 🇩🇰 🇬🇱Linus <a href="https://mastodon.social/tags/Torvalds" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Torvalds</a> a créé <a href="https://mastodon.social/tags/Git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Git</a> en 10 jours - et n'aurait jamais imaginé qu'il durerait 20 ansI ❤️ <a href="https://mastodon.social/tags/Git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Git</a> !<a href="https://www.zdnet.fr/actualites/linus-torvalds-a-cree-git-en-10-jours-et-naurait-jamais-imagine-quil-durerait-20-ans-411859.htm" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://www.zdnet.fr/actualites/linus-torvalds-a-cree-git-en-10-jours-et-naurait-jamais-imagine-quil-durerait-20-ans-411859.htm</a>

The Linux FoundationGit was a side project.Just 10 days of code.20 years after Git’s first commit, Linus Torvalds reflects on what he built (and what he didn’t expect) → <a href="https://github.blog/open-source/git/git-turns-20-a-qa-with-linus-torvalds/" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://github.blog/open-source/git/git-turns-20-a-qa-with-linus-torvalds/</a><a href="https://social.lfx.dev/tags/opensource" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#opensource</a> <a href="https://social.lfx.dev/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a>

joachimFeels a bit dangerous, but I just dealt with <a href="https://drupal.community/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> 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! <a href="https://drupal.community/tags/bash" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#bash</a> <a href="https://drupal.community/tags/xargs" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#xargs</a>

Jukka NiiranenThe 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 <a href="https://mstdn.social/tags/Linux" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Linux</a> and <a href="https://mstdn.social/tags/Git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Git</a>, why couldn't it work for you?<a href="https://github.blog/open-source/git/git-turns-20-a-qa-with-linus-torvalds/" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://github.blog/open-source/git/git-turns-20-a-qa-with-linus-torvalds/</a>

2somethingFedi, is there a way to view which version of <code>git</code> a particular Forgejo server is running, assuming I am an ordinary user and not an admin? <code>api/v1/version</code> shows the Forgejo version, but not the git version. This is mainly for my curiosity and not for a practical purpose. <a href="https://transfem.social/tags/git" rel="nofollow noopener noreferrer" target="_blank">#git</a> <a href="https://transfem.social/tags/Forgejo" rel="nofollow noopener noreferrer" target="_blank">#Forgejo</a>

Elias Probst<a href="https://mastodon.gamedev.place/@grumpygamer" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@grumpygamer</a> haven't tried it myself yet, but I've heard a lot of good things about <a href="https://mastodon.social/tags/Jujutsu" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Jujutsu</a> - an SCM which imposes a much more accessible workflow onto <a href="https://mastodon.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> which is used under the hood and thereby stays 100% backwards-compatible.<a href="https://github.com/jj-vcs/jj" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://github.com/jj-vcs/jj</a>

R-Ladies ParisNous sommes ravis de partager le replay de notre meetup avec notre invitée Maëlle Salmon <a href="https://mastodon.social/@maelle" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@maelle</a> qui a présenté le package {<a href="https://mastodon.social/tags/saperlipopette" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#saperlipopette</a>} et a partagé son expertise sur <a href="https://mastodon.social/tags/Git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Git</a>.📺 Replay : youtu.be/u6XqHOO8g6c<a href="https://mastodon.social/tags/RStatsFr" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#RStatsFr</a> <a href="https://mastodon.social/tags/RStats" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#RStats</a> <a href="https://mastodon.social/tags/RLadies" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#RLadies</a> <a href="https://mastodon.social/tags/Paris" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Paris</a> <a href="https://mastodon.social/@chaimaboughanmi" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@chaimaboughanmi</a> <a href="https://mastodon.social/@mouna_belaid" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@mouna_belaid</a>

Ukiah Danger SmithHelp me understand why <a href="https://mastodon.social/tags/jujutsu" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#jujutsu</a> <a href="https://mastodon.social/tags/jj" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#jj</a> is worth using.I am pretty happy using <a href="https://mastodon.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> 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 <a href="https://mastodon.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> <a href="https://mastodon.social/tags/vcs" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#vcs</a>

Daniele Verducci 🧉So, I made a <a class="hashtag" href="https://social.ichibi.eu/tag/pr" rel="nofollow noopener noreferrer" target="_blank">#pr</a> on <a class="hashtag" href="https://social.ichibi.eu/tag/esphome" rel="nofollow noopener noreferrer" target="_blank">#esphome</a> <a class="hashtag" href="https://social.ichibi.eu/tag/git" rel="nofollow noopener noreferrer" target="_blank">#git</a> <a class="hashtag" href="https://social.ichibi.eu/tag/repository" rel="nofollow noopener noreferrer" target="_blank">#repository</a> to add support to the <a class="hashtag" href="https://social.ichibi.eu/tag/waveshare" rel="nofollow noopener noreferrer" target="_blank">#waveshare</a> 7,5 inch BWR <a class="hashtag" href="https://social.ichibi.eu/tag/epaper" rel="nofollow noopener noreferrer" target="_blank">#epaper</a> display, now let's wait for a review: <a href="https://github.com/esphome/esphome/pull/8556/commits/740253762d5c4d79920f5838bd083af435cbb764" rel="nofollow noopener noreferrer" target="_blank">https://github.com/esphome/esphome/pull/8556/commits/740253762d5c4d79920f5838bd083af435cbb764</a> I never contributed to esphome, nor to a C project, nor to an <a class="hashtag" href="https://social.ichibi.eu/tag/embedded" rel="nofollow noopener noreferrer" target="_blank">#embedded</a> project in general, so I hope my <a class="hashtag" href="https://social.ichibi.eu/tag/code" rel="nofollow noopener noreferrer" target="_blank">#code</a> is adequate, but I would not be surprised if I need to change something... Let's see!

daniel:// stenberg://Can distros ship <a href="https://mastodon.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> that ends up using <a href="https://mastodon.social/tags/OpenSSL" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#OpenSSL</a> (via libcurl)? This bug was filed against Debian:<a href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1094969" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1094969</a>

Elen Le Foll 🇫🇷 🇬🇧 🇩🇪For some reason, this morning is the day I've (finally) decided to take some time to actually learn <a href="https://fediscience.org/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> 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 (<a href="https://www.w3schools.com/git/" rel="nofollow noopener noreferrer" translate="no" target="_blank">https://www.w3schools.com/git/</a>) and I'm grateful to the <a href="https://fediscience.org/tags/Stackoverflow" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Stackoverflow</a> 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... 🙃). <a href="https://fediscience.org/tags/Learning" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#Learning</a> <a href="https://fediscience.org/tags/ThingsNobodyTeachesYou" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#ThingsNobodyTeachesYou</a>

joachimBecause <a href="https://drupal.community/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a> rebase is just a sequence of cherry-pick instructions (the 'pick' ones at least!) you can add a totally foreign commit to the list, for example, to cherry-pick a commit from a different branch earlier in your current branch's history.

Jonathan MatthewsTL;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 <a href="https://fosstodon.org/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#git</a>-y way to store, transmit, & then display such per-line comments, *external* to the source doc?

Recent searches

Search options

Administered by:

Server stats:

#Git