Git & GitHub

Created: 30 May 2016

Author:  Chen Xie

1 Config

# name,email 涉及contribution统计

git config --global user.name "Chen Xie"
git config --global user.email "chenxie2016@outlook.com"

# simple for current branch, matching for all branches

git config --global push.default simple

# sensitive to up/lower case

git config core.ignorecase false

# check all config
git config --list

2 SSH Key

ssh-keygen -t rsa -b 4096 -C "your_email@example.com"

#under ~/.ssh/
#id_rsa.pub is public key for GitHub

# different location to generate key Files
ssh-keygen -t rsa -f ~/Documents/sshkey/{name}

3 Recovery

3.1 for entire folder

git reset --hard # discard all changes
git clean -f -d #remove untracked
git clean -f -d -x # above plus ignored file

3.2 for file

# last commit
git checkout filename

# one commit
git log
# choose one commit to recover
git checkout --HEAD filename

3.3 for commit point

#TODO
git reset

4 Change Remote Repo

# set new remote repo url

git remote set-url origin {url}

# 查看现有Remote Repo

git remote -v

5 Tag

资料

6 Show Changes

6.1 all unstaged(committed) Changes

git diff --cached

7 Problem

contribution 不显示（记录）

match principle

8 Files

8.1 .gitignore

Add .gitignore file later, to apply the file:

git rm -r --cached .
git add .

### General
*.[oa] *~      # Gedit
.*.sw[po]     # Vim
.DS_Store  # Mac_OS

### Java

#### Mobile Tools for Java (J2ME)

.mtj.tmp/

#### compile

*.class
target

#### Package
*.war
*.ear
*.jar

#### Eclipse
.project
.classpath
.settings
.metadata

#### virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# linux