hmhackmaster, to random
@hmhackmaster@boldcity.social avatar

I tell you what, every time I look at repos and figuring out forks and pull requests, I am reminded how little I know about how do it all.

But that's why I have a dozen or so test repositories: So I can break my own stuff!

adamchainz, to random
@adamchainz@fosstodon.org avatar

hard truth

me, to random

My understanding of is that it is very comparable with feature-wise. I only use Git because I discovered it first. It just so happens that it seems to have become the de-facto standard version control system these days.

For those who use Mercurial instead: why? Does it offer something that Git does not, or is it simply personal preference/familiarity?

bradwilson, to github
@bradwilson@mastodon.social avatar

I have a permanent branch that's never going to be merged into main. Is there any way to get GitHub to stop asking me if I want to merge it whenever I push new commits to it? I want this to go away for specific branches (I'll also accept it going away for all branches, because I mostly don't care about this).

daviwil, to guix
@daviwil@fosstodon.org avatar

🔴 Today on Live, we'll attempt to use Guix to self-host our own Git "forge" using Forgejo!

We'll package the Forgejo binary and create a Guix service so that it can be hosted in a container. We'll also see if we can wire up Laminar to launch CI builds when you push to repositories!

Join us here:

🕐 in your time zone: https://time.is/compare/1800_in_Athens

scy, (edited ) to markdown
@scy@chaos.social avatar

Okay. I really wanted to love https://xwmx.github.io/nb/ for personal knowledge management. While most of its design choices (especially: , & ) are exactly what I’m looking for, its todo management features are severely lacking:

• no arbitrary nesting of tasks (only top-level “todos” with a single sublevel of ”tasks”), no dependencies
• due dates are attached to todos, not tasks, can’t be queried(!) or repeat
• priorities, contexts etc. would need to be modeled via hashtags

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

I’ve gone from using the git command-line exclusively to almost exclusively using Sublime Merge.

I basically just keep it open on its own monitor as a real-time dashboard of all my changes. That, and the ease with which you can stage hunks and lines, has improved the quality of my commits and also gives me greater peace of mind.

(Downside: it’s a commercial app and Linux support exists but isn’t first class. e.g., doesn’t automatically respond to light/dark mode changes.)

anniegreens, to random
@anniegreens@social.lol avatar

What Github alternative are people using now? I've used many others for work projects, but never for personal, but I'd like to migrate out of Github at some point.

blaise, to programming
@blaise@hachyderm.io avatar

Is it weird that I feel completely comfortable with ?
I noticed that most of the folks I run into are ill at ease when they interact with their repo.

The resources available tend to either

  • explain how (all of) git works.
    Or
  • provide a few stanzas of incantations to accompany the ritual sacrifice.

I wonder if there's an audience for a "git therapist"?

"Do you think your struggles with merge conflicts may be rooted in early experience with svn ?...."

sonny, to cochlearimplants
@sonny@floss.social avatar

One trick to make your life much better as a maintainer and help contributors

Have a Makefile directive to run everything that runs on CI

make x is all it should take to verify the changes pass automated tests

Linter, formatter, sorter, unit tests, etc

If tooling is needed then add a make setup directive that takes care of installing it

jwildeboer, to random German
@jwildeboer@social.wildeboer.net avatar

basierter Workflow für den . Ein Seminar. (warum nicht? mit Forgejo oder Gitlab hat man schon fast ein komplettes Ticketsystem und Dokumentenmanagement mit Versionsverwaltung ;)

adamchainz, to random
@adamchainz@fosstodon.org avatar

Yay, updated their docs to recommend the ~/.config/git/ignore for ’s global ignore file over ~/.gitignore_global. Using ~/.config is a standard, avoids cluttering your home directory, and requires no extra configuration.

https://github.com/github/docs/pull/27557/files#diff-2a8f34713f64309f250baf7c6789a9be7fef24b6f2a25c5911ab1d7806d99663L44

