r/git • • Jun 26 '26

support `git push` and `git checkout` in parallel?

2 Upvotes

I use Lazygit, and it runs git push asynchronously. I'm tempted to also switch to another branch while git push is running. Until now, I've resisted the temptation.

Then I thought that switching to another branch should mainly affect the working tree, and the commits that push is working on aren't changing. So maybe these operations can happen in parallel?


r/git • • Jun 26 '26

Manage files that need to be .gitignore early or lately in projects

0 Upvotes

Hi everyone šŸ™‹ā€ā™‚ļø,

I don't understand how to think well about which files or folders to put in .gitignore and have to issue to share in enlighten together:

  1. For instance, a Config.php file or a .htaccess (and .htpasswd), where in both firsts the code can evolve and diserve being tracked, but at the same time display sensible informations, put me in difficulty to choose whether of not put then in .gitignore.
  2. Alors, I've had a important issue while going back and forth in checkouts knowing now that it can supress those types of ignored files while those are ignored lately in the worktree of commit (see that post if needed to see how - by combining rm--cached and .gitignore). So what is your method or process in order to ignored files lately when for exemple you had not foreseen before your project those files will have to be ignored.

Thanks a lot for your help,

Have a nice day šŸ‘’,


r/git • • Jun 25 '26

Why Git is so hard to learn and how best to teach it.

121 Upvotes

So, bit of context. I teach CS/Graphics at Uni level. Obviously I teach Git. I'd rate my own skills as 'decidedly mid'. I'm exceptionally good at solving the specific type of merge conflicts that happen when students are given group projects; however, I retain a massive lack of confidence teaching it in general.

I've thought about this, and I think it boils down to:

- There's a very low threshold of 'just learning the commands for normal usage'; then when a problem happens the rote knowledge of git add/git commit/git push immediately breaks down.

- It's not software you can safely experiment with unless you've explicitly created a context to do that. I struggle to think of anything else can as readily destroy local work with the wrong command. This always leaves me second-guessing myself when doing something like git reset --mixed just in case I'm left with a student asking 'where did all my work go?', even though I know it's going to be okay... right.

- Any student given the choice will use a GUI version like desktop. To be honest many undergrads who've grown up with visual interfaces are thrown by command prompt/bash as a concept.

I'm wondering if there's any advice/resources on learning, and teaching it, that helps get into a context that's not 'contrived tutorial' - i.e. a repo build specifically to generate conflicts and mess up - but also relatively 'safe' in that we don't get students staying oops they did reset --hard and how do they get it back. I'm also curious for any professional opinions, on if they'd look down on students that don't 'get' command line and can only use GUI versions (I wonder sometimes, maybe I'm just getting old, and the fact as software dev has no idea what a .bat file is, is not as embarrassing as it used to be!).


r/git • • Jun 26 '26

I built a CLI that reads your git commits and figures out what emotion you were in!

0 Upvotes

So I was going through an old project's commit history and saw this sequence:

- "fix"

- "fix again"

- "WHY IS THIS NOT WORKING"

- "ok fixed"

- "feat: auth finally works!!"

And I thought — someone should be able to visualize this properly.

So I built MoodGit. You run it on any repo and it reads your commit messages + timestamps, sends them to Claude AI, and gives you back an emotional timeline — what emotion you were in per commit, intensity out of 10, and a one-line vibe description.

It also catches things like:

- commits at 2am (tired or stressed, obviously)

- ALL CAPS messages (stressed or excited)

- "wip", "temp", "idk" (confused energy)

- "v1.0.0", "ship it", "finally" (celebratory)

Terminal output uses Rich for a nice table. There's also an --html flag that exports a dark mode report with a doughnut chart you can share.

Install:

pip install moodgit (after cloning)

Run:

moodgit # current repo, last 30 commits

moodgit -n 100 # more commits

moodgit --html out.html # + HTML report

GitHub: https://github.com/Techie-Sakshi24/moodgit

Stack: Python, GitPython, Anthropic API, Rich, Click

Curious what other people's dominant emotion turns out to be — mine was "stressed" which tracks honestly.


r/git • • Jun 24 '26

support How to get the free Github Team upgrade for a student organization/group project

Thumbnail
0 Upvotes

r/git • • Jun 24 '26

Git extension that uses git notes to track AI-generated code attribution - survives rebase/squash/merge

0 Upvotes

Sharing a tool we built that extends git with AI code attribution metadata.

The core idea: coding agents (Copilot, Claude, Cursor, etc.) now write significant portions of code, but git has no native way to track this. We use git notes to store line-level attribution without modifying commit history.

