Git - Revision history

Scott at 22:50, 25 April 2025

2025-04-25T22:50:03Z

@@ Line 1: / Line 1: @@
 == Initial Setup ==
 <pre>
@@ Line 6: / Line 11: @@
 </pre>
 May need to set up SSH-key authentication for gitlab.
 == Clone Repository ==
@@ Line 38: / Line 74: @@
 # or just write out a specific version for comparison
 git show 7f7a8214befd1903260e6c6ae65d9158e4249881:rails/public/faq.html > faq.html.old
 </pre>

2025-04-25T22:09:00Z

Cheat Sheets

← Older revision		Revision as of 22:09, 25 April 2025
Line 46:		Line 46:

	<pre>		<pre>
	git commit --amend # redo/fix the commit you just did		git commit --amend # redo/fix the commit you just did
	git branch # list branches (master is default, HEAD/* represents current)		git branch # list branches (master is default, HEAD/* represents current)
	git branch mybranch # create a new branch		git branch mybranch # create a new branch
	git branch -d mybranch # delete branch		git branch -d mybranch # delete branch
	git switch mybranch # switch to new branch		git switch mybranch # switch to new branch
	git switch -c mybranch # create new branch and switch to it		git checkout mybranch # switch to new branch
			git switch -c mybranch # create new branch and switch to it
			git checkout -b mybranch # create new branch and switch to it
	</pre>		</pre>

2025-04-24T22:13:46Z

Cheat Sheets

← Older revision		Revision as of 22:13, 24 April 2025
Line 49:		Line 49:
	git branch # list branches (master is default, HEAD/* represents current)		git branch # list branches (master is default, HEAD/* represents current)
	git branch mybranch # create a new branch		git branch mybranch # create a new branch
			git branch -d mybranch # delete branch
	git switch mybranch # switch to new branch		git switch mybranch # switch to new branch
	git switch -c mybranch # create new branch and switch to it		git switch -c mybranch # create new branch and switch to it

2025-04-22T23:50:46Z

Cheat Sheets

← Older revision		Revision as of 23:50, 22 April 2025
Line 48:		Line 48:
	git commit --amend # redo/fix the commit you just did		git commit --amend # redo/fix the commit you just did
	git branch # list branches (master is default, HEAD/* represents current)		git branch # list branches (master is default, HEAD/* represents current)
	git branch mybranch # ~~make~~ a new branch		git branch mybranch # create a new branch
	git switch mybranch # switch to new branch		git switch mybranch # switch to new branch
	git switch -c mybranch # create new branch and switch to it		git switch -c mybranch # create new branch and switch to it

2025-04-22T23:40:34Z

Cheat Sheets

← Older revision		Revision as of 23:40, 22 April 2025
Line 46:		Line 46:

	<pre>		<pre>
	git commit --amend # redo/fix the commit you just did		git commit --amend # redo/fix the commit you just did
			git branch # list branches (master is default, HEAD/* represents current)
			git branch mybranch # make a new branch
			git switch mybranch # switch to new branch
			git switch -c mybranch # create new branch and switch to it
	</pre>		</pre>

2025-04-18T22:54:36Z

Cheat Sheets

← Older revision		Revision as of 22:54, 18 April 2025
Line 45:		Line 45:
	https://github.com/kenmueller/gitignore		https://github.com/kenmueller/gitignore

			<pre>
			git commit --amend # redo/fix the commit you just did
			</pre>

	== Git Server ==		== Git Server ==

2025-01-01T23:01:18Z

Overwrite local from repository

← Older revision		Revision as of 23:01, 1 January 2025
Line 29:		Line 29:
	<pre>		<pre>
	git fetch --all		git fetch --all
	git reset --hard origin/master		git show-branch # to see whether branch is "master" or "main"
			git reset --hard origin/master # (or "origin/main" as above)
	</pre>		</pre>

2024-06-28T22:42:39Z

Overwrite a single file from repository

← Older revision		Revision as of 22:42, 28 June 2024
Line 35:		Line 35:
	<pre>		<pre>
	git checkout HEAD~ <filename>		git checkout HEAD~ <filename>
			# or just write out a specific version for comparison
			git show 7f7a8214befd1903260e6c6ae65d9158e4249881:rails/public/faq.html > faq.html.old
	</pre>		</pre>

2024-01-24T20:02:40Z

Overwrite local from repository

← Older revision		Revision as of 20:02, 24 January 2024
Line 30:		Line 30:
	git fetch --all		git fetch --all
	git reset --hard origin/master		git reset --hard origin/master
			</pre>

			== Overwrite a single file from repository ==
			<pre>
			git checkout HEAD~ <filename>
	</pre>		</pre>

2024-01-05T23:42:59Z

Git Server

← Older revision		Revision as of 23:42, 5 January 2024
Line 64:		Line 64:

	find $KEY_DIR -type f -exec grep -v '#' {} \; \| awk '$1' \| sort -u \| sed -e "s/^/${SSH_KEY_PREFIX} /" > $SSH_KEY_FILE		find $KEY_DIR -type f -exec grep -v '#' {} \; \| awk '$1' \| sort -u \| sed -e "s/^/${SSH_KEY_PREFIX} /" > $SSH_KEY_FILE
			</pre>
			<pre>
			root@perth:/opt/git-server/keys# ls -l
			total 16
			drwxr-xr-x 2 root root 4096 Nov 28 16:28 dc
			drwxr-xr-x 2 root root 4096 Nov 30 10:18 martin
			drwxr-xr-x 2 root root 4096 Nov 28 16:28 root
			drwxr-xr-x 2 root root 4096 Nov 28 16:28 statsuser
			</pre>
			<pre>
			root@perth:/opt/git-server/keys/martin# cat adelaide
			ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbyBYOnAoKLyNvittK+xyEt01NPnPC2XUFKz4bHeolz martin@adelaide
	</pre>		</pre>