welcomewerkstatt, to github German
@welcomewerkstatt@norden.social avatar

Kennt ihr #Git? Auch wenn ihr kein(e) Programmierer:in seid, dann seid ihr bestimmt schonmal auf #GitHub, #GitLab o.Ä. gestoßen. Auch als Designer:in, Maker:in, Texter:in oder einfach nur zum Projektmanagement spielen Git und die dazugehörigen Plattformen heute eine große Rolle. Wir erklären Git/GitHub/GitLab für Nicht-Programmierer in einem dreistündigen Workshop am Sonntag, den 19. Mai. https://www.welcome-werkstatt.de/veranstaltungen/git-fuer-nicht-programmierer

bagder, to random
@bagder@mastodon.social avatar

has proudly served as the HTTP(S) engine in for nineteen years now.

adamchainz, to django
@adamchainz@fosstodon.org avatar

✍️ New post on searching through Django’s Git log.

🔎 I often do this to find behaviour changes when upgrading client projects, at least for larger ones.

https://adamj.eu/tech/2024/04/24/django-pinpoint-upstream-git/

leanpub, to ComputerScience
@leanpub@mastodon.social avatar

Git y GitHub desde cero by Brais Moure is free with a Leanpub Reader membership! Or you can buy it for $9.99! http://leanpub.com/git-github

vwbusguy, to opensource
@vwbusguy@mastodon.online avatar

PSA: Do not submit "omnibus" pull requests to #git repos, especially without talking to the maintainer first. Keeping PRs generally focused to one particular problem or feature makes things far more manageable for reviewing, testing, and reverting/bug-fixing later on. I would always much rather have 10 smaller PRs focused one specific thing each than one massive unsolicited one with a bunch of scope creep.

#opensource #programming

Retcon, to macos
@Retcon@indieapps.space avatar

β25 is now available!

It's a big mix of small and medium-sized changes:
– A spiffy new welcome window, with recent repos
– You can now open a special example repository for testing things, that resets when you close its window. Go nuts!
– Check the global Git config using the sensibly-formatted table in Settings.
– Never forget about a rebase again: Retcon shows a big obvious badge in the Dock whenever you're paused for editing.

#macOS #git

A macOS app settings window. The Git tab is selected. At the top of the window, a paragraph says: “Retcon supports the following Git configuration options. Use the command line to set them either globally, or for a specific repository.” Then, a table lists various Git configuration options, and their values. Some of the options are: Name, Email, Base ignores file, Difftool, Mergetool, Follow HTTP redirects
The macOS Dock. In the middle, there is the app icon for Retcon. It has a pause icon in a red badge. Surrounding it are the icons of: Nova, TextMate, DevRunner, and Xcode.
A screenshot of Retcon's update window. The release notes are: Retcon 1.0.0 β25 April 23rd, 2024 NEW Welcome window See recent repositories or quickly open a new one Open an example repository for trying out manipulations Settings Choose auto-update behavior See global values for supported Git settings A badge in the Dock now indicates if the app has paused for editing IMPROVED When a push is unable to fast-forward, force pushing is suggested Force push menu option is no longer hidden Orphaned stage lines now have a prominent striped background Retcon now shows a prompt for completing user details when relevant Retcon now automatically recovers from errors that occur while paused FIXED Couldn't fixup merge commits Empty commits are now automatically discarded Tab indents in file diffs were misaligned Scrolling through diffs could be stuttery Diff elements could be layout improperly Disable difftool actions when no tool is set Whitespace is now trimmed when entering new branch name In empty repositories, initial branch name was ignored

darthvader42, to random German
@darthvader42@sueden.social avatar
frankel, to random
@frankel@mastodon.top avatar

How to rebase against another branch overriding conflicts with your own branch changes #git

https://demisx.github.io/git/rebase/2015/07/02/git-rebase-keep-my-branch-changes.html

abcdw, to github
@abcdw@fosstodon.org avatar

The nice thing about sourcehut: API is exposed to me to the full extent and I can easily integrate things how I want.

https://man.sr.ht/lists.sr.ht/api.md
https://man.sr.ht/todo.sr.ht/api.md

#git #sourcehut #github #gitlab

hamoid, to random
@hamoid@genart.social avatar

I always find "Accept yours" vs "Accept theirs" confusing, when I'm the author of both... How to interpret yours and theirs? Local and remote? #git

joachim, to random
@joachim@drupal.community avatar

#git commands I need, part 1: git related: show me all the branches that contain the same issue number in their name as the current branch

adamchainz, to random
@adamchainz@fosstodon.org avatar

✍️ New post with a command for discovering the first tag containing a given commit.

