pawelgrzybek, to random
@pawelgrzybek@mastodon.social avatar

After using lazygit for a few days, I am completely sold. It makes working with git really enjoyable!

https://github.com/jesseduffield/lazygit

#git

leanpub, to devops
@leanpub@mastodon.social avatar

Learn Git, Bash, and Terraform the Hard Way https://leanpub.com/b/learngitbashandterraformthehardway by Ian Miell is the featured bundle on the Leanpub homepage! https://leanpub.com

leanpub, to random
@leanpub@mastodon.social avatar

Git Prodigy: Mastering Version Control with Git and GitHub https://leanpub.com/git-prodigy by Ebenezer Don is the featured book on the Leanpub homepage! https://leanpub.com

finestructure, to random
@finestructure@mastodon.social avatar

Folks who squash their merges, I’m curious why you are making that trade-off. I’m guessing the pro argument is a cleaner merge graph?

The big argument against it for me is that you lose granularity for git bisect. I've often been able to narrow down breakage (sometimes long past the merge) due to individual commits in the merge. If I'd merged in a giant blob all I'd have had to go by is that giant blob. (1/2)

Ric, to opensource
@Ric@awscommunity.social avatar

I've just published my starters guide to : https://gitlab.com/ric_harvey/git-guide it's free and licensed under the @creativecommons

robrich, to random
@robrich@hachyderm.io avatar

When you are gonna #merge two #git branches after a long time

brianb, to random
@brianb@fosstodon.org avatar

#Git question:

I have a branch that says it's up to date with the upstream (fork of a repo). I'm trying to contribute a patch, but my commit history in the PR has 26 commits from things that have already been merged rather than my changes from the current head.

Is there an acceptable way to clean up that history so my PR is clean?

notsle, to random
@notsle@kzoo.to avatar

Manager: Lets teach a non-developer office worker how to push code to git. "It's just clicking a few buttons. I've done it before. It's not that hard."

Me: :excuse_me:

nurkiewicz, to random
@nurkiewicz@fosstodon.org avatar

I run this command several times a day to keep my branch up-to-date with main:

git checkout $(git_main_branch) && \
git pull && \
git checkout - && \
git rebase -

6d03, to fediverse
@6d03@mathstodon.xyz avatar

federate decentralised repos through the .

twipped, to random
@twipped@twipped.social avatar

Ya love to see it.

opdavies, to random
@opdavies@mastodon.social avatar
civodul, to random
@civodul@toot.aquilenet.fr avatar

“Authenticate your checkouts!”
https://guix.gnu.org/en/blog/2024/authenticate-your-git-checkouts/

Yup! Time to consider doing it!

frankel, to random
@frankel@mastodon.top avatar
andrewfeeney, to random
@andrewfeeney@phpc.social avatar

Is there way to make git add -p include new files?

nicosomb, to random French
@nicosomb@piaille.fr avatar

J'avais un bug à retrouver dans potentiellement 8 mois de développement sur #PrestaShop.

Et donc, #LundiConfession, c'est la première fois que j'utilisais git bisect.
Je connaissais, mais jamais eu réellement besoin de l'utiliser. Si tu veux savoir ce que c'est, tu peux lire ça : https://delicious-insights.com/fr/articles-et-tutos/git-bisect/

#git #tip

hko, (edited ) to rust
@hko@fosstodon.org avatar

Meet oct-git, a new signing and verification tool for use with the distributed version control system:

https://crates.io/crates/openpgp-card-tool-git 🦀

oct-git focuses exclusively on ergonomic use with OpenPGP card-based signing keys

It is designed to be easy to set up, standalone (no long running processes), and entirely hands-off to use (no repeated PIN entry required, by default). It comes with desktop notifications for touch confirmation (if required)

dvzrv,
@dvzrv@chaos.social avatar
mjaschen, to php German
@mjaschen@digitalcourage.social avatar

Wochenrückblick, Ausgabe 39 (2024-18).

