So You Think You Know Git? - FOSDEM 2024

Comments

• Thorry84@feddit.nl ⁨9⁩ ⁨months⁩ ago

  No, I do not.

  xkcd.com/1597/

  source

  • eager_eagle@lemmy.world ⁨9⁩ ⁨months⁩ ago

    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.

    source

    • agent_flounder@lemmy.world ⁨9⁩ ⁨months⁩ ago

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

      source
  • PoisonedPrisonPanda@discuss.tchncs.de ⁨9⁩ ⁨months⁩ ago

    Omg i can feel this xkcd

    source

    • slazer2au@lemmy.world ⁨9⁩ ⁨months⁩ ago

      Git pull

      Git push

      Git stash

      The only 3 I know.

      source

      • -> View More Comments
  • ono@lemmy.ca ⁨9⁩ ⁨months⁩ ago

    I wish Mercurial had won.

    source

    • u_tamtam@programming.dev ⁨9⁩ ⁨months⁩ ago

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

      source
  • PanoptiDon@lemmy.world ⁨9⁩ ⁨months⁩ ago

    Same same

    source
• tinkeringidiot@lemmy.world ⁨9⁩ ⁨months⁩ ago

  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.

  source
• tunetardis@lemmy.ca ⁨9⁩ ⁨months⁩ ago

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

  source
• Kissaki@feddit.de ⁨9⁩ ⁨months⁩ ago

  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.

  source
• technojamin@lemmy.world ⁨9⁩ ⁨months⁩ ago

  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

  source
• ono@lemmy.ca ⁨9⁩ ⁨months⁩ ago

  I wish Mercurial had won.

  source

  • Lodra@programming.dev ⁨9⁩ ⁨months⁩ ago

    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?

    source

    • ono@lemmy.ca ⁨9⁩ ⁨months⁩ ago

      Mercurial has comparable features (though maybe not be 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. Here’s hoping its UI and docs eventually get some love, too.

      source