Git - Tag - Vindrinhttps://vindrin.top/tags/git/Git - Tag - VindrinHugo -- gohugo.ioenvindrin@outlook.com (Vindrin)vindrin@outlook.com (Vindrin)Tue, 10 Mar 2026 00:00:00 +0000Understanding Git Rebase vs Mergehttps://vindrin.top/posts/git-rebase-vs-merge/Tue, 10 Mar 2026 00:00:00 +0000vindrin@outlook.com (Vindrin)https://vindrin.top/posts/git-rebase-vs-merge/Understanding Git Rebase vs Merge

This is the question that confuses every developer at some point. Let’s settle it.

Merge

git checkout main
git merge feature-branch

Creates a merge commit. History shows exactly what happened: two branches joined at a point. Safe for shared branches.

Rebase

git checkout feature-branch
git rebase main

Rewrites your commits on top of main. History looks linear — as if you started the feature after main was updated.

]]>Git Quick Referencehttps://vindrin.top/docs/git-quick-reference/Mon, 05 Jan 2026 00:00:00 +0000vindrin@outlook.com (Vindrin)https://vindrin.top/docs/git-quick-reference/Git Quick Reference

The commands I reach for every day.

Repository setup

git init                        # new repo
git clone <url>                 # clone remote
git clone --recurse-submodules  # with submodules

Staging & committing

git status                      # what's changed
git add .                       # stage all
git add -p                      # interactive staging
git commit -m "message"
git commit --amend              # edit last commit

Branching

git branch                      # list branches
git branch <name>               # create branch
git checkout -b <name>          # create + switch
git switch <name>               # switch (modern)
git branch -d <name>            # delete

Remote

git remote -v                   # list remotes
git fetch                       # fetch without merging
git pull                        # fetch + merge
git push origin <branch>
git push -u origin <branch>     # set upstream

Undo

git restore <file>              # discard working tree changes
git reset HEAD <file>           # unstage
git reset --soft HEAD~1         # undo last commit (keep changes)
git revert <hash>               # safe undo (creates new commit)
]]>