Rongzhou: /* Basic example: a change goes live */

2026-08-26T14:30:17Z

Basic example: a change goes live

← Older revision		Revision as of 14:30, 26 August 2026
Line 5:		Line 5:
	New to Git? [https://learngitbranching.js.org/ Learn Git Branching] is a visual, interactive tutorial; [https://git-scm.com/book/en/v2 Pro Git] is the free, thorough book.		New to Git? [https://learngitbranching.js.org/ Learn Git Branching] is a visual, interactive tutorial; [https://git-scm.com/book/en/v2 Pro Git] is the free, thorough book.

	== Basic example: ~~a change goes live~~ ==		== Basic example: clone, edit, commit, push ==

	<syntaxhighlight lang="bash" line highlight="5,6,7" copy>		<syntaxhighlight lang="bash" line highlight="5,6,7" copy>

RonzzWikiCowriterAI: Expand Stash section. AI-assisted (RonzzWikiCowriter) (via update-page on MediaWiki MCP Server)

2026-08-23T10:39:27Z

Expand Stash section. AI-assisted (RonzzWikiCowriter) (via update-page on MediaWiki MCP Server)

← Older revision		Revision as of 10:39, 23 August 2026
Line 161:		Line 161:
	'''Amending and rebasing rewrite history''' (new commit hashes). Use them only on commits that are not yet shared. Rewriting a pushed branch needs <syntaxhighlight lang="bash" inline>git push --force-with-lease</syntaxhighlight> — never plain <syntaxhighlight lang="bash" inline>--force</syntaxhighlight> — and disrupts everyone else working on it.		'''Amending and rebasing rewrite history''' (new commit hashes). Use them only on commits that are not yet shared. Rewriting a pushed branch needs <syntaxhighlight lang="bash" inline>git push --force-with-lease</syntaxhighlight> — never plain <syntaxhighlight lang="bash" inline>--force</syntaxhighlight> — and disrupts everyone else working on it.
	</blockquote>		</blockquote>


	== Stash ==		== Stash ==

			Put uncommitted work aside to switch branches, then bring it back. Stashes are not tied to a branch — a stack you can pop anywhere.

			<syntaxhighlight lang="bash" copy>
			git stash # stash tracked changes
			git stash -u # also stash untracked files
			git stash -m "WIP" # stash with a message
			git stash list # see what is stashed
			git stash show -p # inspect the newest stash's diff
			</syntaxhighlight>

			'''pop vs apply''' — pop restores and drops the stash; apply restores and keeps it:

	<syntaxhighlight lang="bash" copy>		<syntaxhighlight lang="bash" copy>
	git stash # ~~put uncommitted work aside~~		git stash pop # restore newest stash, then drop it
	git stash ~~pop~~ # restore it		git stash apply # restore, keep the stash
	git stash ~~list~~ # ~~see what is stashed~~		git stash apply stash@{1} # restore a specific stash
			git stash drop stash@{1} # delete a specific stash
			git stash clear # delete all stashes
			git stash branch fix # new branch at the stash point, pop onto it
	</syntaxhighlight>		</syntaxhighlight>

			<blockquote>
			'''Untracked files are left behind by default.''' <syntaxhighlight lang="bash" inline>git stash</syntaxhighlight> only stashes ''tracked'' changes — a brand-new file survives in the working tree. Add <syntaxhighlight lang="bash" inline>-u</syntaxhighlight> for untracked files too, or <syntaxhighlight lang="bash" inline>-a</syntaxhighlight> to also include ignored files.
			</blockquote>

			<blockquote>
			'''A conflicting pop keeps the stash.''' Restoring onto a branch that changed the same lines leaves the stash in place: resolve like a merge conflict, then <syntaxhighlight lang="bash" inline>git stash drop</syntaxhighlight> once the work is safely committed.
			</blockquote>

	== Further reading ==		== Further reading ==

RonzzWikiCowriterAI: Create Git cheatsheet. AI-assisted (RonzzWikiCowriter). (via create-page on MediaWiki MCP Server)

2026-08-23T10:23:25Z

Create Git cheatsheet. AI-assisted (RonzzWikiCowriter). (via create-page on MediaWiki MCP Server)

New page

{{Cheatsheet}}

Git is a distributed version control system that tracks changes to files and coordinates work between people on the same codebase.

New to Git? [https://learngitbranching.js.org/ Learn Git Branching] is a visual, interactive tutorial; [https://git-scm.com/book/en/v2 Pro Git] is the free, thorough book.

== Basic example: a change goes live ==

<syntaxhighlight lang="bash" line highlight="5,6,7" copy>
git clone https://github.com/user/repo.git
cd repo
git switch -c my-feature # branch off main
# ... edit files ...
git add . # stage all changes
git commit -m "Add my feature" # snapshot them
git push -u origin my-feature # share on the remote, remember upstream
</syntaxhighlight>

Every change follows the same loop: '''edit → stage (<syntaxhighlight lang="bash" inline>git add</syntaxhighlight>) → commit → push'''. The '''working tree''' is what you edit, the '''index''' is what you stage, the remote is where you share.

== Setup ==

<syntaxhighlight lang="bash" copy>
git config --global user.name "Ada Lovelace"
git config --global user.email ada@example.com
git config --global init.defaultBranch main
git config --global alias.co checkout # `git co` works from now on
git config --global pull.rebase true # pull = fetch + rebase
</syntaxhighlight>

{| class="wikitable"
! Command !! Effect
|-
| <syntaxhighlight lang="bash" inline>git config --global user.name "Ada"</syntaxhighlight> || who you are, for every repo — needed before the first commit
|-
| <syntaxhighlight lang="bash" inline>git config --global init.defaultBranch main</syntaxhighlight> || new repos default to main
|-
| <syntaxhighlight lang="bash" inline>git config --global alias.co checkout</syntaxhighlight> || create a short alias
|-
| <syntaxhighlight lang="bash" inline>git config --global --list</syntaxhighlight> || show all config
|}

'''Start a repository:'''

<syntaxhighlight lang="bash" copy>
git init # new repo in the current directory
git init my-project # ... in a subdirectory
git clone <url> # copy an existing repository
git clone <url> dir # ... into a given directory
</syntaxhighlight>

== Daily workflow ==

<syntaxhighlight lang="bash" copy>
git status # what changed?
git diff # unstaged changes
git diff --staged # staged changes
git add file.py # stage one file
git add . # stage all changes
git add -p # stage hunks interactively
git commit -m "Fix typo" # commit the staged changes
git commit -am "Fix typo" # stage tracked changes + commit in one go
</syntaxhighlight>

<blockquote>
'''<syntaxhighlight lang="bash" inline>git commit -am</syntaxhighlight> only stages ''tracked'' files.''' A brand-new file is untracked and still needs an explicit <syntaxhighlight lang="bash" inline>git add</syntaxhighlight>.
</blockquote>

== Inspecting history ==

<syntaxhighlight lang="bash" copy>
git log --oneline # one line per commit
git log --oneline --graph --all # branch topology
git log -p # full diffs
git log --follow -- file.py # history of a single file
git show <hash> # one commit in detail
git blame file.py # who changed each line
</syntaxhighlight>

== Branching & merging ==

<syntaxhighlight lang="bash" copy>
git branch # list local branches
git branch -a # include remote-tracking branches
git switch -c feature # create a branch and switch to it
git switch feature # switch to an existing branch
git switch - # switch back to the previous branch
git merge feature # merge feature into the current branch
git branch -d feature # delete a merged branch
git branch -D feature # force-delete an unmerged branch
</syntaxhighlight>

<blockquote>
'''Git before 2.23 has no <syntaxhighlight lang="bash" inline>git switch</syntaxhighlight> / <syntaxhighlight lang="bash" inline>git restore</syntaxhighlight>.'''
Use <syntaxhighlight lang="bash" inline>git checkout -b feature</syntaxhighlight> to branch, <syntaxhighlight lang="bash" inline>git checkout feature</syntaxhighlight> to switch, and <syntaxhighlight lang="bash" inline>git checkout -- file.py</syntaxhighlight> to discard changes.
</blockquote>

== Rebase ==

<syntaxhighlight lang="bash" copy>
git rebase main # replay current branch on top of main
git rebase -i HEAD~3 # interactive: squash, reword, reorder commits
</syntaxhighlight>

== Merge conflicts ==

<syntaxhighlight lang="bash" copy>
# git status shows "both modified"; files contain markers:
# <<<<<<< HEAD ... ======= ... >>>>>>> feature
# edit the file to keep the right lines, then:
git add <resolved files>
git commit # after a merge
git rebase --continue # after a rebase
git merge --abort # back out of the merge entirely
git rebase --abort # ... or of the rebase
</syntaxhighlight>

== Remotes ==

<syntaxhighlight lang="bash" copy>
git remote -v # list remotes
git remote add origin <url> # connect a remote
git fetch origin # download commits, don't touch your work
git pull # fetch + merge
git push # upload your commits
git push -u origin feature # first push of a branch: set upstream
git push origin --delete feature # delete a branch on the remote
git tag v1.0 # tag the current commit
git push origin v1.0 # share the tag
</syntaxhighlight>

<blockquote>
'''pull is fetch + merge.''' It can create merge commits. Prefer a linear history with <syntaxhighlight lang="bash" inline>git pull --rebase</syntaxhighlight>, or set it once with <syntaxhighlight lang="bash" inline>git config --global pull.rebase true</syntaxhighlight>.
</blockquote>

== Undoing ==

{| class="wikitable"
! Want to… !! Command
|-
| discard unstaged changes to a file || <syntaxhighlight lang="bash" inline>git restore file.py</syntaxhighlight>
|-
| unstage a file || <syntaxhighlight lang="bash" inline>git restore --staged file.py</syntaxhighlight>
|-
| fix the last commit (message / forgotten file) || <syntaxhighlight lang="bash" inline>git commit --amend</syntaxhighlight>
|-
| undo the last commit, keep changes staged || <syntaxhighlight lang="bash" inline>git reset --soft HEAD~1</syntaxhighlight>
|-
| undo the last commit, keep the edits || <syntaxhighlight lang="bash" inline>git reset HEAD~1</syntaxhighlight>
|-
| undo the last commit and drop everything || <syntaxhighlight lang="bash" inline>git reset --hard HEAD~1</syntaxhighlight>
|-
| undo a commit that is already pushed || <syntaxhighlight lang="bash" inline>git revert <hash></syntaxhighlight>
|}

<blockquote>
'''<syntaxhighlight lang="bash" inline>git reset --hard</syntaxhighlight> is destructive:''' it throws away the commit ''and'' the uncommitted edits. Hit it by mistake? <syntaxhighlight lang="bash" inline>git reflog</syntaxhighlight> lists everywhere HEAD has been — <syntaxhighlight lang="bash" inline>git reset --hard "HEAD@{1}"</syntaxhighlight> takes you back.
</blockquote>

<blockquote>
'''Amending and rebasing rewrite history''' (new commit hashes). Use them only on commits that are not yet shared. Rewriting a pushed branch needs <syntaxhighlight lang="bash" inline>git push --force-with-lease</syntaxhighlight> — never plain <syntaxhighlight lang="bash" inline>--force</syntaxhighlight> — and disrupts everyone else working on it.
</blockquote>

== Stash ==

<syntaxhighlight lang="bash" copy>
git stash # put uncommitted work aside
git stash pop # restore it
git stash list # see what is stashed
</syntaxhighlight>

== Further reading ==

* [https://git-scm.com/doc Git documentation] — the official docs
* [https://learngitbranching.js.org/ Learn Git Branching] — interactive, visual tutorial — the recommended start
* [https://git-scm.com/book/en/v2 Pro Git] — the free book
* [https://ohshitgit.com/ Oh Shit, Git!?!] — quick fixes for common mistakes

Cheatsheets:Git - Revision history

Rongzhou: /* Basic example: a change goes live */

RonzzWikiCowriterAI: Expand Stash section. AI-assisted (RonzzWikiCowriter) (via update-page on MediaWiki MCP Server)

RonzzWikiCowriterAI: Create Git cheatsheet. AI-assisted (RonzzWikiCowriter). (via create-page on MediaWiki MCP Server)