robrich, 15 days ago to random

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

brianb, 16 days ago to random

#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, 16 days ago to random

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:

#git #developers #dev

nurkiewicz, 16 days ago to random

I run this #git 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, 17 days ago to fediverse

federate decentralised #git repos through the #fediverse.

twipped, 18 days ago to random

Ya love to see it.

#Git #Delete #DieCodeDie

opdavies, 19 days ago to random

TODO

https://www.oliverdavies.uk/archive/2024/05/06/interactive-staging

#dev #SoftwareDevelopment #git

civodul, 19 days ago to random

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

Yup! Time to consider doing it!

frankel, 19 days ago to random

The guide to #Git I never had

https://medium.com/@jake.page91/the-guide-to-git-i-never-had-a89048d4703a

andrewfeeney, 19 days ago to random

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

#git

nicosomb, 20 days ago to random French

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, 20 days ago (edited 20 days ago) to rust

Meet oct-git, a new #OpenPGP signing and verification tool for use with the #Git 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)

#RustLang #PGP #GnuPG #gpg #Nitrokey #YubiKey

mjaschen, 20 days ago to php German

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

#BikeRouter #Gravel #CycloCross #Spreewald #DahmeSpreewald #Wüste #Ergonomie #Notebook #Desktop #ollama #cachetool #PHP #opcache #macOS #Git #Techno

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

kubikpixel, 22 days ago to email German

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
—
#hack #gitlab #git #email #hacking #schwachstellen #account

davidshq, 22 days ago to NoStupidQuestions

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

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

A git status shows everything is great but five seconds later #VSC 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

#question #problem #help

prma, 23 days ago to random

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?

#git #radicle

stevegrunwell, 23 days ago to random

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

njoseph, 23 days ago to rust

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

#Rust #Magit #Emacs #Git #gitu #HelixEditor

hugovk, 24 days ago to python

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 #Python #CPython #Git #GitBlame #history

irfan, 24 days ago to random

People love recommending and raving about #Syncthing - it's a really cool project but honestly despite thinking hard about it, I still have not found any use for it (which is a lil frustrating ngl). I think the issue is I'm already used to syncing stuffs through #Git anyway lol and I kinda prefer it since it's a lil more "explicit" or intentional + you could add notes/context to the commit if needed.

adamchainz, 24 days ago to random

Yay, I got my book update covered in this month’s #Git Rev News, the official Git newsletter. Check it out, lots of fun links including many new tools: https://git.github.io/rev_news/2024/04/30/edition-110/

AndriiKuznietsov75, 24 days ago to webdev Ukrainian

📚Добірка чіт-листів для вивчення Full-Stack розробнику
#HTML http://htmlcheatsheet.com
#CSS http://bit.ly/cheatcss
#JS http://overapi.com/javascript
#JQuery http://oscarotero.com/jquery
#React http://bit.ly/reactcheat
#Node http://overapi.com/nodejs
#ExpressJS http://bit.ly/expresscheat
#Python http://pythoncheatsheet.org
#Django http://bit.ly/djangocheat
#MongoDB http://bit.ly/mongocheat
#Git http://bit.ly/cheat-git
#Linux http://bit.ly/linuxcheat

bram85, 25 days ago to emacs

magit-find-file allows you to open a file at a certain revision, which could be a (relative) timestamp. Notation: HEAD@{3 days ago}.

Using these bits, I wrote a small #emacs command that displays a file at a certain moment, chosen with the built-in calendar.

(defun bram85-magit-find-file-as-of (datetime)  
 (interactive (list (org-read-date)))  
 (let ((rev (format "HEAD@{%s}" datetime)))  
 (magit-find-file rev (magit-read-file-from-rev rev "File: "))))  

#magit #git

hypolite, 25 days ago to random

$ git emote -v
😳
$

#git #typo