inautilo (@inautilo@mastodon.social)
#Development #Releases
Highlights from Git 2.54 · Rewrite history with ‘git history‘, config-based hooks, and more https://ilo.im/16cd4p
_____
#Programming #Coding #VersionControl #Git #Repositories #DevOps #WebDev #Frontend #Backend
Show Original Post
smartgit (@smartgit@techhub.social)
During a normal git merge, what does the block above ======= represent?
Plaintext
<<<<<<< HEAD
console.log("current branch");
=======
console.log("incoming branch");
>>>>>>> feature
Ready for the reveal? 🥁 Check if you got it right and tackle more Git brain-teasers with instant feedback here 👉 https://www.git-skills.dev/quiz/conflicts-concepts/#q-what-do-conflict-markers-mean-during-a-merge
#Git #SmartGit #Coding #Programming #SoftwareEngineering #CodeNewbie #DeveloperLife
Show Original Post
soulcutter (@soulcutter@ruby.social)
I successfully used jj to rebase a commit (revset?), arrange some commits, and squash. Pushing changes to github was/is still a slight headscratcher to me - it’s at the intersection of jj and git - but still, I got it done and it wasn’t too painful.
I like the jj log . There’s still git-like stuff I’m trying to either translate or unlearn for jj, but I’m less lost than yesterday. 🦾
Show Original Post
pkw (@pkw@snac.d34d.net)
I love git, I always have.
It's a massive improvement over cvs and svn.
(Maybe part of the problem was that svn was very much
NOT an improvement over cvs.)
Anyway today I learned:
#git
git push <remote> --tags
Show Original Post
n (@n@gotosocial.tourmentine.com)
[lien] Junio Hamano : l'homme qui maintient Git depuis 2005 - Journal du Hacker (ShevAbam) #gik #git
Show Original Post
journalduhacker (@journalduhacker@framapiaf.org)
Junio Hamano : l'homme qui maintient Git depuis 2005
https://blog.shevarezo.fr/post/2026/04/22/junio-hamano-l-homme-qui-maintient-git-depuis-2005
#git
Show Original Post
webstandards_ru (@webstandards_ru@mastodon.social)
Обзор новинок Git 2.54. Тейлор Блау рассказывает о новых командах: git history reword открывает редактор с сообщением коммита и переписывает его на месте, не затрагивая рабочее дерево или индекс, а git history split позволяет интерактивно разделить коммит на два, выбирая участки кода для нового родительского коммита. В отличие от git rebase, эти команды работают в пустых репозиториях и отказываются выполнять операции с конфликтами слияния. #git #tools
https://github.blog/open-source/git/highlights-from-git-2-54/
Show Original Post
webstandards_dev (@webstandards_dev@mastodon.social)
Highlights from Git 2.54. Taylor Blau walks through new features including git history reword, which opens your editor with a commit’s message and rewrites it in place without touching the working tree or index, and git history split, which lets you interactively split a commit into two by selecting hunks to carve out into a new parent commit. Unlike git rebase, these commands work in bare repositories and refuse operations that would cause merge conflicts. #git #tools
https://github.blog/open-source/git/highlights-from-git-2-54/
Show Original Post
ljwrites (@ljwrites@writeout.ink)
@natweaver I use #Emacs Org Mode for idea and research notes and plaintext first drafts, with #Git (through the Magit interface) for version control. After drafting on my own I export to .odt or .docx for editing on #LibreOffice and sharing/submitting. For one huge project I use #TiddlyWiki for interconnected, citation-tracked research notes. Still migrating my notes over from #Zotero for that last part.
Show Original Post
gnome (@gnome@felipeborges.eu)
git-stage-batch helps you build a sane #git history incrementally, by letting you stage code changes hunk-by-hunk/line-by-line. https://halfline.github.io/git-stage-batch
Show Original Post
bidjadtech (@bidjadtech@mastodon.social)
قدمت Git 2.54 أمر "git history" التجريبي لإعادة كتابة الالتزامات بشكل مستهدف، مما يسمح للمستخدمين بإعادة صياغة أو تقسيم الالتزامات دون التأثير على شجرة العمل. يمكن الآن تعريف الخطافات في ملفات التكوين، مما يتيح إدارة مركزية مرنة ومشاركة أسهل عبر المستودعات. كما أصبح التعبئة الهندسية الافتراضية لاستراتيجية الصيانة، مما يحسن كفاءة الصيانة اليدوية.
Show Original Post
kubikpixel (@kubikpixel@chaos.social)
«Git 2.54 — Experimenteller Befehl für Commit-Historie:
Im neuen Release bringt die Versionsverwaltung den experimentellen Befehl git history, um beispielsweise Fehler zu korrigieren oder einen Commit aufzuteilen.»
Nächster Schritt um weiter Git zu lernen, denn mensch lernt nie aus.
P.S. Ich hatte auch schon mal in einer WebDev Firma gearbeitet bei der der Chef für unnötig & zu Kompliziert für "Nichts" abwies.
#git #neuefunktion #codehistory #coding #newrelease
Show Original Post