Git - Revision history

M at 00:14, 10 January 2026

2026-01-10T00:14:50Z

@@ Line 14: / Line 14: @@
   TeamTunes] git clone morosoph:development/thedigitalage/TeamTunes/TeamTunes-website.git
 * Add code and push!
 |}
 {| class="mw-collapsible mw-collapsed wikitable"

M at 00:14, 10 January 2026

2026-01-10T00:14:12Z

← Older revision		Revision as of 00:14, 10 January 2026
Line 3:		Line 3:
	! Set up a new shitcutter project		! Set up a new shitcutter project
	\|-		\|-
	\| ~~This is my development setup:~~		\| Setting up a new project:
	~~gitlab-repo < shared-bare-repo < lan-clients~~

	~~My shared-bare-repos are my source of truth. I don't want it to be gitlab, that just gets in the way when I'm on my LAN. But I do push code up there when I want to share with others.~~

	Setting up a new project:
	* Create the gitlab project with repo support.		* Create the gitlab project with repo support.
	* Grab the Clone with SSH line		* Grab the Clone with SSH line
	* Go to morosoph parent folder and paste the git line, adding --bare and --shared, and capitalizing as desired, eg:		* Go to morosoph parent folder and paste the git line, adding --bare and --shared, and capitalizing as desired, eg:
	git clone --shared --bare git@shitcutter.com:the-digital-age/teamtunes/teamtunes-website.git TeamTunes-website.git		git clone --shared --bare git@shitcutter.com:the-digital-age/teamtunes/teamtunes-website.git TeamTunes-website.git
			* Configure the bare repo to push to upstream on receive, just copy a hook, eg:
			🤔 m@morosoph [~/development/thedigitalage/TeamTunes/TeamTunes-android.git] cp ../TeamTunes-iOS.git/hooks/post-receive hooks/
			Ensure that the hook remote name (typically sc) matches config remote name (typically origin).
	* Go to client and clone:		* Go to client and clone:
	TeamTunes] git clone morosoph:development/thedigitalage/TeamTunes/TeamTunes-website.git		TeamTunes] git clone morosoph:development/thedigitalage/TeamTunes/TeamTunes-website.git

M at 22:29, 9 January 2026

2026-01-09T22:29:51Z

← Older revision		Revision as of 22:29, 9 January 2026
Line 8:		Line 8:
	My shared-bare-repos are my source of truth. I don't want it to be gitlab, that just gets in the way when I'm on my LAN. But I do push code up there when I want to share with others.		My shared-bare-repos are my source of truth. I don't want it to be gitlab, that just gets in the way when I'm on my LAN. But I do push code up there when I want to share with others.

	Setting up a new project ~~is a bit annoying~~. ~~Make this better~~:		Setting up a new project:
			* Create the gitlab project with repo support.
			* Grab the Clone with SSH line
			* Go to morosoph parent folder and paste the git line, adding --bare and --shared, and capitalizing as desired, eg:
			git clone --shared --bare git@shitcutter.com:the-digital-age/teamtunes/teamtunes-website.git TeamTunes-website.git
			* Go to client and clone:
			TeamTunes] git clone morosoph:development/thedigitalage/TeamTunes/TeamTunes-website.git
			* Add code and push!

			old dumb notes:

	* Create the gitlab project with repo support. Go to Settings > Repository > Protected branches and enable "Allowed to force push".		* Create the gitlab project with repo support. Go to Settings > Repository > Protected branches and enable "Allowed to force push".

M: /* TASKS */

2026-01-05T20:43:41Z

TASKS

← Older revision		Revision as of 20:43, 5 January 2026
Line 4:		Line 4:
	\|-		\|-
	\| This is my development setup:		\| This is my development setup:
	gitlab-repo < shared-bare-repo < clients		gitlab-repo < shared-bare-repo < lan-clients

	My shared-bare-repos are my source of truth. I don't want it to be gitlab, that just gets in the way when I'm on my LAN. But I do push code up there when I want to share with others.		My shared-bare-repos are my source of truth. I don't want it to be gitlab, that just gets in the way when I'm on my LAN. But I do push code up there when I want to share with others.

	~~To set~~ up a new project:		Setting up a new project is a bit annoying. Make this better:

	* Create the gitlab project with repo support.		* Create the gitlab project with repo support. Go to Settings > Repository > Protected branches and enable "Allowed to force push".
	* Create a new shared bare repo on LAN.		* Create a new shared bare repo on LAN.
	* Configure the bare repo to have the gitlab repo as upstream.		* Configure the bare repo to have the gitlab repo as upstream.
