Git - Revision history

Unknown user: /* quick ref */

2025-08-19T12:58:29Z

quick ref

← Older revision		Revision as of 12:58, 19 August 2025
Line 23:		Line 23:
	the thing we always come here for:		the thing we always come here for:

	<pre>		<pre style="white-space: pre-wrap;">
	git filter-branch -f --env-filter "GIT_AUTHOR_NAME='Ch4zm of Hellmouth'; GIT_AUTHOR_EMAIL='ch4zm.of.hellmouth@gmail.com'; GIT_COMMITTER_NAME='Ch4zm of Hellmouth'; GIT_COMMITTER_EMAIL='ch4zm.of.hellmouth@gmail.com';" HEAD;		git filter-branch -f --env-filter "GIT_AUTHOR_NAME='Ch4zm of Hellmouth'; GIT_AUTHOR_EMAIL='ch4zm.of.hellmouth@gmail.com'; GIT_COMMITTER_NAME='Ch4zm of Hellmouth'; GIT_COMMITTER_EMAIL='ch4zm.of.hellmouth@gmail.com';" HEAD;
	</pre>		</pre>

2025-08-19T12:58:03Z

quick ref

← Older revision		Revision as of 12:58, 19 August 2025
Line 24:		Line 24:

	<pre>		<pre>
	git branch ~~new~~-~~feature~~		git filter-branch -f --env-filter "GIT_AUTHOR_NAME='Ch4zm of Hellmouth'; GIT_AUTHOR_EMAIL='ch4zm.of.hellmouth@gmail.com'; GIT_COMMITTER_NAME='Ch4zm of Hellmouth'; GIT_COMMITTER_EMAIL='ch4zm.of.hellmouth@gmail.com';" HEAD;
	~~git reset~~ --~~hard~~ HEAD~1
	~~git checkout new-feature~~
	</pre>		</pre>

2018-07-18T19:05:37Z

← Older revision		Revision as of 19:05, 18 July 2018
Line 17:		Line 17:

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


			===quick ref===

			the thing we always come here for:

			<pre>
			git branch new-feature
			git reset --hard HEAD~1
			git checkout new-feature
			</pre>

2018-04-27T21:55:42Z

@@ Line 13: / Line 13: @@
 Submodules: [[Git/Submodules]]
-Software carpentry steps:
+Notes on teaching git: [[Git/Software Carpentry]]
 [[Category:Git]]

2018-04-27T21:55:16Z

← Older revision		Revision as of 21:55, 27 April 2018
Line 8:		Line 8:

	Deleting a remote branch: [[Git/Delete Remote Branch]]		Deleting a remote branch: [[Git/Delete Remote Branch]]

			Tags: [[Git/Tags]]

	Submodules: [[Git/Submodules]]		Submodules: [[Git/Submodules]]

2018-04-26T12:50:11Z

← Older revision		Revision as of 12:50, 26 April 2018
Line 2:		Line 2:

	Notes on my most common git operations: [[Git Operations]]		Notes on my most common git operations: [[Git Operations]]

			Using Git to deploy static web content: [[Git Deployment]]

	Syncing a fork: [[Git/Sync a Fork]]		Syncing a fork: [[Git/Sync a Fork]]

2018-01-15T13:59:05Z

← Older revision		Revision as of 13:59, 15 January 2018
Line 6:		Line 6:

	Deleting a remote branch: [[Git/Delete Remote Branch]]		Deleting a remote branch: [[Git/Delete Remote Branch]]

			Submodules: [[Git/Submodules]]

	Software carpentry steps:		Software carpentry steps:

2017-11-17T22:58:42Z

← Older revision		Revision as of 22:58, 17 November 2017
Line 4:		Line 4:

	Syncing a fork: [[Git/Sync a Fork]]		Syncing a fork: [[Git/Sync a Fork]]

			Deleting a remote branch: [[Git/Delete Remote Branch]]

	Software carpentry steps:		Software carpentry steps:

2017-11-17T22:35:20Z

← Older revision		Revision as of 22:35, 17 November 2017
Line 2:		Line 2:

	Notes on my most common git operations: [[Git Operations]]		Notes on my most common git operations: [[Git Operations]]

			Syncing a fork: [[Git/Sync a Fork]]

	Software carpentry steps:		Software carpentry steps:

2017-03-28T18:13:55Z

← Older revision		Revision as of 18:13, 28 March 2017
Line 12:		Line 12:
	Question: why the two-stage process?		Question: why the two-stage process?

			Start with github
			* creating repos on github
			* collaborating on a repo with folks

			Conflicts
			* make 2 changes on side by side machines
			* go thru the process - can't push because you have to pull, can't pull because you have conflicts.


			Meld - command line tool

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