Github

# Windows + Linux
ssh-keygen -t rsa -b 4096 -C "[email protected]"
# (-C for adding comment only)
# Enter a file:
# Linux: /home/thi/.ssh/id_rsa
# Windows: C:\Users\dinha\.ssh\id_rsa
# Enter password

# Tell who you are? (it's global, you may need to set it locally for each repo)
git config --global user.name "Thi Dinh"
git config --global user.email "[email protected]"

In case you have multiple accounts, you have to indicate separatedly the account in each repository,

git config user.name "Thi"
git config user.email "[email protected]"

If 2 accounts on 2 different platforms,

# ~/.ssh/config
# Default github account: [email protected]
Host github.com
   HostName github.com
   IdentityFile ~/.ssh/id_rsa
   IdentitiesOnly yes

# Other github account: [email protected]
Host github.com
   HostName github.com
   IdentityFile ~/.ssh/id_rsa_ideta
   IdentitiesOnly yes

If 2 accounts on the same platforms, eg. Github

Host *
	IdentityFile ~/.ssh/id_rsa.thi
	AddKeysToAgent yes

Host *
	IdentityFile ~/.ssh/id_rsa.ideta
	AddKeysToAgent yes

It's important on linux, otherwise, you won't be able to use ssh-agent in zsh environment

# ~/.zshrc
plugins=(git ssh-agent)

update_ssh(){
	eval "$(ssh-agent -s)"
	ssh-add ~/.ssh/id_rsa.ideta
	ssh-add ~/.ssh/id_rsa.thi
}
alias ud_ssh='update_ssh'

Everytime you have problems, just ud_ssh.

# Delete all cached keys (be careful)
ssh-add -D

# Be careful, it will reset and use different agent!!!!
eval "$(ssh-agent -s)"
ssh-add ~/.ssh/id_rsa
# ssh-add ~/.ssh/id_rsa_ideta

# Check saved keys
ssh-add -l

I wanna make a theme notetheme2 based on dinhanhthi.com.

1. Make dinhanhthi.com be a template (Go to Settings)

2. Create a new repo based on this template.

3. Create a new branch notetheme2 on dinhanhthi.com. Make changes on this branch.

4. Everything we have a "theme change" on dinhanhthi.com/master, merge it to branch dinhanhthi.com/notetheme2.

5. If there are files (only for files) in dinhanhthi.com/notetheme2 you wanna keep, add below line to .gitattributes (under branch dinhanhthi.com/notetheme2) before performing the merge,

   # add line to .gitattributes
   echo 'file_name.txt merge=ours' >> .gitattributes
   # on windows, remove `''`

6. If there are folders (or files) in dinhanhthi.com/notetheme2 you don't wanna keep (from /master), just delete them and make a new commit. From this time, later merges will ignore them.

7. If there are folders in /notethem2 you wanna keep the current state (instead of merging from master), create a script reset_folders.sh

   #!/bin/sh
   # used for branch notetheme2 only
   echo 'Reset some only-this-branch folders after merging.'
   git reset folder_1 folder_2
   git checkout .
   git add .
   git commit -m "update from master"

   Each time you run the merge, run

   git merge master && sh reset_folders.sh

8. Update changes from dinhanhthi.com/notetheme2 to repo notetheme2^[ref].

   # add dinhanhthi.com as a remote
   git remote add template [URL of the template repo]

   # update the changes
   git fetch --all

   # update from template's branch
   git merge template/notetheme2

9. If there is an error fatal: refusing to merge unrelated histories, try to add --allow-unrelated-histories. There must be conflict.

   # keep remotes
   git merge -X theirs template/notetheme2 --allow-unrelated-histories
   # keep local
   git merge -X ours template/notetheme2 --allow-unrelated-histories