Git notes - Revision history

Chubbard: /* mis-synced between parent and submodule commits */

2025-05-27T16:18:29Z

mis-synced between parent and submodule commits

← Older revision		Revision as of 09:18, 27 May 2025
Line 160:		Line 160:
	</pre>		</pre>

			== Find branch in detached head ==
			[https://stackoverflow.com/questions/6059336/how-to-find-the-current-git-branch-in-detached-head-state \| Find branch in detached head]
			<pre>
			git show-ref \| grep $(git log --pretty=%h -1) \| sed 's\|./$.$\|\1\|' \| sort -u \| grep -v HEAD
			</pre>

	[[Category:Git]]		[[Category:Git]]

2025-05-16T15:24:40Z

Drop changes and pull submodules

← Older revision		Revision as of 08:24, 16 May 2025
Line 142:		Line 142:
	== Drop changes and pull submodules ==		== Drop changes and pull submodules ==
	* When you have a submodule that is out of whack with the main repo and you cannot figure out which commit it is supposed to be at easily		* When you have a submodule that is out of whack with the main repo and you cannot figure out which commit it is supposed to be at easily

			* reset --hard gets rid of all local changes
			* clean -fdx removes untracked files and directories
			* The submodule update resets the submodule’s HEAD to what the parent repo wants

	<pre>		<pre>
	cd path/to/submodule		cd path/to/submodule

2025-05-16T15:23:39Z

Nuke a bad commit before push

@@ Line 139: / Line 139: @@
 git reset --hard HEAD~1
 </pre>
 [[Category:Git]]

2025-05-02T17:59:07Z

← Older revision		Revision as of 10:59, 2 May 2025
Line 128:		Line 128:
	git commit -m 'Remove references in submodule to nested submodules'		git commit -m 'Remove references in submodule to nested submodules'
	git push		git push
			</pre>

			== Nuke a bad commit before push ==
			* When you have saved a commit but it is not been pushed and you want to get rid of it
			<pre>
			Keep the work done:
			git reset --soft HEAD~1

			Destroy all work done and get last full commit
			git reset --hard HEAD~1
	</pre>		</pre>

	[[Category:Git]]		[[Category:Git]]

2025-01-07T18:52:33Z

Remove submodules of submodules

← Older revision		Revision as of 11:52, 7 January 2025
Line 123:		Line 123:
	cat .gitmodules		cat .gitmodules
	Verify no references to submodules of submodules		Verify no references to submodules of submodules
			git submodule status --recursive
	git status		git status
	git add -A		git add -A

2024-12-12T23:09:10Z

Clean up local orphan branches

← Older revision		Revision as of 16:09, 12 December 2024
Line 93:		Line 93:
	When you have branches locally present that have been merged on the remote server this works to clean out your local repo.		When you have branches locally present that have been merged on the remote server this works to clean out your local repo.

	If there are still some that you want to keep, add in a '~~git~~ -v "someName"' before xargs		If there are still some that you want to keep, add in a 'grep -v "someName"' before xargs

	[https://stackoverflow.com/questions/7726949/remove-tracking-branches-no-longer-on-remote remove tracking branches no longer on remote]		[https://stackoverflow.com/questions/7726949/remove-tracking-branches-no-longer-on-remote remove tracking branches no longer on remote]

2024-12-04T19:08:21Z

Get latest commit hash for scripts

@@ Line 103: / Line 103: @@
 <pre>
 git rev-parse HEAD
 </pre>
 [[Category:Git]]

2024-10-21T16:53:18Z

Clean up local orphan branches

← Older revision		Revision as of 09:53, 21 October 2024
Line 100:		Line 100:
	</pre>		</pre>

			== Get latest commit hash for scripts ==
			<pre>
			git rev-parse HEAD
			</pre>

	[[Category:Git]]		[[Category:Git]]

2024-07-17T23:41:53Z

Change remote URL

@@ Line 78: / Line 78: @@
 <pre>
 git remote set-url origin new.git.url/here
 </pre>

2024-06-12T17:00:49Z

Change remote URL

@@ Line 79: / Line 79: @@
 git remote set-url origin new.git.url/here
 </pre>
 [[Category:Git]]