Git - Revision history

Woozle at 14:13, 19 September 2025

2025-09-19T14:13:09Z

← Older revision		Revision as of 14:13, 19 September 2025
Line 17:		Line 17:
	* {{l/sub\|gitignore}}		* {{l/sub\|gitignore}}
	===Software===		===Software===
			* '''extensions''':
			** [[Git-Mediawiki]]
	* '''3rd-party''':		* '''3rd-party''':
	** [https://git-scm.com/downloads/guis GUI clients]:		** [https://git-scm.com/downloads/guis GUI clients]:

Woozle: /* How To */

2023-01-08T22:15:40Z

How To

← Older revision		Revision as of 22:15, 8 January 2023
Line 34:		Line 34:
	* {{l/manpage\|git\|manpage}}		* {{l/manpage\|git\|manpage}}
	===How To===		===How To===
			* [[/color prompt]]: show Git status in the prompt, in colors
	* [https://ohshitgit.com/ Oh Shit, Git!?!]: solutions to frequently encountered situations in Git		* [https://ohshitgit.com/ Oh Shit, Git!?!]: solutions to frequently encountered situations in Git
	* [https://www.git-tower.com/learn/git/faq/git-rename-master-to-main/ How to Rename the <code>master</code> branch to <code>main</code> in Git]: the [[GitHub]] portion of this is also doable in [[GitLab]], though the process is slightly different.		* [https://www.git-tower.com/learn/git/faq/git-rename-master-to-main/ How to Rename the <code>master</code> branch to <code>main</code> in Git]: the [[GitHub]] portion of this is also doable in [[GitLab]], though the process is slightly different.

Woozle at 15:08, 16 November 2022

2022-11-16T15:08:13Z

@@ Line 4: / Line 4: @@
 [[thing type::software]]
 [[license::open source]]
-</hide>
+</hide>__NOTOC__
 ==About==
-[[Git]] is a [[version control system]] based on a powerful distributed model.{{seed}}
+[[Git]] is a [[version control system]] based on a powerful distributed model.
 * [[/notes]]
 ===Files===
 * {{l/sub|gitignore}}
 ===Software===
-* [https://git-scm.com/downloads/guis GUI clients]:
+* '''3rd-party''':
-** [[gitk]]: generally distributed with git
+** [https://git-scm.com/downloads/guis GUI clients]:
-** [[git-cola]]
+*** [[gitk]]: generally distributed with git
-* [https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols 10.6 Git Internals - Transfer Protocols]: technical details
+*** [[git-cola]]
-** could be used to implement a Git server
+* '''internals/technical''':
+** [https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols 10.6 Git Internals - Transfer Protocols]: could be used to implement a Git server
-===Services===
+* '''services''' - free/open source web-based repository/project managers:
-* [[GitHub]]: free web-based git repository for open-source projects
+** [[Gitea]]
 ===Error Messages===
 * '''Error Code 403 fatal: HTTP request failed''' may indicate a bad password. I've found that sometimes the password either doesn't paste properly or else isn't being accepted the first time; trying again with the same password may work. (The password is not displayed, so I'm not sure which it is.)
 ==Links==
 ===Reference===

Woozle: using sortable table to reduce redundancy

2022-11-16T14:46:41Z

using sortable table to reduce redundancy

← Older revision		Revision as of 14:46, 16 November 2022
Line 5:		Line 5:
	[[license::open source]]		[[license::open source]]
	</hide>		</hide>
			__NOTOC__
	==About==		==About==
	[[Git]] is a [[version control system]] based on a powerful distributed model.{{seed}}		[[Git]] is a [[version control system]] based on a powerful distributed model.{{seed}}
Line 13:		Line 14:

	==Commands==		==Commands==
	{\|		{\| class="wikitable sortable"
	\|-		\|-
	! ~~alphabetical !! by function~~		! command \|\| process \|\| description
	\|-		\|-
	\| ~~valign=top \|~~		\| '''[[/add\|git add]]''' \|\| repo creation 2 \|\| updates the "staged" area using content found in the working tree (can be specified)
	* '''[[/add\|git add]]''' updates the "staged" area using content found in the working tree (can be specified)		\|-
	* '''[[/branch\|git branch]]''' manages {{l/sub\|branch}}es		\| '''[[/branch\|git branch]]''' \|\| \|\| manages {{l/sub\|branch}}es
	* '''[[/checkout\|git checkout]]'''		\|-
	* '''[[/clone\|git clone]]''' copies a repository from somewhere else		\| '''[[/checkout\|git checkout]]'''
	* '''[[/commit\|git commit]]''' commits changes currently staged		\|-
	* '''[[/commit-tree\|git commit-tree]]		\| '''[[/clone\|git clone]]''' \|\| repo creation 1b \|\| copies a repository from somewhere else
	* '''[[/config\|git config]]'''		\|-
	* '''[[/diff\|git diff]]''' shows difference between current directory contents and what you have staged		\| '''[[/commit\|git commit]]''' \|\| repo creation 6 \|\| commits changes currently staged
	* '''[[/fetch\|git fetch]]''' fetches named heads or tags from one or more other repositories, along with the objects necessary to complete them.		\|-
	* '''[[/init\|git init]]''' initializes a new repository; does not add anything		\| '''[[/commit-tree\|git commit-tree]]
	* '''[[/log\|git log]]''' returns information about {{l/sub\|commit}}s		\|-
	* '''[[/merge\|git merge]]''' joins two or more {{l/sub\|branch}}es together		\| '''[[/config\|git config]]''' \|\| usage config \|\|
	* '''[[/pull\|git pull]]''' incorporates changes from a remote repository into the current branch. In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD.		\|-
	* '''[[/push\|git push]]''' updates remote refs using local refs, while sending objects necessary to complete the given refs		\| '''[[/diff\|git diff]]''' \|\| repo creation 5 \|\| shows difference between current directory contents and what you have staged
	* '''[[/rebase\|git rebase]]''' forward-port local commits to the updated upstream head		\|-
	* '''[[/read-tree\|git read-tree]]		\| '''[[/fetch\|git fetch]]''' \|\| \|\| fetches named heads or tags from one or more other repositories, along with the objects necessary to complete them.
	* '''[[/remote\|git remote]]''' manage aliases for remote repositories		\|-
	* '''[[/reset\|git reset]]''' resets current HEAD to the specified state		\| '''[[/init\|git init]]''' \|\| repo creation 1a \|\| initializes a new repository; does not add anything
	* '''[[/rm\|git rm]]''' removes files from staging '''and by default also from the filesystem'''		\|-
	* '''[[/show\|git show]]'''		\| '''[[/log\|git log]]''' \|\| \|\| returns information about {{l/sub\|commit}}s
	* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit		\|-
	* '''[[/status\|git status]]''' shows status of current repository		\| '''[[/merge\|git merge]]''' \|\| \|\| joins two or more {{l/sub\|branch}}es together
	* '''[[/submodule\|git submodule]]''' manages {{l/sub\|modules}}		\|-
	* '''[[/tag\|git tag]]''' creates an alias for a particular revision		\| '''[[/pull\|git pull]]''' \|\| copying from \|\| incorporates changes from a remote repository into the current branch. In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD.
	* '''[[/worktree\|git worktree]]		\|-
	* '''[[/write-tree\|git write-tree]]		\| '''[[/push\|git push]]''' \|\| copying to \|\| updates remote refs using local refs, while sending objects necessary to complete the given refs
	~~\| valign=top \|~~		\|-
	~~===initialization===~~		\| '''[[/rebase\|git rebase]]''' \|\| \|\| forward-port local commits to the updated upstream head
	* '''[[/config\|git config]] --global {{arg\|param_name}} {{arg\|param_value}}'''		\|-
	~~===creating from scratch===~~		\| '''[[/read-tree\|git read-tree]]
	* '''[[/init\|git init]]''' initializes a new repository; does not add anything		\|-
	* '''[[/add\|git add]]''' updates the index using content found in the working tree (can be specified), to prepare the content staged for the next commit		\| '''[[/remote\|git remote]]''' \|\| copying \|\| manage aliases for remote repositories
	* '''[[/rm\|git rm]]''' removes files from staging '''and by default also from the filesystem'''		\|-
	* '''[[/status\|git status]]''' shows status of current repository		\| '''[[/reset\|git reset]]''' \|\| \|\| resets current HEAD to the specified state
	* '''[[/diff\|git diff]]''' shows difference between current directory contents and what you have staged		\|-
	* '''[[/commit\|git commit]]''' commits changes currently staged		\| '''[[/rm\|git rm]]''' \|\| repo creation 3 \|\| removes files from staging '''and by default also from the filesystem'''
	~~===copying to elsewhere===~~		\|-
	* '''[[/remote\|git remote]] add'''		\| '''[[/show\|git show]]'''
	* '''[[/push\|git push]]'''		\|-
	~~===copying from elsewhere===~~		\| '''[[/stash\|git stash]]''' \|\| \|\| saves local modifications, reverts the working directory to match HEAD commit
	* '''[[/clone\|git clone]]''' copies a repository from somewhere else		\|-
			\| '''[[/status\|git status]]''' \|\| repo creation 4 \|\| shows status of current repository
			\|-
			\| '''[[/submodule\|git submodule]]''' \|\| \|\| manages {{l/sub\|modules}}
			\|-
			\| '''[[/tag\|git tag]]''' \|\| \|\| creates an alias for a particular revision
			\|-
			\| '''[[/worktree\|git worktree]]
			\|-
			\| '''[[/write-tree\|git write-tree]]
	\|}		\|}
	===Files===		===Files===

Woozle: /* Commands */

2021-11-11T16:04:43Z

Commands

← Older revision		Revision as of 16:04, 11 November 2021
Line 40:		Line 40:
	* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit		* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit
	* '''[[/status\|git status]]''' shows status of current repository		* '''[[/status\|git status]]''' shows status of current repository
			* '''[[/submodule\|git submodule]]''' manages {{l/sub\|modules}}
	* '''[[/tag\|git tag]]''' creates an alias for a particular revision		* '''[[/tag\|git tag]]''' creates an alias for a particular revision
	* '''[[/worktree\|git worktree]]		* '''[[/worktree\|git worktree]]

Woozle: /* Commands */

2021-09-13T16:01:02Z

Commands

← Older revision		Revision as of 16:01, 13 September 2021
Line 36:		Line 36:
	* '''[[/remote\|git remote]]''' manage aliases for remote repositories		* '''[[/remote\|git remote]]''' manage aliases for remote repositories
	* '''[[/reset\|git reset]]''' resets current HEAD to the specified state		* '''[[/reset\|git reset]]''' resets current HEAD to the specified state
	* '''[[/rm\|git rm]]''' removes files from staging '''and also from the ~~directory~~'''		* '''[[/rm\|git rm]]''' removes files from staging '''and by default also from the filesystem'''
	* '''[[/show\|git show]]'''		* '''[[/show\|git show]]'''
	* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit		* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit
Line 49:		Line 49:
	* '''[[/init\|git init]]''' initializes a new repository; does not add anything		* '''[[/init\|git init]]''' initializes a new repository; does not add anything
	* '''[[/add\|git add]]''' updates the index using content found in the working tree (can be specified), to prepare the content staged for the next commit		* '''[[/add\|git add]]''' updates the index using content found in the working tree (can be specified), to prepare the content staged for the next commit
	* '''[[/rm\|git rm]]''' removes files from staging '''and also from the ~~directory~~'''		* '''[[/rm\|git rm]]''' removes files from staging '''and by default also from the filesystem'''
	* '''[[/status\|git status]]''' shows status of current repository		* '''[[/status\|git status]]''' shows status of current repository
	* '''[[/diff\|git diff]]''' shows difference between current directory contents and what you have staged		* '''[[/diff\|git diff]]''' shows difference between current directory contents and what you have staged

Woozle: /* How To */

2021-09-01T15:54:00Z

How To

← Older revision		Revision as of 15:54, 1 September 2021
Line 80:		Line 80:
	* [https://ohshitgit.com/ Oh Shit, Git!?!]: solutions to frequently encountered situations in Git		* [https://ohshitgit.com/ Oh Shit, Git!?!]: solutions to frequently encountered situations in Git
	* [https://www.git-tower.com/learn/git/faq/git-rename-master-to-main/ How to Rename the <code>master</code> branch to <code>main</code> in Git]: the [[GitHub]] portion of this is also doable in [[GitLab]], though the process is slightly different.		* [https://www.git-tower.com/learn/git/faq/git-rename-master-to-main/ How to Rename the <code>master</code> branch to <code>main</code> in Git]: the [[GitHub]] portion of this is also doable in [[GitLab]], though the process is slightly different.
			* Change the default branch-name:
			** [https://stackoverflow.com/questions/42871542/how-can-i-create-a-git-repository-with-the-default-branch-name-other-than-maste How can I create a Git repository with the default branch name other than "master"?]: This lets you change the default name of the branch that is created for new repositories.

	===Online Books===		===Online Books===

Woozle: /* Concepts */

2021-06-22T20:24:56Z

Concepts

← Older revision		Revision as of 20:24, 22 June 2021
Line 10:		Line 10:
	==Concepts==		==Concepts==
	* [[/squash]]ing		* [[/squash]]ing
			* [[/modules]]

	==Commands==		==Commands==
	{\|		{\|

Woozle: /* How To */

2020-12-06T16:23:59Z

How To

← Older revision		Revision as of 16:23, 6 December 2020
Line 77:		Line 77:
	===How To===		===How To===
	* [https://ohshitgit.com/ Oh Shit, Git!?!]: solutions to frequently encountered situations in Git		* [https://ohshitgit.com/ Oh Shit, Git!?!]: solutions to frequently encountered situations in Git
			* [https://www.git-tower.com/learn/git/faq/git-rename-master-to-main/ How to Rename the <code>master</code> branch to <code>main</code> in Git]: the [[GitHub]] portion of this is also doable in [[GitLab]], though the process is slightly different.

	===Online Books===		===Online Books===
	* ''[http://git-scm.com/book Pro Git]''		* ''[http://git-scm.com/book Pro Git]''

Woozle: /* Software */

2020-06-26T16:52:24Z

Software

← Older revision		Revision as of 16:52, 26 June 2020
Line 63:		Line 63:
	** [[gitk]]: generally distributed with git		** [[gitk]]: generally distributed with git
	** [[git-cola]]		** [[git-cola]]
			* [https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols 10.6 Git Internals - Transfer Protocols]: technical details
			** could be used to implement a Git server

	===Services===		===Services===

← Older revision		Revision as of 14:46, 16 November 2022
Line 5:		Line 5:
	[[license::open source]]		[[license::open source]]
	</hide>		</hide>
			__NOTOC__
	==About==		==About==
	[[Git]] is a [[version control system]] based on a powerful distributed model.{{seed}}		[[Git]] is a [[version control system]] based on a powerful distributed model.{{seed}}
Line 13:		Line 14:

	==Commands==		==Commands==
	{\|		{\| class="wikitable sortable"
	\|-		\|-
	! ~~alphabetical !! by function~~		! command \|\| process \|\| description
	\|-		\|-
	\| ~~valign=top \|~~		\| '''[[/add\|git add]]''' \|\| repo creation 2 \|\| updates the "staged" area using content found in the working tree (can be specified)
	* '''[[/add\|git add]]''' updates the "staged" area using content found in the working tree (can be specified)		\|-
	* '''[[/branch\|git branch]]''' manages {{l/sub\|branch}}es		\| '''[[/branch\|git branch]]''' \|\| \|\| manages {{l/sub\|branch}}es
	* '''[[/checkout\|git checkout]]'''		\|-
	* '''[[/clone\|git clone]]''' copies a repository from somewhere else		\| '''[[/checkout\|git checkout]]'''
	* '''[[/commit\|git commit]]''' commits changes currently staged		\|-
	* '''[[/commit-tree\|git commit-tree]]		\| '''[[/clone\|git clone]]''' \|\| repo creation 1b \|\| copies a repository from somewhere else
	* '''[[/config\|git config]]'''		\|-
	* '''[[/diff\|git diff]]''' shows difference between current directory contents and what you have staged		\| '''[[/commit\|git commit]]''' \|\| repo creation 6 \|\| commits changes currently staged
	* '''[[/fetch\|git fetch]]''' fetches named heads or tags from one or more other repositories, along with the objects necessary to complete them.		\|-
	* '''[[/init\|git init]]''' initializes a new repository; does not add anything		\| '''[[/commit-tree\|git commit-tree]]
	* '''[[/log\|git log]]''' returns information about {{l/sub\|commit}}s		\|-
	* '''[[/merge\|git merge]]''' joins two or more {{l/sub\|branch}}es together		\| '''[[/config\|git config]]''' \|\| usage config \|\|
	* '''[[/pull\|git pull]]''' incorporates changes from a remote repository into the current branch. In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD.		\|-
	* '''[[/push\|git push]]''' updates remote refs using local refs, while sending objects necessary to complete the given refs		\| '''[[/diff\|git diff]]''' \|\| repo creation 5 \|\| shows difference between current directory contents and what you have staged
	* '''[[/rebase\|git rebase]]''' forward-port local commits to the updated upstream head		\|-
	* '''[[/read-tree\|git read-tree]]		\| '''[[/fetch\|git fetch]]''' \|\| \|\| fetches named heads or tags from one or more other repositories, along with the objects necessary to complete them.
	* '''[[/remote\|git remote]]''' manage aliases for remote repositories		\|-
	* '''[[/reset\|git reset]]''' resets current HEAD to the specified state		\| '''[[/init\|git init]]''' \|\| repo creation 1a \|\| initializes a new repository; does not add anything
	* '''[[/rm\|git rm]]''' removes files from staging '''and by default also from the filesystem'''		\|-
	* '''[[/show\|git show]]'''		\| '''[[/log\|git log]]''' \|\| \|\| returns information about {{l/sub\|commit}}s
	* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit		\|-
	* '''[[/status\|git status]]''' shows status of current repository		\| '''[[/merge\|git merge]]''' \|\| \|\| joins two or more {{l/sub\|branch}}es together
	* '''[[/submodule\|git submodule]]''' manages {{l/sub\|modules}}		\|-
	* '''[[/tag\|git tag]]''' creates an alias for a particular revision		\| '''[[/pull\|git pull]]''' \|\| copying from \|\| incorporates changes from a remote repository into the current branch. In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD.
	* '''[[/worktree\|git worktree]]		\|-
	* '''[[/write-tree\|git write-tree]]		\| '''[[/push\|git push]]''' \|\| copying to \|\| updates remote refs using local refs, while sending objects necessary to complete the given refs
	~~\| valign=top \|~~		\|-
	~~===initialization===~~		\| '''[[/rebase\|git rebase]]''' \|\| \|\| forward-port local commits to the updated upstream head
	* '''[[/config\|git config]] --global {{arg\|param_name}} {{arg\|param_value}}'''		\|-
	~~===creating from scratch===~~		\| '''[[/read-tree\|git read-tree]]
	* '''[[/init\|git init]]''' initializes a new repository; does not add anything		\|-
	* '''[[/add\|git add]]''' updates the index using content found in the working tree (can be specified), to prepare the content staged for the next commit		\| '''[[/remote\|git remote]]''' \|\| copying \|\| manage aliases for remote repositories
	* '''[[/rm\|git rm]]''' removes files from staging '''and by default also from the filesystem'''		\|-
	* '''[[/status\|git status]]''' shows status of current repository		\| '''[[/reset\|git reset]]''' \|\| \|\| resets current HEAD to the specified state
	* '''[[/diff\|git diff]]''' shows difference between current directory contents and what you have staged		\|-
	* '''[[/commit\|git commit]]''' commits changes currently staged		\| '''[[/rm\|git rm]]''' \|\| repo creation 3 \|\| removes files from staging '''and by default also from the filesystem'''
	~~===copying to elsewhere===~~		\|-
	* '''[[/remote\|git remote]] add'''		\| '''[[/show\|git show]]'''
	* '''[[/push\|git push]]'''		\|-
	~~===copying from elsewhere===~~		\| '''[[/stash\|git stash]]''' \|\| \|\| saves local modifications, reverts the working directory to match HEAD commit
	* '''[[/clone\|git clone]]''' copies a repository from somewhere else		\|-
			\| '''[[/status\|git status]]''' \|\| repo creation 4 \|\| shows status of current repository
			\|-
			\| '''[[/submodule\|git submodule]]''' \|\| \|\| manages {{l/sub\|modules}}
			\|-
			\| '''[[/tag\|git tag]]''' \|\| \|\| creates an alias for a particular revision
			\|-
			\| '''[[/worktree\|git worktree]]
			\|-
			\| '''[[/write-tree\|git write-tree]]
	\|}		\|}
	===Files===		===Files===

← Older revision		Revision as of 16:04, 11 November 2021
Line 40:		Line 40:
	* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit		* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit
	* '''[[/status\|git status]]''' shows status of current repository		* '''[[/status\|git status]]''' shows status of current repository
			* '''[[/submodule\|git submodule]]''' manages {{l/sub\|modules}}
	* '''[[/tag\|git tag]]''' creates an alias for a particular revision		* '''[[/tag\|git tag]]''' creates an alias for a particular revision
	* '''[[/worktree\|git worktree]]		* '''[[/worktree\|git worktree]]

← Older revision		Revision as of 16:01, 13 September 2021
Line 36:		Line 36:
	* '''[[/remote\|git remote]]''' manage aliases for remote repositories		* '''[[/remote\|git remote]]''' manage aliases for remote repositories
	* '''[[/reset\|git reset]]''' resets current HEAD to the specified state		* '''[[/reset\|git reset]]''' resets current HEAD to the specified state
	* '''[[/rm\|git rm]]''' removes files from staging '''and also from the ~~directory~~'''		* '''[[/rm\|git rm]]''' removes files from staging '''and by default also from the filesystem'''
	* '''[[/show\|git show]]'''		* '''[[/show\|git show]]'''
	* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit		* '''[[/stash\|git stash]]''' saves local modifications, reverts the working directory to match HEAD commit
Line 49:		Line 49:
	* '''[[/init\|git init]]''' initializes a new repository; does not add anything		* '''[[/init\|git init]]''' initializes a new repository; does not add anything
	* '''[[/add\|git add]]''' updates the index using content found in the working tree (can be specified), to prepare the content staged for the next commit		* '''[[/add\|git add]]''' updates the index using content found in the working tree (can be specified), to prepare the content staged for the next commit
	* '''[[/rm\|git rm]]''' removes files from staging '''and also from the ~~directory~~'''		* '''[[/rm\|git rm]]''' removes files from staging '''and by default also from the filesystem'''
	* '''[[/status\|git status]]''' shows status of current repository		* '''[[/status\|git status]]''' shows status of current repository
	* '''[[/diff\|git diff]]''' shows difference between current directory contents and what you have staged		* '''[[/diff\|git diff]]''' shows difference between current directory contents and what you have staged