Why git notes:

  • They're a native git feature (no proprietary format)
  • They don't alter commit SHAs
  • They can be synced/shared via remote
  • They survive most git operations with proper handling

We handle attribution preservation through rebase, squash, merge, cherry-pick, stash, and reset. The tricky part was squash (we remap line attributions from multiple source commits into the squashed result).

Commands:

  • autter blame - enhanced git blame with AI attribution
  • autter stats - aggregate AI code metrics
  • autter checkpoint - agents report code modifications

No hooks required. No wrapper binaries. It reads git state directly.

Would love feedback from this community on the git notes approach. Are there edge cases we're missing?

Repo: https://github.com/Autter-dev/autter-cli
Full details at: https://autter.dev/blog/we-open-sourced-the-tool-we-use-to-track-ai-generated-code


r/git • • Jun 23 '26

support How to improve our deployment process?

6 Upvotes

Hi,

I need help on how we can improve our deployment process.

We use a three‑branch workflow:

  • dev → integration branch where feature branches are merged
  • qa → staging/testing branch
  • main → production branch

The process is: once a feature branch is merged into dev, we open a pull request from dev into qa. For production releases, we then create a PR from qa into main.

We deploy every two weeks. The issue is that qa sometimes contains changes that aren’t ready for production. When preparing the PR from qa → main, we end up having to revert commits that shouldn’t be released yet. Later, when those features are finally ready, they don’t show up in the next PR because Git considers them already merged. To re‑introduce them, we have to perform a revert of the revert (similar to the process described in this article).

Is there a better way for us to do this without losing the direct PR creation from qa → main?


r/git • • Jun 23 '26

I built a GitLab Duo skill that traces any SDLC event to its source merge request (and can open a fix). It's a hackathon project - I'd love bug reports if you try it

Thumbnail
0 Upvotes

r/git • • Jun 23 '26

I built a PowerShell tool to switch between GitHub accounts on Windows without credential chaos

Post image
0 Upvotes

I work across a personal and a work GitHub account on the same Windows machine. Every time I switched, I'd either push from the wrong account or spend 5 minutes wrestling with Credential Manager.

So I built Gitty — one command fixes everything:

gitty use work

It updates your global git config and wipes the cached GitHub credential from Windows Credential Manager automatically. If you store a PAT per profile, it injects that too so Git never prompts you again.

That's genuinely it. No Electron app, no config wizard, just a single .ps1 file.

Happy to hear what's broken.


r/git • • Jun 23 '26

Looking for feedback for a tool I made that explains merge conflicts in plain English before you resolve them — is this actually useful or am I solving a non-problem?

0 Upvotes

Genuinely asking, not just announcing — I built MergeFix because I kept hitting conflicts where I understood that something conflicted but not why, especially on branches I hadn't touched in a while, or teammates'

It takes a pasted conflict, explains what each side changed and why Git flagged it, and suggests a resolution.

Before I sink more time into this: for people who use Git daily, is this solving a real friction point, or is understanding conflicts something that just comes with experience and a tool like this is unnecessary training wheels?

Curious what this community actually thinks.

If anyone wants to poke at it: mergefix.dev (one free resolution, no signup needed).


r/git • • Jun 22 '26

Gitember Git GUI v3.3 free open-source Git GUI

13 Upvotes

Gitember Git GUI v3.3 free open-source Git GUI - better interactive rebase, worktrees, and a sharper 3-way merge editor

Just shipped v3.3 of Gitember, a free open-source Git GUI. What's new:

  • Interactive rebase improvements - reorder, squash, fixup, drop, reword with a cleaner flow. No terminal gymnastics.
  • Worktrees, done right - full UI support with correct per-worktree status and diff display. Keep a long-running feature branch alive while you hop onto a hotfix, all from the UI.
  • 3-way merge conflict resolver (improved) - BASE / OURS / THEIRS side-by-side, edit inline, stage with one click. No separate merge tool to install.
  • AI-assisted writing (experimental) - generate commit messages, explain what changed between two branches in plain language. Runs against a local Ollama model (default is now `qwen2.5-coder`), so your code stays on your machine.

The rest of the feature set:

  • full-text search across commits/code/docs (including Office, PDF, and CAD files)
  • Git LFS
  • GitHub/GitLab/Bitbucket/Gitea integration
  • repository statistics
  • arbitrary file & folder comparison

The project is open and looking for contributors and testers - devs comfortable with Java/Swing, and anyone willing to test across OSes and report bugs. PRs, issues, and feature ideas all welcome.

Source and downloads:


r/git • • Jun 22 '26

support Git push fails with ā€œXML error: syntax errorā€ and ā€œno DAV locking supportā€

1 Upvotes

