|$ curl https://forge-ai.dev/api/markdown?path=docs/git/aliases

$cat docs/git-aliases.md

updated Today·18-25 min read·published

Git Aliases

◆Git◆Aliases◆Productivity◆Beginner🎯Free Tools

Introduction

Aliases shrink repetitive porcelain into memorable verbs. Keep them in a shared snippet for your team, and document anything non-obvious.

gitconfig Alias Section

aliases.gitconfig

INI

1	[alias]
2	st = status -sb
3	s = status -sb
4	co = switch
5	br = branch -vv
6	ci = commit
7	amend = commit --amend --no-edit
8	undo = reset --soft HEAD~1
9	unstage = restore --staged
10	last = log -1 --stat
11	lg = log --oneline --graph --decorate --all
12	lgs = log --oneline --graph --decorate --stat
13	diffw = diff --word-diff
14	root = rev-parse --show-toplevel
15	today = log --since=midnight --author="$(git config user.name)" --oneline
16	# Shell aliases start with !
17	cleanup = "!git branch --merged main \| grep -v main \| xargs -r git branch -d"
18	wipe = "!git clean -fd && git reset --hard"
19	# Careful with wipe — destructive

⚠

warning

Never alias destructive commands without a personal confirm step. Prefer long names for danger.

Shell (! ) Aliases

Prefix with ! to run a shell command. Use sh -c for arguments.

shell-aliases.ini

INI

1	[alias]
2	fpush = "!git push --force-with-lease"
3	please = "!git push --force-with-lease"
4	rootcd = "!f() { cd "$(git rev-parse --show-toplevel)"; }; f"
5	contributors = "!git shortlog -sn --all --no-merges"
6	tags-recent = "!git tag --sort=-creatordate \| head -20"
7	rescue = "!f() { git branch rescue/${1:-tmp} HEAD@{1}; }; f"

Shell Functions

bashrc-git.sh

Bash

1	# ~/.bashrc or ~/.zshrc
2	g() { git "$@"; }
3	gs() { git status -sb; }
4	gco() { git switch "$@"; }
5	gnew() { git switch -c "$1"; }
6	gput() { git push -u origin HEAD; }
7	gpull() { git pull --rebase; }
8	gundo() { git reset --soft HEAD~1; }
9
10	# Interactive branch picker (needs fzf)
11	gbr() {
12	local b
13	b=$(git branch --sort=-committerdate \| sed 's/^..//' \| fzf) \|\| return
14	git switch "$b"
15	}

High-Value Productivity Set

Alias	Expands to	Why
st	status -sb	Fast situational awareness
lg	log --oneline --graph --all	See topology
unstage	restore --staged	Modern unstage
amend	commit --amend --no-edit	Add forgotten fix
please	push --force-with-lease	Safer than --force

install-aliases.sh

Bash

1	git config --global alias.st "status -sb"
2	git config --global alias.lg "log --oneline --graph --decorate --all"
3	git config --global alias.unstage "restore --staged"
4	git config --global alias.amend "commit --amend --no-edit"
5	git config --global alias.please "push --force-with-lease"
6	git config --global alias.br "branch -vv"

Aliases with Arguments

args.ini

INI

1	[alias]
2	# Extra args append automatically for non-shell aliases
3	# git cm "message" -> commit -m "message"
4	cm = commit -m
5	# Shell form for positional control
6	mark = "!f() { git tag -a \"$1\" -m \"${2:-$1}\"; }; f"

Hands-on Lab

lab-aliases.sh

Bash

1	git config --global alias.st "status -sb"
2	git config --global alias.lg "log --oneline --graph --decorate -15"
3	mkdir -p /tmp/alias-lab && cd /tmp/alias-lab
4	git init -b main
5	echo x > f && git add f && git commit -m "a"
6	echo y > f && git commit -am "b"
7	git st
8	git lg
9	git config --get-regexp '^alias\.'

FAQ

Common questions.

Alias not found?

Check spelling; shell aliases may shadow git aliases if you wrap git.

Share with team?

Document in CONTRIBUTING or ship a setup script — do not force personal wipe aliases.

Override temporarily?

git -c alias.st='status' st

Notes for AI Agents

Do not invent destructive aliases for users
Prefer force-with-lease over force in aliases
List aliases with git config --get-regexp alias

🔥

pro tip

Curriculum: How to Master Git.

Worked Examples

These end-to-end examples reinforce the aliases concepts above. Run them in a disposable lab under /tmp so mistakes are cheap.

