Authentication (2FA)

Command line

Generate new token select permissions repo
Use generated token as password to authenticate login
```
Username: your_username
Password: your_token
```

Git commit

git add . to add your changes to git
git commit -m "commit msg"

Fetch and Rebase remote version

Before fetch remote repo, be sure you have already committed your changes
git fetch
git rebase origin/master (Put the name of your branch)
Resolve conflict if there are
git add .
git rebase --continue

Merge

Merge a git branch into master

git checkout master
git pull origin master
git merge name_of_branch_to_merge

Make a branch as master branch

git checkout master
git checkout -b name_of_copy_of_master_branch //make a copy of master branch
git checkout master
git reset --hard b8c3(form which commit created the branch)
git merge name_of_branch_to_merge
git branch -d name_of_branch_to_merge

Ignore committed folder

nano .gitignore
add Pods/ in .gitignore
git rm -r --cached Pods/
git commit -m "remove pods"
git push

Branch

Rename branch

1. Rename your local branch. If you are on the branch you want to rename:

`git branch -m new-name`

If you are on a different branch:

`git branch -m old-name new-name`

2. Delete the old-name remote branch and push the new-name local branch.

`git push origin :old-name new-name`

3. Reset the upstream branch for the new-name local branch. Switch to the branch and then:

`git push origin -u new-name`

Delete branch

git branch | grep -v "master" | xargs git branch -D

grep -v: Fetch all branches exclude the branches that its name contains word “master”.

xargs: Kind of for each loop

Commit

Search Commit

Method 1:

https://github.com/search
Insert user/repo and content to look for user:shic repo:react-boilerplate-2017 table

Method 2:

git log -g -i --grep='Table'

git log --all --oneline | grep -i "Table"

-i: ignore case

’ ‘ or “ “ both works

Git log

git reflog

Delete github remote commit

git reset –hard 894c60974b
git push -f

Bug detect

Git checkout

git checkout {commit}
git chekout master //remember to checkout to master before any commit!!!

Git bisect

git bisect start
git bisect bad # to indicate current commit is broken
git bisect good {commit} # to indicate the last good commit
git bisect bad|good # you'll run this command over and over while Git changes commits to find which commit introduced the bug
git bisect reset # to bail out of everything and move back to original HEAD (i.e. the latest broken commit)

You can also filter what commits are included in a bisect like so:

git bisect start -- ./sub_directory

This will mean only commits that affected files inside of ./sub_directory are considered.

Note: you can also specify a range of commits to skip: git bisect skip 0dae5f ff049ab ...

Create a branch from uncommitted changes

(https://stackoverflow.com/questions/2569459/git-create-a-branch-from-unstaged-uncommitted-changes-on-master)

git checkout -b new_branch_name
git add .
git commit -m "<Brief description of this commit>"

Change remote url

Check remote url git remote -v
Change remote url ` git remote set-url origin https://github.com/shic/uper-web.git`

Repository

Duplicate a repository

Create a bare clone of the repository.
```
git clone --bare https://github.com/exampleuser/old-repository.git
```
Got temporary local repository repo old-repository.git

Mirror-push to the new repository.

cd old-repository.git
git push --mirror https://github.com/exampleuser/new-repository.git

Remove the temporary local repository you created

Keep your fork repo synced

Fetch the branches and their respective commits from the upstream repository.

Commits to master will be stored in a local branch, upstream/master.
```
git fetch upstream
```

Merge the changes from upstream/master into your local master branch.

git checkout master // Switched to branch 'master'
git merge upstream/master

Add remote upstream （If not added）

Get remote URL:

git remote -v
origin  https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch)
origin  https://github.com/YOUR_USERNAME/YOUR_FORK.git (push)

Add remote upstream

git remote add upstream https://github.com/octocat/Spoon-Knife.git

and verify if new upstream added

git remote -v
origin    https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch)
origin    https://github.com/YOUR_USERNAME/YOUR_FORK.git (push)
upstream  https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (fetch)
upstream  https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (push)

Git Large File Storage

Install LFS

xcode-select –install
brew install git-lfs
git lfs install

Moving a file in your repository to Git Large File Storage

git lfs migrate info //Check large files
git lfs track "*.sketch"
git add .gitattributes

Git hook

Create pre-commit file in .git/hooks
Remember to change the access permissions: ` chmod +x pre-commit`
pre-commit file:

    gofiles=$(git diff --cached --name-only --diff-filter=ACM | grep '.go$')
    [ -z "$gofiles" ] && exit 0
    
    function checkfmt() {
      unformatted=$(gofmt -l $gofiles)
      [ -z "$unformatted" ] && return 0
    
      echo >&2 "Go files must be formatted with gofmt. Please run:"
      for fn in $unformatted; do
        echo >&2 "  gofmt -w $PWD/$fn"
      done
    
      return 1
    }
    
    checkfmt || fail=yes
    
    [ -z "$fail" ] || exit 1
    
    exit 0

Note:  Bash instruction https://devhints.io/bash

You can link script to .git/hooks/pre-commit if you want to commit script. Goto root path and execute:

ln -s ../../pre-commit.sh .git/hooks/pre-commit

Skip the pre-commit hook

Be aware of the --no-verify option to git commit. This bypasses the pre-commit hook when committing

Git Basics

Some useful command lines