Git - Revision history

Leo: /* Correcting multiple commits' author */

2024-02-06T17:02:09Z

Correcting multiple commits' author

← Older revision		Revision as of 17:02, 6 February 2024
Line 292:		Line 292:
	{{Highlight		{{Highlight
	\| code = ## Change the author for the past 2 commits		\| code = ## Change the author for the past 2 commits
	$ git filter-branch --commit-filter '		$ FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --commit-filter '
	GIT_AUTHOR_NAME="Leo Leung";		GIT_AUTHOR_NAME="Leo Leung";
	GIT_AUTHOR_EMAIL="leo@example.com";		GIT_AUTHOR_EMAIL="leo@example.com";

Leo at 21:37, 18 August 2023

2023-08-18T21:37:14Z

← Older revision		Revision as of 21:37, 18 August 2023
Line 1:		Line 1:
			Git is a version control system.

	==Introduction==		==Introduction==
	~~As someone who first used SVN~~ in the ~~mid 2000s, switching over to git was initially a bit confusing since the terminology is different. Hopefully, this usage guide will help~~.		There are a few basic commands that you should be familiar with. The following table covers 99% of all the commands I use with Git in the command line.
	{\| class="wikitable"		{\| class="wikitable"
	!Family		!Family
Line 147:		Line 148:
	HostName git.example.com		HostName git.example.com
	IdentityFile ~/.ssh/gitlab-remote		IdentityFile ~/.ssh/gitlab-remote
	}}~~<br />~~		}}

	===Branches===		===Branches===

Line 304:		Line 304:

	*Gogs		*Gogs
	*GitLab		*[[GitLab]]
	*Gitea		*Gitea, a fork of Gogs but has feature set that rivals GitLab.
			Tools:

			* Lazygit - https://github.com/jesseduffield/lazygit

	===Resources===		===Resources===

Leo: Correct multiple commit's author in git

2023-07-25T17:49:53Z

Correct multiple commit's author in git

@@ Line 282: / Line 282: @@
 }}
 In GitLab, ensure that all affected branches are deleted and then re-pushed. Otherwise, the file might still be lingering even after doing a house cleaning.
 ==See Also==

Leo at 17:57, 31 March 2022

2022-03-31T17:57:44Z

← Older revision		Revision as of 17:57, 31 March 2022
Line 12:		Line 12:
	<code>git config --global user.email "leo@somewhere"</code>		<code>git config --global user.email "leo@somewhere"</code>
	\|-		\|-
	\| rowspan="4" \|Branches		\| rowspan="5" \|Branches
	\|Creates a new branch and switch to it immediately		\|Creates a new branch and switch to it immediately
	\|<code>git checkout -b [branch-name]</code>		\|<code>git checkout -b [branch-name]</code>
Line 24:		Line 24:
	\|Deletes the specified branch		\|Deletes the specified branch
	\|<code>git branch -d [branch]</code>		\|<code>git branch -d [branch]</code>
			\|-
			\|Create a new branch from a specific commit
			\|<code>git branch [branch] [commit-id]</code>
	\|-		\|-
	\| rowspan="3" \|Tags		\| rowspan="3" \|Tags

Leo: Tags

2022-03-24T16:49:24Z

Leo at 01:22, 18 December 2021

2021-12-18T01:22:18Z

← Older revision		Revision as of 01:22, 18 December 2021
Line 235:		Line 235:

	See also: www.micah.soy/posts/setting-up-git-identities/		See also: www.micah.soy/posts/setting-up-git-identities/

			== Tasks ==

			=== Removing a large file from commit history ===
			If someone accidentally committed a large file into git, you can remove it using the BFG Repo-Cleaner (https://rtyley.github.io/bfg-repo-cleaner/) java utility. This tool will look for any deleted files and remove it from the history. In doing so, it will also rewrite all the affected commits.
			{{Highlight
			\| code = $ java -jar bfg.jar --strip-blobs-bigger-than 10M my-repo
			$ cd my-repo
			$ git reflog expire --expire=now --all
			$ git gc --prune=now --aggressive
			## If you have the repo hosted somewhere, do a force push to overwrite the history there.
			$ git push --force
			\| lang = terminal
			}}
			In GitLab, ensure that all affected branches are deleted and then re-pushed. Otherwise, the file might still be lingering even after doing a house cleaning.

	==See Also==		==See Also==

Leo: /* Introduction */

2021-07-23T04:13:23Z

Introduction

← Older revision		Revision as of 04:13, 23 July 2021
Line 58:		Line 58:
	\|-		\|-
	\|Amend the last commit with different author		\|Amend the last commit with different author
	\|<code>git commit --amend --author="Leo Leung <leo@somewhere>"</code>		\|<code>git commit --amend --author="Leo Leung <leo@somewhere>"</code>
	\|-		\|-
	\| rowspan="2" \|Mistakes		\| rowspan="2" \|Mistakes
Line 68:		Line 68:
	\|-		\|-
	\|		\|
	\|		\|Restore a deleted file (staged, before it's committed)
	\|		\|<code>git checkout -f [file]</code>
	\|}		\|}