tk, to random
@tk@bbs.kawa-kun.com avatar

Looks like a power outage during a bup backup killed the repo it targeted and none of the rescue methods I’ve found have worked. Guess it’s time to switch to duplicity. 🤷

adamchainz, to random
@adamchainz@fosstodon.org avatar

♦️ There is a safer alternative to 'git push --force'!

🫸 Use --force-with-lease and --force-if-includes to restrict force pushes so that they don’t unintentionally overwrite commits pushed by others.

Explained in my post: https://adamj.eu/tech/2023/10/31/git-force-push-safely/

#Git

fell, to programming
@fell@ma.fellr.net avatar

Post your latest commit message. I'll start:

> Fixed a possible crash during the trophy cutscene that could happen if the stadium did not have a scheduled match and was not associated with an owning club.

#c

ahelwer, to random

pro-tip: register your SSH public key with your software forge (sourcehut, github, gitlab, etc.) and push/pull repos via SSH. Then use that same SSH key to sign your commits locally! Bonus points for deriving your SSH key from a FIDO/U2F hardware authenticator for extra security: https://wiki.archlinux.org/title/SSH_keys#FIDO/U2F

amoroso, to random
@amoroso@fosstodon.org avatar

This introduction to Git aims to "reveal a bit of the simplicity underlying it". I'm not sure Git is as simple as it is to the author, but this work does help understand a little bit more on the tool and amek it feel less confusing:

https://jwiegley.github.io/git-from-the-bottom-up/

adamchainz, (edited ) to python
@adamchainz@fosstodon.org avatar

🕺 From 3.13, virtual environments created by venv will come with a ignore file, thanks to @brettcannon ’s PR merged yesterday. There’ll be no need to add .venv (or whatever) to your .gitignore file then..

FYI the virtualenv package already does this 😁

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

adamchainz, (edited ) to random
@adamchainz@fosstodon.org avatar

How do you like to blame?

obrhoff, to macos

After 10 years of Tower I'll want to checkout some other clients? What can you recommend under macOS? I thought about giving Sublime Merge a chance?

https://www.sublimemerge.com/

scy, to random
@scy@chaos.social avatar

There was a time when I thought that #Git's commit ID being a Merkle tree style hash over all the content, including metadata, was a good thing. You change one byte anywhere in the history, Git notices instantly¹.

But I'm not so sure about this anymore. Names change. Email addresses change.

Should removing my previous name, that's now causing me pain, from the internet really break the integrity of my project?

¹ Actually, it doesn't. Not instantly. Re-hashing all of the history is expensive.

weirdwriter, to random

Hey Git experts, I'm thinking about moving to because I know Microsoft will scrape and steal everything on Github in the name of AI, if not soon, then eventually, and my question is, when I push and commit changes, how can I be sure it pushes to Codeberg and not Github, since I do have Github CLI installed, or does it push to where I pulled the repo from automatically?

amoroso, to linux
@amoroso@fosstodon.org avatar
amoroso, to random
@amoroso@fosstodon.org avatar

I know, Git is a mess. But, since we're stuck with it, we may as well try to learn how it works with resources like this, which aims to lead to some form of Git enlightenment.

https://think-like-a-git.net

nobodyinperson, to random
@nobodyinperson@fosstodon.org avatar

🍿

> git annex assist
...
symlinkPointsToGitDir: symlink target points to git dir
remote: fatal: fsck error in pack objects
error: remote unpack failed: unpack-objects abnormal exit

IIUC, :git: #git implemented something that uselessly breaks :gitannex: #gitAnnex / :datalad: #DataLad compatibility on the remote side, amazing! 🤦

https://github.com/git/git/commit/a33fea0886cfa016d313d2bd66bdd08615bffbc9

Initial report:

https://git-annex.branchable.com/forum/Strange_symlinkPointsToGitDir_error/#comment-12ed3e72e46de9b086da51455f20b26b

@joeyh @mih @chrysn

  • 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