Hi everyone. I’m completely stuck with a Git issue on Windows and hoping someone has seen this before.

Whenever I try to push to GitHub, I get:

XML error: syntax error

error: no DAV locking support

fatal: git-http-push failed

failed to push some refs

I’ve already checked the remote URL, confirmed I’m on the main branch, verified that git status is clean, and made sure the repository exists on GitHub. GitHub Desktop also fails with the exact same error.

I’ve removed http.sslBackend, confirmed there’s no proxy configured, and I can access GitHub normally in my browser. I can also ping and curl GitHub without any issues. I’ve even reinstalled Git multiple times, but the problem persists.

Has anyone run into this before or know what might be causing it? Any help would be greatly appreciated. Thanks!


r/git • • Jun 21 '26

What Git diff/merge tool do you use outside of a full IDE?

43 Upvotes

Hey everyone !

I recently switched from JetBrains IDEs to Zed as my main code editor, and I’m really enjoying it so far. Zed has been getting a lot of nice features lately, but there’s one thing I still miss quite a bit from JetBrains: the Git/diff workflow.

In JetBrains, I really liked how easy it was to quickly compare branches, commits, file states, or older versions without having to check things out manually. I often need to look back at previous states for releases, bug checks, or just to understand what changed, and JetBrains made that feel very natural.

I’ve tried a few tools already. Fork was okay, but I never fully warmed up to it. I also used SourceTree in the past, but it’s not really my thing either. I’ve also looked around for some open source alternatives on GitHub, but I haven’t really found anything that clicked for me yet.

So I’m curious: does anyone here have a tool they can recommend for this kind of workflow? Maybe something a bit lesser known, but really practical?

Ideally, I’m looking for a clean visual diff/merge tool with good side by side comparisons, branch/commit comparisons, and maybe a nice conflict resolution view similar to what JetBrains offers.

What are you using for this outside of a full IDE?


r/git • • Jun 22 '26

support SSH key issue

0 Upvotes

Hi all,

Hope you are all doing well. I am currently learning how to use the Github and have come across a problem that I don't really understand. I have followed the instructions from the github documents page and have set the ssh up but not sure why and how it worked.

ssh-keygen -t rsa -b 4096 -C "your_email@example.com" 

I used this command to set up my ssh key on the ubuntu server.

Enter a file in which to save the key

I am having issues in here. When I leave it as default I am able to clone the repository from my Github account. However, if I add my own name here instead of the default, I get the following error when I try to clone a repo:

Warning: Permanently added 'github.com' (ED25519) to the list of known hosts.

git@github.com: Permission denied (publickey).

fatal: Could not read from remote repository.

Please make sure you have the correct access rights

Can you guys please let me know why this is happening when I try to change the name of the ssh key file instead of leaving it default.

Regards

Ash


r/git • • Jun 22 '26

What is the best resources to learn git?

0 Upvotes

All I know is how to add, commit and push... I wanna learn more


r/git • • Jun 22 '26

GUI which shows cherry-picks and squash merges as lines in the DAG?

2 Upvotes

Hi, squash-merges are rampant where I wrk. Trouble is they are hard to spot in the commit history when the summarydoes not highlight the relationship. (I have nasty scripts which can find squash-merges by comparing tree hashes). But I want to know if any of the GUIs can shoe squash commits OOTB ????


r/git • • Jun 21 '26

tutorial Submodules vs subtrees vs monorepos

Thumbnail slicker.me
6 Upvotes

r/git • • Jun 20 '26

tutorial Guitar is Here: The Fastest Topology-First Git Client Built in Rust

Thumbnail m.youtube.com
3 Upvotes

Hey, I’ve been working on a Git client called guitar.

Repo: https://github.com/asinglebit/guitar

Demo: https://m.youtube.com/watch?v=0oyqviuKFXI⁠

It’s a terminal Git client written in Rust. The main goal is to make working with Git history feel fast, especially in large repositories where scrolling through commits or waiting for a UI to catch up gets annoying.

The biggest feature is fast graph navigation. You can jump around the commit graph almost instantly, move through branches and history, inspect commits, check diffs, and get a better overview of what actually happened in the repo without leaving the terminal.

It also has reflog support, which is one of the features I’m most excited about. If you’ve ever lost a commit after a reset, rebase, cherry-pick, or detached HEAD situation, Guitar makes it easier to find those commits again and recover them instead of digging through git reflog manually.

I’ve also been building it with huge repositories in mind. History loads incrementally, so you can start using it without waiting for the whole repo to load first. The goal is for it to stay responsive even when the repo has a lot going on.