Line 136:		Line 136:
	}}<br />		}}<br />

	=== Branches ===		===Branches===

	==== Create a new branch ====		====Create a new branch====
	To create a new branch from the master branch		To create a new branch from the master branch
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=
Line 155:		Line 155:
	}}		}}

	=== Pushing changes upstream ===		===Pushing changes upstream===
	After making a new change in your repository, you may want to push your changes out to other repositories:		After making a new change in your repository, you may want to push your changes out to other repositories:
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=

Leo: /* Introduction */

2021-07-03T04:25:16Z

Introduction

Show changes

Leo at 04:17, 3 July 2021

2021-07-03T04:17:06Z

@@ Line 1: / Line 1: @@
-==Quick Use Guide==
+==Introduction==
-As someone who used SVN for the last decade, switching over to git was slightly confusing since the terminology is different. Hopefully, this usage guide will help.
+As someone who first used SVN in the mid 2000s, switching over to git was initially a bit confusing since the terminology is different. Hopefully, this usage guide will help.
 ===Committing Files===
@@ Line 75: / Line 141: @@
 You may also specify a specific remote and branch as well. Eg: {{code|git push remote-name branch-name}}.
-Conversely, to retrieve changes from another repository, run
+Conversely, to retrieve changes from another repository, run:
 {{highlight|lang=terminal|code=
 $ git pull
-}}
+}}This will immediately merge all changes to the local repository and create a merge commit if required. If you do not want to merge changes yet, do a <code>git fetch</code> instead.
 ===Merging===
@@ Line 147: / Line 213: @@
 }}
-=== Rebasing ===
+===Rebasing===
 If for some reason your master has diverged from the upstream repository (such as if changes were made to master simultaneously while you were working on your local copy), you will notice that the history between both repositories are different. A git pull will result in either a message about a diverged branch, or conflicts between the local and remote changes.
 The fix is to either:
-# Merge your work upstream (<code>git merge origin/master</code>), thereby integrating your changes with the upstream repo and then commit your changes, or
+#Merge your work upstream (<code>git merge origin/master</code>), thereby integrating your changes with the upstream repo and then commit your changes, or
-# Rebase your work on the upstream master using the <code>git rebase origin/master</code> command. Alternatively, you can also git pull with the rebase option (<code>git pull --rebase origin/master</code>) to rebase with the local work as part of the pull.
+#Rebase your work on the upstream master using the <code>git rebase origin/master</code> command. Alternatively, you can also git pull with the rebase option (<code>git pull --rebase origin/master</code>) to rebase with the local work as part of the pull.
-# If you don't care about your changes, <code>git reset --hard origin/master</code> will bring your local repo up to speed with the upstream, discarding any changes you've already made.
+#If you don't care about your changes, <code>git reset --hard origin/master</code> will bring your local repo up to speed with the upstream, discarding any changes you've already made.
 ==Identities==
@@ Line 169: / Line 235: @@
 Create each new identity.
-See:
+See also: www.micah.soy/posts/setting-up-git-identities/
-*www.micah.soy/posts/setting-up-git-identities/
+== See Also ==
-==Examples==
+* Gogs
-*http://stackoverflow.com/questions/215718/reset-or-revert-a-specific-file-to-a-specific-revision-using-git
+=== Resources ===
 {{Navbox Linux}}
 [[Category:Linux]]
 [[Category:LinuxUtilities]]

Leo at 23:23, 22 October 2020

2020-10-22T23:23:45Z

← Older revision		Revision as of 23:23, 22 October 2020
Line 1:		Line 1:

	== Quick Use Guide ==		==Quick Use Guide==
	As someone who used SVN for the last decade, switching over to git was slightly confusing since the terminology is different. Hopefully, this usage guide will help.		As someone who used SVN for the last decade, switching over to git was slightly confusing since the terminology is different. Hopefully, this usage guide will help.

	=== Committing Files ===		===Committing Files===
	A commit is like a snapshot of the code at a particular time in the repository. It is possible to recover code to a previous commit if something were to happen to the code (such as accidental bugs being introduced, or accidentally deleting or modifying some file).		A commit is like a snapshot of the code at a particular time in the repository. It is possible to recover code to a previous commit if something were to happen to the code (such as accidental bugs being introduced, or accidentally deleting or modifying some file).

Line 21:		Line 21:
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=
	$ git commit -m 'message'		$ git commit -m 'message'
			}}If you need to commit your changes to a separate branch, such as if you started working on a new feature but it isn't quite ready yet, create a new branch and then commit.{{highlight\|lang=terminal\|code=
			$ git checkout -b wip_feature
			$ git commit -a
	}}		}}

	=== Reverting Changes ===		===Reverting Changes===
	To revert all changes in the current repository, use:		To revert all changes in the current repository, use:
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=
Line 37:		Line 40:
	}}		}}

	=== Remote Origins ===		===Remote Origins===
	Git allows you to push/pull changes from other remote git repositories. Remote repositories can be in another path or hosted somewhere on the internet.		Git allows you to push/pull changes from other remote git repositories. Remote repositories can be in another path or hosted somewhere on the internet.