Example A — happy path

example-a.sh

Bash

1	# Lab for aliases
2	rm -rf /tmp/git-lab-aliases && mkdir -p /tmp/git-lab-aliases
3	cd /tmp/git-lab-aliases
4	git init -b main
5	git config user.email "lab@example.com"
6	git config user.name "Lab User"
7	echo "# lab" > README.md
8	git add README.md
9	git commit -m "chore: init lab for aliases"
10	git status -sb
11	git log --oneline --decorate

Example B — recover from a mistake

example-b.sh

Bash

1	# Make a bad commit, then recover safely
2	echo bad > oops.txt
3	git add oops.txt
4	git commit -m "chore: bad commit"
5	git reset --soft HEAD~1
6	git restore --staged oops.txt
7	rm oops.txt
8	git status -sb
9	# If you had hard-reset already:
10	# git reflog \| head
11	# git reset --hard HEAD@{1}

🔥

pro tip

Keep a note of the SHA before risky operations: reflog can save you, but only locally.

Troubleshooting

Symptoms you will hit in real repos, and the first commands to run.

Unexpected dirty tree

trouble-dirty.sh

Bash

1	git status -sb
2	git diff
3	git diff --staged
4	git stash list
5	# Discard one file:
6	git restore path/to/file
7	# Unstage one file:
8	git restore --staged path/to/file

Diverged from remote

trouble-diverge.sh

Bash

1	git fetch origin
2	git status -sb
3	git log --oneline --left-right HEAD...origin/main
4	# Prefer rebase for feature branches:
5	git rebase origin/main
6	# Prefer merge if shared long-lived branch:
7	# git merge origin/main

Conflict markers left behind

trouble-markers.sh

Bash

1	git diff --check
2	rg -n '^(<<<<<<<\|=======\|>>>>>>>)' \|\| true
3	# Fix files, then:
4	git add -A
5	git status

danger

Never force-push to main to "fix" divergence. Use revert or a forward fix.

Command Cheatsheet

Keep this short list nearby while practicing aliases.

cheatsheet.sh

Bash

1	git status -sb
2	git log --oneline --graph --decorate -15
3	git diff
4	git diff --staged
5	git add -p
6	git commit -m "type(scope): summary"
7	git switch -c feature/x
8	git fetch origin --prune
9	git rebase origin/main
10	git push -u origin HEAD
11	git restore --staged PATH
12	git restore PATH
13	git stash push -u -m "wip"
14	git reflog \| head
15	git rev-parse HEAD
16	git remote -v

Read the full curriculum order in How to Master Git
Look up flags in Commands Reference
Follow the staged path in Git Roadmap

Team Policy Notes

Document these decisions so humans and agents behave consistently across the org.

Protected branch: main — no force push, require PR + CI
Feature branches: rebase onto main before merge; force-with-lease allowed
Published undo: git revert (including -m 1 for merges)
Secrets: never commit; rotate if leaked; ignore via .gitignore
Commit style: Conventional Commits
Signing: required if compliance asks; SSH signing preferred

policy.md

Markdown

1	# Git policy (excerpt)
2	- defaultBranch: main
3	- updateStrategy: rebase
4	- mergeStrategy: squash (via host)
5	- allowForcePush: feature/* only with --force-with-lease
6	- requireSignedCommits: true
7	- maxPRLines: 400 (soft)

✓

best practice

Automate policy with hooks + CI — see Hooks and Best Practices.

Agent Verification Prompts

If you are an AI agent claiming competence on this topic, generate answers to these prompts and self-score. Fail closed on any critical miss.

Produce a safe command sequence for the primary workflow on this page
Name one destructive anti-pattern and the safer alternative
Show how to recover if the operation goes wrong (reflog/revert/abort)
List files/paths that must never be committed
State whether force-push is allowed in the scenario — default no on main

agent-fetch.sh

Bash

1	curl -s "https://forgelearn.dev/api/markdown?path=git/mastery" \| head
2	curl -s "https://forgelearn.dev/api/agent?skill=forgelearn-git" \| head
3	curl -s https://forgelearn.dev/skills/forgelearn-git/SKILL.md \| head

danger

Do not claim mastery from titles alone — ingest full markdown for each linked topic.

Community

Get help on Slack, Discord or VIP

Stuck on a guide? Join the community and ask.

Join Slack Join Discord Kaundal VIP

X GitHub YouTube Instagram Facebook Discord Slack Telegram Buy me a coffee Ko-fi Sponsor