Line 19:		Line 19:
	* Clone shared-bare repo to a client.		* Clone shared-bare repo to a client.
	git clone morosoph:development/thedigitalage/TeamTunes/TeamTunes-android.git		git clone morosoph:development/thedigitalage/TeamTunes/TeamTunes-android.git
	* Create a main branch on the client.		* Create a main branch on the client. SADLY YOU HAVE TO COMMIT SOMETHING. What bs, git...
	git branch -M main		git branch -M main
	* Force-push the branch from client to bare repo:		git touch readme.txt
			git add readme.txt
			git commit -a -m "Init"
			* Force-push the branch from client to bare repo, it should go all the way to shitcutter:
	git push -uf main		git push -uf main
	~~It should go all~~ the ~~way~~ to ~~shitcutter~~.		* Go back to the gitlab project > Settings > Repository > Protected branches and disable "Allowed to force push".
	\|}		\|}
	{\| class="mw-collapsible mw-collapsed wikitable"		{\| class="mw-collapsible mw-collapsed wikitable"

M at 20:18, 5 January 2026

2026-01-05T20:18:02Z

@@ Line 1: / Line 1: @@
 === TASKS ===
 {| class="mw-collapsible mw-collapsed wikitable"
 ! New shared central bare repo
@@ Line 102: / Line 127: @@
 | Good for when you are force-pushing a branch rebase.
   git push [-f] origin mybranch:mybranch
 |}
 {| class="mw-collapsible mw-collapsed wikitable"

M at 19:41, 5 January 2026

2026-01-05T19:41:02Z

← Older revision		Revision as of 19:41, 5 January 2026
Line 104:		Line 104:
	\|}		\|}
	{\| class="mw-collapsible mw-collapsed wikitable"		{\| class="mw-collapsible mw-collapsed wikitable"
	! ~~Fetch from one origin (eg~~ gitlab~~) and push to another~~		! gitlab-repo < shared-bare-repo < clients
	\|-		\|-
	\| ~~My GitLab~~ is ~~usually a mirror~~, ~~and therefore~~ a ~~push target~~. ~~But if~~ you edit a file in GitLab, you may need to pull it from remote "gitlab" and push it to remote "sc", like this:		\| This is my development setup. I don't want to have to use gitlab as the source of truth on my LAN, it just gets in the way. But I do push code up there so I can share with others.

			* Create the gitlab project with repo support.
			* Create a new shared bare repo on LAN. Configure the gitlab repo as upstream.
			* Clone shared-bare repo to a client.
			\|}
			{\| class="mw-collapsible mw-collapsed wikitable"
			! Multiple upstream config example
			\|-
			\| If you edit a file in GitLab, you may need to pull it from remote "gitlab" and push it to remote "sc", like this:
	git fetch gitlab develop:develop		git fetch gitlab develop:develop
	git push sc		git push sc

M at 14:49, 24 July 2025

2025-07-24T14:49:04Z

← Older revision		Revision as of 14:49, 24 July 2025
Line 438:		Line 438:
	! Fix push behavior - allow push -f		! Fix push behavior - allow push -f
	\|-		\|-
	\| When did ~~this~~ become necessary?		\| When did it become necessary to configure the upstream to allow this?
	git config receive.denyNonFastForwards false # to allow git push -f		git config receive.denyNonFastForwards false # to allow git push -f
	git config receive.denyNonFastForwards true # to turn that back off, good practice i guess		git config receive.denyNonFastForwards true # to turn that back off, good practice i guess

M at 14:48, 24 July 2025

2025-07-24T14:48:15Z

← Older revision		Revision as of 14:48, 24 July 2025
Line 434:		Line 434:
	\|		\|
	git config --global push.autoSetupRemote true		git config --global push.autoSetupRemote true
			\|}
			{\| class="mw-collapsible mw-collapsed wikitable"
			! Fix push behavior - allow push -f
			\|-
			\| When did this become necessary?
			git config receive.denyNonFastForwards false # to allow git push -f
			git config receive.denyNonFastForwards true # to turn that back off, good practice i guess
	\|}		\|}
	{\| class="mw-collapsible mw-collapsed wikitable"		{\| class="mw-collapsible mw-collapsed wikitable"

M: /* CONFIGURATION */

2025-07-07T13:33:43Z

CONFIGURATION

← Older revision		Revision as of 13:33, 7 July 2025
Line 422:		Line 422:
	Fix it for a newly initialized repository:		Fix it for a newly initialized repository:
	git branch -m main		git branch -m main
			\|}
			{\| class="mw-collapsible mw-collapsed wikitable"
			! Fix push behavior - ONLY PUSH CURRENT doh
			\|-
			\|
			git config --global push.default current
	\|}		\|}
	{\| class="mw-collapsible mw-collapsed wikitable"		{\| class="mw-collapsible mw-collapsed wikitable"

M: /* CONFIGURATION */

2025-07-07T13:32:19Z

CONFIGURATION

← Older revision		Revision as of 13:32, 7 July 2025
Line 422:		Line 422:
	Fix it for a newly initialized repository:		Fix it for a newly initialized repository:
	git branch -m main		git branch -m main
			\|}
			{\| class="mw-collapsible mw-collapsed wikitable"
			! Fix push behavior - always create remote of a local branch name on push
			\|-
			\|
			git config --global push.autoSetupRemote true
	\|}		\|}
	{\| class="mw-collapsible mw-collapsed wikitable"		{\| class="mw-collapsible mw-collapsed wikitable"
Line 527:		Line 533:
	\|		\|
	git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"		git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"
	\|}
	~~{\| class="mw-collapsible mw-collapsed wikitable"~~
	~~! Fix push behavior - ONLY PUSH CURRENT doh~~
	\|-
	\|
	~~git config --global push.default current~~
	\|}		\|}
	{\| class="mw-collapsible mw-collapsed wikitable"		{\| class="mw-collapsible mw-collapsed wikitable"