From charlesreid1

No edit summary
 
(7 intermediate revisions by 2 users not shown)
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]]


Software carpentry steps:
Deleting a remote branch: [[Git/Delete Remote Branch]]
* why version control
 
* the philosophy behind git
Tags: [[Git/Tags]]
* git config file
 
* creating a git repo - git init
Submodules: [[Git/Submodules]]
* dot git folder
 
Notes on teaching git: [[Git/Software Carpentry]]


Question: why the two-stage process?


Start with github
[[Category:Git]]
* 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.


===quick ref===


Meld - command line tool
the thing we always come here for:


[[Category:Git]]
<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;
</pre>

Latest revision as of 12:58, 19 August 2025

A curated list that will one day soon become git-awesome: Git Resources

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

Deleting a remote branch: Git/Delete Remote Branch

Tags: Git/Tags

Submodules: Git/Submodules

Notes on teaching git: Git/Software Carpentry


quick ref

the thing we always come here for:

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;