So You Think You Know Git - FOSDEM 2024
youtu.be
external-link
Scott Chacon's FOSDEM 2024 talk on Git Tips and Tricks.Scott talks about:* 06:25 Helpful git config stuff * 09:42 Oldies but goodies * 16:22 Newer git option...

Nobody knows git. We all just run the few basic commands, then again with the -f switch just in case. Then if that doesn’t work, reclone.

Same same

Eager Eagle
link
fedilink
English
217M

nonsense - never just delete the project and start fresh. You spend 20min trying to diagnose the problem by searching for the error messages and looking at the manual, then 1h-2h trying different solutions that only make the problem worse up to the point you actually think you lost your changes, then you realize your changes were stashed all along, then you apply them and notice you still have the same original problem. You try a few more commands that get you to a detached head. Then you try to solve a detached head, realizing after 30 min it’s an impossible task, and only then you delete everything and start fresh.

I see you have been spying on me for some time.

Omg i can feel this xkcd

slazer2au
link
fedilink
English
57M

Git pull

Git push

Git stash

The only 3 I know.

Eager Eagle
link
fedilink
English
6
edit-2
7M

that and git log + git status to “debug git”

anything else is a magic spell you copy from stack overflow

ono
link
fedilink
English
37M

I wish Mercurial had won.

I’m with you. Hg-git still is to this day the best git UI I know…

ono
link
fedilink
English
07M

deleted by creator

@Lodra@programming.dev
link
fedilink
English
37M

I started using git meaningfully about 10 years ago. Mercurial maybe 6 years ago but not very much. And I was not a fan. Especially how it tracks things recursively.

So honest question. Why?

ono
link
fedilink
English
2
edit-2
7M

Mercurial has comparable features (though maybe not obvious to someone accustomed to git) without the usability problems that still plague git nearly two decades later. Hg’s interface was made with humans in mind. Git’s was made to cut you.

(And it has cut so very many people that it’s consistently among the most popular topics in Q&A forums, and has even inspired comics.)

Thankfully, git’s early cross-platform shortcomings were eventually fixed, so that’s at least some progress. I hope its UI and docs eventually get some love, too.

Uh…I know enough to get in trouble with it?

@Kissaki@feddit.de
link
fedilink
English
47M

Regarding visual client: I’ve been using TortoiseGit since early on and no other client I’ve tried came close.

I use the log view and have an overview, and an entry point to all common operations I need. Other tools often fail on good overview, blaming through earlier revisions, filterable views of commits or files, or interactive rebase.

This was a really good talk! I’ve been using git for about a decade, but I learned several new things. Here’s a few:

  • Sorting git log by committer date
  • Speeding up common operations on bigger repos with git maintenance
  • More useful file blame with the -C flag on git blame
Create a post

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person’s post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you’re posting long videos try to add in some form of tldr for those who don’t want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev



  • 1 user online
  • 1 user / day
  • 1 user / week
  • 1 user / month
  • 1.11K users / 6 months
  • 1 subscriber
  • 1.21K Posts
  • 17.8K Comments
  • Modlog