Diesmal mit

  • 🗺️ der Bikerouter Hall of Fame aller Supporterinnen bisher ❤️
  • 🚵‍♂️ neuen Reifen für das Crosser-Gravel-Dings und der ersten Ausfahrt damit – unter Anderem zu Deutschlands größter (!) Wüste (!!)
  • 💻 den Erkenntnissen von @atomicpoet zur Ergonomie beim Arbeiten mit dem Notebook vs. Desktop-Computer und wie sich das mit meinen Erfahrungen deckt
  • 🤖 ollama, welches die Möglichkeit bietet, LLMs bequem auf dem eigenen Rechner laufen zu lassen
  • 🐘 cachetool, einem Werkzeug zum Verwalten des PHP opcache
  • 🍎 dem Blick in mein macOS-Applications-Directory: diesmal gibt's den Blick auf alle Apps, die mit „F“ beginnen
  • 🛠️ noch mal Deployment des Blogs, das läuft jetzt tatsächlich mit einem simplen post-merge Hook in Git
  • 🔊 und wie immer Techno

https://www.marcusjaschen.de/blog/2024/2024-18/

kubikpixel, to email German
@kubikpixel@chaos.social avatar

Die machen Werbung über sich, dass ihre KI toll einsetzbar sei und dann das, eine übliche Schwäche von Profi-Dienste. Nicht im Detail, sondern was es betrifft.

»Account-Übernahme möglich – Kritische Gitlab-Schwachstelle wird aktiv ausgenutzt:
Die Schwachstelle ermöglicht es Angreifern, beliebige Nutzerpasswörter über eine eigene E-Mail-Adresse zurückzusetzen. Tausende von Gitlab-Instanzen sind gefährdet.«

👉 https://www.golem.de/news/account-uebernahme-moeglich-kritische-gitlab-schwachstelle-wird-aktiv-ausgenutzt-2405-184798.html

davidshq, to NoStupidQuestions
@davidshq@hachyderm.io avatar

I've got a strange one for all my friends today.

I rebased a local branch of a repo and did the usual push --force to overwrite the remote branch.

A git status shows everything is great but five seconds later is showing the same conflict due to the diverging branches.

If I exit out of VSC I can run git push --force and the conflict doesn't return.

I can open the files in WebStorm and all is fine.

But the moment I open VSC the conflict returns

prma, to random
@prma@fosstodon.org avatar

I have read radicle's FAQ. But I am still not clear what advantages does radicle offer over the mail-list based git workflow.
Any ideas?

stevegrunwell, to random
@stevegrunwell@phpc.social avatar

I performed my first bisect yesterday, thanks to skills I learned from @vanamerongen at 😁

njoseph, to rust
@njoseph@social.masto.host avatar

Magit is one of the "killer apps" of emacs, which one might miss when using a different editor. Helix editor in my case.

gitu is a Git porelain offered in the form of a TUI app with keybindings similar to magit. It's still in active development. I've installed it using cargo for now.
https://github.com/altsem/gitu

hugovk, to python
@hugovk@mastodon.social avatar

It's always fun to see the layers of history when looking at the Git blame of CPython.

Here's an Initial revision from 34 years ago, and GIL removal from 3 months ago.

https://github.com/python/cpython/commit/a3af3cb4f424034b56404704fdf8f18e8c0a9982

  • All
  • Subscribed
  • Moderated
  • Favorites
  • anitta
  • everett
  • hgfsjryuu7
  • Youngstown
  • khanakhh
  • slotface
  • rosin
  • InstantRegret
  • ngwrru68w68
  • kavyap
  • vwfavf
  • thenastyranch
  • DreamBathrooms
  • PowerRangers
  • Leos
  • magazineikmin
  • Durango
  • tacticalgear
  • mdbf
  • cisconetworking
  • ethstaker
  • GTA5RPClips
  • osvaldo12
  • cubers
  • modclub
  • tester
  • normalnudes
  • provamag3
  • All magazines