Git
this post was submitted on 22 May 2025
1 points (100.0% liked)
Godot
7763 readers
2 users here now
Welcome to the programming.dev Godot community!
This is a place where you can discuss about anything relating to the Godot game engine. Feel free to ask questions, post tutorials, show off your godot game, etc.
Make sure to follow the Godot CoC while chatting
We have a matrix room that can be used for chatting with other members of the community here
Links
Other Communities
- !inat@programming.dev
- !play_my_game@programming.dev
- !destroy_my_game@programming.dev
- !voxel_dev@programming.dev
- !roguelikedev@programming.dev
- !game_design@programming.dev
- !gamedev@programming.dev
Rules
- Posts need to be in english
- Posts with explicit content must be tagged with nsfw
- We do not condone harassment inside the community as well as trolling or equivalent behaviour
- Do not post illegal materials or post things encouraging actions such as pirating games
We have a four strike system in this community where you get warned the first time you break a rule, then given a week ban, then given a year ban, then a permanent ban. Certain actions may bypass this and go straight to permanent ban if severe enough and done with malicious intent
Wormhole
Credits
- The icon is a modified version of the official godot engine logo (changing the colors to a gradient and black background)
- The banner is from Godot Design
founded 3 years ago
MODERATORS
just git
Git
Project.py
Project-v2.py
Project-v2-done.py
Project-v2.1-FINAL.py
Project-v3-FINAL-FINAL.py
Project-USE THIS ONE!.py
…
Hahahaha, I know what you mean
I use git:
branches
master
main
deployment_<timestamp>
pre-master
adding_latest_feature
testing
I don't use version control.
just kidding
I use git.
Magit, which is the best Git porcelain around. Git, because it has an unparalleled free-software ecosystem of developer tools that work with it.
Why is Git's free-software ecosystem so much better than all the other VCSen?
Largely because of marketing (the maker of Linux made this! hey look, GitHub!), but also because it has a solid internal data model that quickly proved to experts that it is fast and flexible and reliable.
Git's command-line interface is atrocious compared to contemporary DVCSen. This was seen originally as no problem because Git developers intentionally released it as the “plumbing” for a VCS, intending that other motivated projects would create various VCS “porcelain” for various user audiences. https://git-scm.com/book/en/v2/Git-Internals-Plumbing-and-Porcelain The interface with sensible operations and coherent interface language, resides in that “porcelain”, which the Git developers explicitly said they were not focussed on creating.
But, of course, the “plumbing” command line interface itself immediately became the primary way people were told to use Git, and the “porcelain” applications had much slower development and nowhere near the universal recognition of Git. So either people didn't learn Git (learning only a couple of operations in a web app, for example), or to learn Git they were required to use the dreadful user-hostile default “plumbing” commands. It became cemented as the primary way to learn Git for many years.
I was a holdout with Bazaar VCS for quite a while, because its command-line interface dealt in coherent user-facing language and consistent commands and options. It was deliberately designed to first have a good command-line UI, and make a solid DVCS under that. Which it did, quite well; but it was no match for the market forces behind Git.
Well, eventually I found that Magit is the best porcelain for Git, and now I have my favourite VCS.
Upvoted for bazaar. Even before git existed bzr and qbzr on windows were more user friendly than git with any gui is now.
Git
CVS.
Wat?
Git
I've been trying out Jujutsu recently.
It's compatible with git repos. The workflow takes a little while to get used to but can be nicer to work with.
can be nicer
Understatement. It solves almost every problem I've ever had with git.
- No more destructive commands.
jj undoorjj op restorecan always put you back into a good state. - Merge conflicts can be ignored until you want to resolve them.
- No "unstaged files" to deal with. Just keep your
.gitignores up to date andjjautomatically tracks new files. - Rebasing and patch management is just incredibly simple.
- It actually has a nice default view of the commit graph.
I used to use StackedGit for a while before switching to Jujutusu. While stg is nice, I think jj is a huge improvement.
Aside from the obvious cases like pruning or garbage collection that remove orphaned or dangling commits, is there anything else destructive that git reflog can't help recover from?
Git here. Subversion for a while before that. And source safe, or as I like to say source "safe", before that.
But maybe a better question would be, what source control hosting site (if any) do you use? And do any of them not forcibly use your code to train their AI?
I use git even though I only know how to commit and push
git stash
git stash pop