r/git

Absolute beginner here, I want to start using git or any other version control for my game but every guide/tutorial I try to learn from is just Github Github Github. I don´t want backup on other servers I just want to be able to get back if I screw up.

Hey everyone I already know some basics of Git and GitHub but I’m still not confident with it. Today I watched a 2hour YouTube video but it was quite advanced, used Mac commands and is also pretty old (about 5 years ago). So I want something more beginner friendly and up to date. Any recommendations for good channels or videos with the current version?😭

How often do you use git vs saving files. I tend to save after every chance but only commit when I am done with the files for that session.

Part of me wishes I could get git to commit with each commit but know that would be messy

I came up with an autosave plugin for git. I've been developing a hobby of writing lately, and in my effort to allow myself to write and edit stories locally, I realized I would be missing out on the autosave functionality that Reedsy's editor provides. I tried using Syncthing for a while (and I still do), but I realized while working on another project that Git can probably do something similar with a plugin. Thus, git-autosave.

It works by having the daemon watch for edits to the repository, then creating a commit automatically. The commit is not put on any branch, but instead saved to refs/autosave/autosaves/<device id>/<branch name>. Running git restore-autosave fetches all of the references in that namespace from the remote, and merges an autosave from another device into your working directory. If there's more than one autosave available, then you are given the choice to select one. This is done without creating a new commit, so autosaves will not infect your commit history.

It's also fairly robust if you decide to work without an internet connection. Unpushed autosaves are stored in a queue, to be pushed when the computer regains internet. All repositories are pushed automatically when the device restarts.

I don't know how much maintenance I'll do to this system in the future, but I thought somebody might find it interesting, so I figured it was worth sharing.

https://botahamec.dev/cgit/git-autosave

The offensive potential of squashing was suggested to me, and I was blown away. I really thought it was just about how people liked to look at their graphs, and I had no inkling there was an element like this. Please help me recalibrate.

Situation: you submit a pull request, which is accepted, but acceptance requires that your commits be squashed into a single commit when the PR is merged.

How does this make you feel? Does it bother you? Would you care? Is it oppressive or otherwise unpleasant? Do you feel contempt or disdain for the maintainer? Would it deter you from a contribution, or make you hate your boss? Describe the emotions involved and overall experience.

Some details:

You are allowed to determine the commit message for the squashed commit, and you don't have to do the squashing or rebasing, it's automatic. Your feature branch history can be anything at all, and it will remain in the PR on the server, just not in the history of the main branch.

Hi. Is there fully portable Git client with GUI that can I have on USB stick? Including SSH and GPG keys. And best, if it is for Windows and Linux.

Thanks.

Hey everyone.

I’ve been using the classic Git Graph extension for a long time. It works, but it hasn't received an update in over 3 years and the UI feels pretty dated at this point.

I got tired of waiting for updates, so I built my own replacement: Git Graph Plus.

I rewrote it from the ground up using Svelte. The main goal was just to make it cleaner, and actually maintain it. You can do all the usual stuff you’d expect branching, merging, rebasing, cherry-picking right from the visual graph.

It’s completely open source. If you're still using the old extension and want something a bit more modern, give it a try and let me know how it feels.

Repo is here: https://github.com/the0807/git-graph-plus

VS Code Marketplace: https://marketplace.visualstudio.com/items?itemName=the0807.git-graph-plus

https://preview.redd.it/gtwyja918yvg1.png?width=2854&format=png&auto=webp&s=5005875a43c38c6d94ef0e3cdf62ee72c9cb739c

If you run into bugs or have feature requests, drop an issue on GitHub or just let me know here. Thanks.

git-stage-batch adds named deferred change sets (“batches”), multi-pass staging, and finer-grained patch selection on top of the usual hunk workflow. I built it because git add -p and rebase alone weren’t enough for large refactors. The stateful CLI is especially useful for autonomous and scripted workflows to stage commits from a dirty working tree, but there's a tui, too.

I'm interested in feedback from people who obsess over commit hygiene.

https://halfline.github.io/git-stage-batch/

What does Staging really mean?

I know I can stash and do this, but I'm just wondering what cherry-pick actually expects.

I currently have two unstaged files. The commit that I want to cherry-pick will touch neither of these files, so I don't know why it complains "your local changes would be overwritten by cherry-pick".

If I do cherry-pick --no-commit then the change is cleanly applied, so I'm thinking why it can't just commit that instead of me having it write the commit in an additional step.

I think if there was nothing staged before the cherry-pick, and the files being overwritten by the cherry-pick are the same as in the cherry-picked commit's parent, then it should've worked. The state of the other unrelated files shouldn't matter.

Is this just git being extra cautious and not wanting to deal with any potential edgecases? I'm trying to understand what's the worst thing that can happen if I were to implement this in a script/alias.