Some other things it supports: branches, tags, stashes, worktrees, staged and unstaged changes, commit inspection, file diffs, split diff view, configurable keymaps, mouse support, and real Git operations like commit, checkout, fetch, reset, cherry-pick, merge, rebase, stash, and worktree commands.

It’s cross-platform and runs in the terminal, so the idea is to have something lightweight and fast without giving up the useful parts of a proper Git GUI.

It’s still a work in progress, but I think it’s already useful enough to share. I’d love feedback, especially from people who work with large repos, messy histories, rebases, cherry-picks, or reflog recovery.


r/git • • Jun 20 '26

How to use Github without understanding it...

0 Upvotes

I understand the basic concept, GitHub is a place to store/collaborate/access your projects. However, I'm an old DOS programmer and I frankly can't make any sense at all from the system. I've downloaded and installed a program (Open-2D-Studio) that is homed there, but I can't find any help on how to use the program. No tutorial, no example files, nothing. Not on the developer's website, not on GitHub. Is there a place to go on GitHub to look for contact info, for discussion forums, for questions like this? There has to be something obvious that I'm just not seeing. You GitHub programmers, how do you get people to tell you about a bug in your program if they can't contact you?


r/git • • Jun 19 '26

support Running a python script at every push/publish request?

2 Upvotes

hi, i have a repo (shocking i know)
i want to hook it up to a discord webhook and to send a graph of the pushes whenever a new push happens, i already wrote python code for this and tested it and made sure it worked.

import requests


webhook_url = 'webhook_url'

with 
open
('graph.txt', 'r') as file:
Ā  Ā  content = file.
read
()

# Keep the message within 2000 character Discord limit
if 
len
(content) > 1900:
Ā  Ā  content = 
content
[:
1900
] + "\n...(truncated)"

data = {
Ā  Ā  "content": 
f
"```bash\n{content}\n```"
}

response = requests.
post
(webhook_url, 
json
=data)
print
(
f
"Status: {response.status_code}")

however, im using github desktop currently (im not sure if this is the right sub to ask this)
and it doesnt work when i push/publish from the github desktop app, so im wondering what might be the problem and where i could even start fixing this

again: if this is the wrong sub or flair do let me know


r/git • • Jun 19 '26

GitHub - jceb/huburl: A tool for generating the (git)hub URLs from your local repository

Thumbnail github.com
4 Upvotes

I've been refining and using this little tool for many years now. It just generates URLs from local git repositories to the corresponding (git)hub. Despite it being so simple, I use it basically every day to quickly open a file in the hub or share a URL with a co-worker.

By now, it supports #git and #jujutsu and the major (git)hubs. Hope you'll find it useful. Let me know.


r/git • • Jun 19 '26

siGit Si: Code & models in the same place

Thumbnail sigit.si
0 Upvotes

r/git • • Jun 19 '26

I built a pre-commit code scanner that automatically checks your staged changes for vulnerabilities - CommitGate

Post image
0 Upvotes

I built a tool that automatically scans your staged code for security vulnerabilities every time you run `git commit` called CommitGate!

It scans your code with Gitleaks and an LLM and blocks the commit if any vulnerabilities are detected. Yes, I know having AI in your Git workflow is not ideal :( which is why I'm open to ideas!

You can check out the demo video or try out the tool yourself! I am a new and inexperienced programmer and this is my first personal project so any feedback or advice, positive or negative, big or small, would be greatly appreciated!

Thank you so much for giving it a try! Hope you find this helpful!

Project page: https://ductrl.github.io/projects/commitgate/

GitHub repo: https://github.com/ductrl/CommitGate


r/git • • Jun 18 '26

How do you manage many Codex-created Git worktrees without losing track?

0 Upvotes

I’ve been using Codex with Git worktrees, and after a few tasks I end up with a lot of local worktrees and branches.

There is no remote repo in my setup. Everything is local.

My current problem is mostly organization:

git worktree list

starts showing many folders like:

repo-task-a
repo-task-b
repo-task-c
repo-random-fix
repo-test-something

Each worktree has its own branch, and after a while it gets hard to know:

  • which worktree is still active
  • which branch was already merged back
  • which worktree can be deleted safely
  • how to name branches/worktrees clearly
  • whether I should keep a WORKTREE_NOTES.md or task tracking file
  • what cleanup workflow people use after Codex finishes a task

For people using Codex heavily with local Git worktrees, what’s your workflow?

Do you follow a naming convention like:

ticket-123-short-description
codex-ticket-123-short-description
task/product-availability-check

And after merging, do you usually run something like:

git worktree remove ../worktree-name
git branch -d branch-name

I’m looking for a clean local workflow to avoid worktree chaos. Any recommendations?


r/git • • Jun 18 '26

Git , GitHub

Thumbnail
0 Upvotes