Skip to content

Latest commit

 

History

History
137 lines (97 loc) · 3.11 KB

git.md

File metadata and controls

137 lines (97 loc) · 3.11 KB

Rename master to main

git branch -m master main git fetch origin git branch -u origin/main main git remote set-head origin -a

Specify different author during commit

git commit --author="First Last [email protected]" --date "2021-01-18" -m "First person wrote this code. Christopher is committing it with a rough estimate of creation date."

Merge 2 repositories

# Go to repo that will receive merge
cd path/to/repo1

# Add remote to repo to be pulled/merged
git remote add repo2 /path/to/repo2
git fetch repo2 --tags

# merge repo2 into repo1. Repeat for each branch
git merge --allow-unrelated-histories repo2/master
git merge --allow-unrelated-histories repo2/main
git merge --allow-unrelated-histories repo2/develop

# Remove reference to the merged repo. Delete it once confirmed.
git remote remove project-a

Username/Email

# Global
git config --global user.name "Christopher W. Blake"
git config --global user.email "[email protected]"
git config --global user.email "[email protected]"

# Per Repo
git config user.name "Christopher W. Blake"
git config user.email "[email protected]"

Global gitignore (macos)

git config --global core.excludesfile ~/.gitignore

# Folder view configuration files
.DS_Store
Desktop.ini

# Thumbnail cache files
._*
Thumbs.db

# Files that might appear on external disks
.Spotlight-V100
.Trashes

Permanent delete file in Git Repository

git filter-repo --path-glob '*.mp4' --invert-paths --force
git push origin --force --all

python git-filter-repo --path-glob '*.secrets' --invert-paths --force
python git-filter-repo

Reference: This is a python tool. If not installed in $PATH, it has to be called directuly using python. https://github.com/newren/git-filter-repo

Remove local copies of removed remote branches (origin/*)

git fetch --prune

Create blank branch

git checkout --orphan <branch name>

Copy all branches from one remote to anothe (origin to target)

git push target 'refs/remotes/origin/*:refs/heads/*'

Enable/Disable tracking of a file

Will prevent future changes to a file.

# Disable tracking
git update-index --skip-worktree <file>

# Reenable tracking
git update-index --no-skip-worktree <file>

Show ignored files

git ls-files -v . | grep ^S

Git LFS - Setup and track

  1. Install on machine (if needed) brew install git-lfs
  2. Install for user (if needed) git lfs install
  3. Track a file type with LFS. git lfs track "*.psd"
  4. Ensure the .gitattributes file is tracked (for future clones). git add .gitattributes

Reference: https://git-lfs.com/

Git LFS - Migrate existing repo

git lfs migrate import --include=".zip" git lfs migrate import --include=".zip" --include-ref=refs/heads/master --include-ref=refs/heads/my-feature

git push --force

Reference: https://github.com/git-lfs/git-lfs/wiki/Tutorial#migrating-existing-repository-data-to-lfs

References: https://github.com/git-lfs/git-lfs/blob/main/docs/man/git-lfs-migrate.adoc?utm_source=gitlfs_site&utm_medium=doc_man_migrate_link&utm_campaign=gitlfs