Git Command Generator
Find the right git command for any scenario. Safety warnings, flag explanations, and undo guides included.
Understanding Git: A Developer's Essential Tool
Git is the world's most widely used distributed version control system. Created by Linus Torvalds in 2005 for Linux kernel development, Git tracks changes in source code during software development, enabling multiple developers to work together efficiently.
Unlike centralized version control systems, Git gives every developer a full copy of the repository history. This means you can work offline, create branches instantly, and merge changes with powerful conflict resolution tools.
Understanding Git commands is crucial for modern software development. Whether you're undoing a mistake, managing branches, or collaborating with a team, knowing the right command saves time and prevents data loss.
Common Git Scenarios Explained
Undoing Changes
Git provides multiple ways to undo changes: reset moves the branch pointer backward, revert creates a new commit that undoes changes, and checkout can restore individual files. Choose based on whether changes are pushed or local.
Branching Strategy
Branches in Git are lightweight pointers to commits. Common strategies include Git Flow (feature/develop/main), GitHub Flow (feature branches + main), and trunk-based development. Pick one that matches your team size and release cadence.
Rebase vs Merge
merge preserves history by creating a merge commit. rebase rewrites history for a linear timeline. Use merge for shared branches and rebase for local feature branches before merging.
The Reflog Safety Net
git reflog records every change to HEAD, even after resets and rebases. It's your safety net — if you accidentally lose commits, reflog can help you recover them within 30 days (default).
Frequently Asked Questions
How do I undo the last git commit without losing changes?
Use `git reset --soft HEAD~1` to undo the commit while keeping all changes staged. Use `git reset HEAD~1` (mixed mode) to undo and unstage changes but keep them in your working directory. Both are safe operations that don't destroy any work.
What's the difference between git reset and git revert?
git reset moves the branch pointer backward, effectively erasing commits from history. git revert creates a new commit that undoes the changes of a previous commit. Use reset for local, unpushed changes. Use revert for commits already pushed to a shared remote — it's safer because it doesn't rewrite history.
How do I squash multiple commits into one?
Use `git rebase -i HEAD~N` (replace N with the number of commits) and change 'pick' to 'squash' or 's' for commits you want to combine. Alternatively, use `git reset --soft HEAD~N && git commit` for a quick squash. Both methods rewrite history, so only do this on unpushed commits.
How do I resolve merge conflicts in git?
When a merge conflict occurs, Git marks the conflicting files. Run `git status` to see them, open each file, resolve the conflict markers (<<<<<<, ======, >>>>>>), then run `git add <file>` for each resolved file and `git commit` to complete the merge. Use `git merge --abort` to cancel.
What is git stash and when should I use it?
git stash temporarily saves your uncommitted changes (both staged and unstaged) and reverts your working directory to the last commit. Use it when you need to switch branches but aren't ready to commit. Restore with `git stash pop`. Add `-u` to also stash untracked files.
How do I recover a deleted branch in git?
Run `git reflog` to find the commit hash that was at the tip of the deleted branch. Then create a new branch at that commit: `git branch <branch-name> <commit-hash>`. This works as long as the commits haven't been garbage collected (typically within 30 days).
What does git reset --hard do and is it safe?
git reset --hard moves the branch pointer AND discards all changes in the staging area and working directory. It's destructive — uncommitted changes are permanently lost. However, committed changes can still be recovered via `git reflog` within 30 days. Use with extreme caution.
Related Tools
Format, validate, and beautify JSON with tree view and TypeScript type generation.
Test regular expressions with real-time matching, capture groups, and code snippets.
Generate UUID v4, v7, ULID, and Nano ID with bulk generation and format options.
Encode and decode text, images, and files to Base64 with real-time conversion.