Here’s how to reset a file from the master branch.
git checkout origin/master test.py |
This will undo your changes and matches what’s in the master repo.
git
Git Switch from HTTPS to SSH
If you have trouble cloning a github repo using https, you can tell it to switch to SSH instead.
Here’s the command.
git config --global url.ssh://git@github.com/.insteadOf https://github.com/ |
I had to specify reconfigure when I ran terraform init.
terraform init --reconfigure |
Install Docker on Amazon Linux 2
Steps how to install Docker and Docker Compose on Amazon Linux 2.
Install Docker
$ sudo amazon-linux-extras install docker $ sudo service docker start $ sudo usermod -a -G docker ec2-user |
Start at boot.
$ sudo chkconfig docker on |
Install git (optional).
$ sudo yum install -y git |
Install Docker Compose
$ sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) \ -o /usr/bin/docker-compose $ sudo chmod +x /usr/local/bin/docker-compose |
Check
docker --version docker-compose --version |
Git Clone Multiple Accounts
How to clone repositories with multiple Github accounts.
git clone git@github.com-yourgitaccount:yourgitaccount/myrepo.git |
Git Undo Add
To undo a git add, run git reset file or get reset.
git reset filename git reset |
Run git status to check.
git status |
AWS IAM Self Manage Policy
Here’s the permission needed for an AWS user to manage their own IAM account. The policy allows them to view their own account information, change their own passwords, rotate access keys and certificates, and manage their own git credentials.
{ "Version": "2012-10-17", "Statement": [ { "Sid": "AllowViewAccountInfo", "Effect": "Allow", "Action": [ "iam:GetAccountPasswordPolicy", "iam:GetAccountSummary" ], "Resource": "*" }, { "Sid": "AllowManageOwnPasswords", "Effect": "Allow", "Action": [ "iam:ChangePassword", "iam:GetUser" ], "Resource": "arn:aws:iam::*:user/${aws:username}" }, { "Sid": "AllowManageOwnAccessKeys", "Effect": "Allow", "Action": [ "iam:CreateAccessKey", "iam:DeleteAccessKey", "iam:GetAccessKeyLastUsed", "iam:ListAccessKeys", "iam:UpdateAccessKey" ], "Resource": "arn:aws:iam::*:user/${aws:username}" }, { "Sid": "AllowManageOwnSigningCertificates", "Effect": "Allow", "Action": [ "iam:DeleteSigningCertificate", "iam:ListSigningCertificates", "iam:UpdateSigningCertificate", "iam:UploadSigningCertificate" ], "Resource": "arn:aws:iam::*:user/${aws:username}" }, { "Sid": "AllowManageOwnSSHPublicKeys", "Effect": "Allow", "Action": [ "iam:DeleteSSHPublicKey", "iam:GetSSHPublicKey", "iam:ListSSHPublicKeys", "iam:UpdateSSHPublicKey", "iam:UploadSSHPublicKey" ], "Resource": "arn:aws:iam::*:user/${aws:username}" }, { "Sid": "AllowManageOwnGitCredentials", "Effect": "Allow", "Action": [ "iam:CreateServiceSpecificCredential", "iam:DeleteServiceSpecificCredential", "iam:ListServiceSpecificCredentials", "iam:ResetServiceSpecificCredential", "iam:UpdateServiceSpecificCredential" ], "Resource": "arn:aws:iam::*:user/${aws:username}" } ] } |
XCode after Catalina Upgrade
I tried running git after the Mac OS Catalina upgrade and got this error.
xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun |
Here’s the fix. For some very odd reason, Apple does not automatically reinstall xcode after each Mac OS upgrade.
You will need to either reset it or install it again.
# Try reset first xcode-select --reset # Or install it if reset doesn't work xcode-select --install |
Close your terminal, and reopen and run git again.
Git Diff Head
Here’s how to check what’s changed in your local Git repo vs the master repo.
Git Status tells you what file has changed, but not to the level of detail such as what lines or what code was changed.
git diff HEAD |