$ git describe --contains <sha> | sed -E 's/[~^][0-9]*//g'

#Git

https://adamj.eu/tech/2024/04/22/git-show-first-containing-tag/

boilingsteam, to linux
@boilingsteam@mastodon.cloud avatar
leanpub, to ComputerScience
@leanpub@mastodon.social avatar

Git y GitHub desde cero: Guía de estudio teórico-práctica paso a paso más curso en vídeo https://leanpub.com/git-github by Brais Moure is the featured book on the Leanpub homepage! https://leanpub.com

Ciantic, to random
@Ciantic@twit.social avatar

Today I learned, the hard way, #Git's

git diff &gt; ..\mypatch.patch

DOES NOT contain untracked files.

Luckily I didn't have that many, but lost all the work in untracked files, as I screwed up also with stash.

leanpub, to ComputerScience
@leanpub@mastodon.social avatar

Git y GitHub desde cero by Brais Moure is free with a Leanpub Reader membership! Or you can buy it for $9.99! http://leanpub.com/git-github

jrf_nl, to random
@jrf_nl@phpc.social avatar

Gotcha!

Time to clean up my messy code littered with debug statements and create a clean atomic commit for public consumption.

joachim,
@joachim@drupal.community avatar

@jrf_nl I have the same technique! I make the messy commits on a branch called sandbox-something and then git merge --squash to either main or a feature branch if it's just one step of many. #git

ovid, to linux
@ovid@fosstodon.org avatar

BitMover's closed-source product, BitKeeper, was used for source control for the #Linux kernel. Larry McVoy, CEO of BitMover, was upset because someone tried to figure out how the BitKeeper worked and he pulled the BitKeeper licenses from Linux developers.

Needing distributed source control, Linus Torvalds created #git in a couple of months.

BitMover is gone and BitKeeper is now open-source, gathering dust, in a git repository.

https://github.com/bitkeeper-scm/bitkeeper

xahteiwi, to random
@xahteiwi@mastodon.social avatar

Opinion: people who staunchly prefer working with Gerrit, and consider anything else inferior, really love working with git-review. And if git-review were not Gerrit specific they would be just as happy with, say, GitLab.

The process that the git-review/Gerrit combo automates/enforces (one commit per change, automatically generated topic branches, change IDs with cross-project uniqueness) could also work just fine by hooking up git-review with the GitLab API.

Discuss.

#Gerrit #Git #GitLab

mikemccaffrey, to random
@mikemccaffrey@drupal.community avatar

Oh, is so much simpler when it is presented like this. ;-)

by @b0rk

smashtie, to world
@smashtie@mas.to avatar

Anyone know if I can cherry pick this reality branch back into the one I tagged in 2012?

#world #programming #git

shanecelis, to vim
@shanecelis@mastodon.gamedev.place avatar

My friend told me this story: “Git ain’t working. Must be your submodules.”

“Here. Let me help you. Hmm, maybe you want to try lazygit.”

“WHAT IS THIS?! YOU MUST BE ONE OF THOSE VIM FREAKS.”

And he was, friends. He was.

aral, to random
@aral@mastodon.ar.al avatar

If you’re working on Kitten¹ from source, please clone a fresh copy.

I just rewrote history to reduce the repository size (correctly this time, including all references from branches, tags, etc.).

The good news is that – contrary to what the Codeberg interface is currently showing the size to be (176MB) – the repository is only about 5MB now so it should only take a couple of seconds to clone.

Related issue: https://codeberg.org/Codeberg-e.V./requests/issues/182

:kitten: 💕

¹ https://codeberg.org/kitten/app

#Kitten #dev #git

abcdw, to random
@abcdw@fosstodon.org avatar

Trying and learning different bug tracking and project management tools for the last few weeks (bugzilla, debbugs, track, redmine, gitlab, taiga, plane, forgejo, phabricator, gitea, sourcehut and a couple more) I have to admit that the most convinient, visually pleasant and functional enough is GitHub Projects :/

#git #projectmanagement #bugs

Cykelero, to macos
@Cykelero@mas.to avatar
  • All
  • Subscribed
  • Moderated
  • Favorites
  • megavids
  • thenastyranch
  • rosin
  • GTA5RPClips
  • osvaldo12
  • love
  • Youngstown
  • slotface
  • khanakhh
  • everett
  • kavyap
  • mdbf
  • DreamBathrooms
  • ngwrru68w68
  • provamag3
  • magazineikmin
  • InstantRegret
  • normalnudes
  • tacticalgear
  • cubers
  • ethstaker
  • modclub
  • cisconetworking
  • Durango
  • anitta
  • Leos
  • tester
  • JUstTest
  • All magazines