Line 64:		Line 67:
	}}		}}

	==== Pushing / Pulling ====		====Pushing / Pulling====
	After making a new change in your repository, you may want to push your changes out to other repositories. Do so by running:		After making a new change in your repository, you may want to push your changes out to other repositories. Do so by running:
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=
Line 77:		Line 80:
	}}		}}

	=== Merging ===		===Merging===
	After creating a new branch {{code\|development}} and making changes to this branch, you may want to merge the changes on the {{code\|development}} branch back into {{code\|master}}.		After creating a new branch {{code\|development}} and making changes to this branch, you may want to merge the changes on the {{code\|development}} branch back into {{code\|master}}.
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=
Line 88:		Line 91:
	The {{code\|--no-ff}} flag prevents the merge from executing a fast-forward. This ensures that a new node will be constructed that records the merge event instead of a fast-forwarding on the branch.		The {{code\|--no-ff}} flag prevents the merge from executing a fast-forward. This ensures that a new node will be constructed that records the merge event instead of a fast-forwarding on the branch.

	=== Restore Deleted File ===		===Restore Deleted File===
	If you notice files are missing somewhere and aren't sure which commit triggered its deletion, run the following to determine the last commit that altered this path.		If you notice files are missing somewhere and aren't sure which commit triggered its deletion, run the following to determine the last commit that altered this path.
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=
Line 101:		Line 104:
	See also: https://stackoverflow.com/questions/953481/find-and-restore-a-deleted-file-in-a-git-repository		See also: https://stackoverflow.com/questions/953481/find-and-restore-a-deleted-file-in-a-git-repository

	== Branches ==		==Branches==
	=== Create a new branch ===		===Create a new branch===
	To create a new branch from the master branch		To create a new branch from the master branch
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=
Line 113:		Line 116:
	}}		}}

	=== Delete a branch ===		===Delete a branch===
	To delete a branch		To delete a branch
	{{highlight\|lang=terminal\|code=		{{highlight\|lang=terminal\|code=
Line 119:		Line 122:
	}}		}}

	=== Pulling & Merging ===		===Pulling & Merging===
	When implementing a feature, it's ideal to separate each feature into its own branch. To test multiple features together, you will need to merge these branches together. Do this using the {{code\|git pull}} command.		When implementing a feature, it's ideal to separate each feature into its own branch. To test multiple features together, you will need to merge these branches together. Do this using the {{code\|git pull}} command.

Line 144:		Line 147:
	}}		}}

	== Identities ==		=== Rebasing ===
			If for some reason your master has diverged from the upstream repository (such as if changes were made to master simultaneously while you were working on your local copy), you will notice that the history between both repositories are different. A git pull will result in either a message about a diverged branch, or conflicts between the local and remote changes.

			The fix is to either:

			# Merge your work upstream (<code>git merge origin/master</code>), thereby integrating your changes with the upstream repo and then commit your changes, or
			# Rebase your work on the upstream master using the <code>git rebase origin/master</code> command. Alternatively, you can also git pull with the rebase option (<code>git pull --rebase origin/master</code>) to rebase with the local work as part of the pull.
			# If you don't care about your changes, <code>git reset --hard origin/master</code> will bring your local repo up to speed with the upstream, discarding any changes you've already made.

			==Identities==
	Users typically use the global identity when using Git. This is great if you use the same identity across all repos.		Users typically use the global identity when using Git. This is great if you use the same identity across all repos.

Line 158:		Line 170:

	See:		See:
	* www.micah.soy/posts/setting-up-git-identities/

	== Examples ==		*www.micah.soy/posts/setting-up-git-identities/
	* http://stackoverflow.com/questions/215718/reset-or-revert-a-specific-file-to-a-specific-revision-using-git
	* http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull		==Examples==

			*http://stackoverflow.com/questions/215718/reset-or-revert-a-specific-file-to-a-specific-revision-using-git
			*http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull

	{{Navbox Linux}}[[Category:Linux]]		{{Navbox Linux}}
			[[Category:Linux]]
	[[Category:LinuxUtilities]]		[[Category:LinuxUtilities]]

@@ Line 24: / Line 24: @@
 |Deletes the specified branch
 |<code>git branch -d [branch]</code>
 |-
 | rowspan="4" |Synchronizing Changes
@@ Line 155: / Line 165: @@
 }}
-===Pushing changes upstream===
+=== Pushing changes upstream ===
 After making a new change in your repository, you may want to push your changes out to other repositories:
 {{highlight|lang=terminal|code=
@@ Line 162: / Line 172: @@
 $ git push -u origin master
 }}
 ===Pulling & Merging===