Git

Submodules

Pull submodules after clone

git submodule update --init

Command Tricks

If you need to trigger a new build on your CI/CD, you can create an empty commit.

git commit --allow-empty

If you screw up your local copy

git reset --hard <remote branch name>
git reset --hard origin/develop

Interactive Rebase

Don’t waste time mucking with git ammend; it’s messy and complicated. TODO: more info here If you forgot something and you already pushed up your changes, you can still fix your commit. You need to instead run your rebase on the remote branch and do a force push. That means first make your fix and push it. If you try to rebase with local commits, it will screw everything up because you’re not in sync and you’ll create weird merge commits. Then after your fix, just run rebase normally but on the remote branch.

git commit -m "fix I forgot to add before pushing"
git push
git rebase -i origin/branch_name~2 branch_name
git push origin +branch_name

Resolving Issues

Fetch Crashing

If on git fetch you encounter an error related to “early EOF fatal,” you can increase the amount of RAM git has access to by adding this to your $HOME/.gitconfig.

[core] 
	packedGitLimit = 512m 
	packedGitWindowSize = 512m 
[pack] 
	deltaCacheSize = 2047m 
	packSizeLimit = 2047m 
	windowMemory = 2047m

Another possibility is the “unable to update local ref” error. A simple fix is to try to prune.

git gc --prune=now

Trashing Broken Branch

In the event of a branch that can’t easily be recoverable, you can simply rename the bad branch, create a new one, then apply all changes to the new branch as unstaged changes. Then you can clean up the code and make a new commit. This unfortunately destroys the git history.

# rename locally
git branch -m feature_name feature_name_old

# delete original on remote
git push origin --delete feature_name

# unset upstream
git branch --unset-upstream feature_name_old

# push new branch name
git push origin feature_name_old

# set new upstream
git push origin -u feature_name_old

# checkout branch you want to branch from
git checkout develop

# might as well grab latest
git fetch
git pull

# recreate original branch name
git checkout -b feature_name

# copy over all changes as unstaged
git merge --no-commit --no-ff feature_name_old

Obsidian Setup

git config --global --add safe.directory C:/Users/rickd/Source/Repos/Obsidian

Windows-style backslashes will not work. If you run the above command by pasting the windows directory, you will need to edit the global .gitconfig file. It is in the user’s home directory. You can quickly open it with git config --global -e to fix the slashes.

Force GPG Login

echo "test" | gpg --clearsign

Gitflow

To review: https://jeffkreeftmeijer.com/git-flow/ https://nvie.com/posts/a-successful-git-branching-model/

Common Commands