/learn-git-and-github

learn-git-and-github

  • Git keeps asking me for my ssh key passphrase => You have to add your private key to it: ssh-add -K (On terminal : /usr/bin/ssh-add -K) : https://superuser.com/questions/1127067/macos-keeps-asking-my-ssh-passphrase-since-i-updated-to-sierra

  • List the remote origin : git remote -v

  • Add remote url : git remote add origin "SSH address"

  • Set remote url : git remote set-url origin "SSH address"

  • Remove remote origin : git remote remove origin

  • Git refusing to merge unrelated histories on rebase : git pull origin branchname --allow-unrelated-histories

Remote problems (solution: use HTTPS)

Configure git usename

git config --global user.name "Your Name"
git config --global user.email "youremail@yourdomain.com"

Generating SSH key on Windows

  • open git bash, create folder name .ssh, then run this : ssh-keygen.exe
  • On Source Tree: Tools - Options - select SSH Client - select SSH Key

Generate SSH key on Mac

Branching

Git is refusing to merge unrelated histories. What are 'unrelated histories'?

git pull origin master --allow-unrelated-histories

Remove branch local & remote

git branch -d {local_branch}
git push origin -d {remote_branch}

GitHub Pages:

.gitignore

  • how to make Git ignore .idea files created by Rubymine : git rm -r --cached .idea

Reset branch to the last commit

  • git log
  • In the server, move the cursor back to the last known good commit: git push -f origin <last_known_good_commit>:<branch_name>
  • Locally, do the same: git reset (--hard) <last_known_good_commit>

Git bash on Pycharm