## 从远程仓库获取最新修改
git fetch [remote] [branch]  
## 合并最新修改
git merge [remote][/branch]

## 从远程仓库获取最新修改
git fetch [remote] [branch]
git rebase [remote][/branch]

git add --patch <file>

git add --patch package.json
diff --git a/package.json b/package.json
index 7a558a3..e03ce3f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
   "name": "package",
   "version": "0.4.3",
   "description": "this is an example package",
-  "keywords": ["key", "middleware", "connect"],
   "repository": "git://github.com/foo/bar.git",
   "author": "jxt <[email protected]> (http://gitfaq.cn)",
   "repository": "git://github.com/foo/bar",
Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]? y

y - stage this hunk 暂存此区块
n - do not stage this hunk 不暂存此区块
q - quit; do not stage this hunk or any of the remaining ones 退出；不暂存包括此块在内的剩余的区块
a - stage this hunk and all later hunks in the file 暂存此块与此文件后面所有的区块
d - do not stage this hunk or any of the later hunks in the file 不暂存此块与此文件后面所有的区块
g - select a hunk to go to 选择并跳转至一个区块
/ - search for a hunk matching the given regex 搜索与给定正则表达示匹配的区块
j - leave this hunk undecided, see next undecided hunk 暂不决定，转至下一个未决定的区块
J - leave this hunk undecided, see next hunk 暂不决定，转至下一个区块
k - leave this hunk undecided, see previous undecided hunk 暂不决定，转至上一个未决定的区块
K - leave this hunk undecided, see previous hunk 暂不决定，转至上一个区块
s - split the current hunk into smaller hunks 将当前的区块分割成多个较小的区块
e - manually edit the current hunk 手动编辑当前的区块
? - print help 输出帮助

 git config --global http.proxy socks5://127.0.0.1:20170 

git remote set-url origin [email protected]:username/repo.git

git archive --format=zip --output=repobak_$(date +%Y-%m-%d).zip master