Git常见命令和用法
Git 用法
使用git clone将远程代码拷贝到本地，git clone 远程Git库地址
如果希望拷贝到本地的指定路径，则git clone 远程Git库地址 本地路径
TanLis-MacBook-Pro:~ aa$ git clone http://10.20.11.111/FFProject/App_Android.git /Users/aa/Documents/App
Cloning into '/Users/aa/Documents/App'...
remote: Counting objects: 116805, done.
remote: Compressing objects: 100% (45381/45381), done.
remote: Total 116805 (delta 61938), reused 111192 (delta 57654)
Receiving objects: 100% (116805/116805), 736.40 MiB | 1.92 MiB/s, done.
Resolving deltas: 100% (61938/61938), done.
cd，进入当前用户目录
TanLis-MacBook-Pro:~ aa$ cd App
ls，查看当前目录下所有文件
ls-a，查看当前用户目录下所有文件，包括隐藏文件
TanLis-MacBook-Pro:App aa$ ls
Fac_libsmodules.json
Login.propertiesscripts
gradlegradlewsettings.gradle
NotifyManager.bat
Git branch，查看当前目录的分支
TanLis-MacBook-Pro:App aa$ git branch
* master
Git branch -r，查看远程服务器上的分支
TanLis-MacBook-Pro:App_Android aa$ git branch -r
origin/1.2.0_LuZhou_bugfix
origin/Fo
origin/Fu
Git checkout 分支名称，下载该分支的代码
TanLis-MacBook-Pro:App_Android aa$ git checkout origin/bizhao
Previous HEAD position was c775d281f... Revert "[基线][master][M][C:张xx]基线版本配置修改"
HEAD is now at 322a31147... 修改个人中心
Git log，查看该分支的全部历史日志
TanLis-MacBook-Pro:App_Android aa$ git log
commit 322a392473b6435a6061a49fff1789b746xxxx0 (HEAD, origin/bzhao)
Author: 邓x
Date: Fri Sep 29 16:03:56 2017 +0800
修改个人中心
Git log -n，查看该分支的最近几条历史日志
TanLis-MacBook-Pro:App_Android aa$ git log -2
commit 322a392473b6435a6061a49fff1789b746b2xxxx (HEAD, origin/bzhao)
Author: 邓x
Date: Fri Sep 29 16:03:56 2017 +0800
修改个人中心
commit 221d0c1c478cdd220e0ef45363f935070d2xxxxx
Author: 甘俊
Date: Wed Sep 27 19:57:42 2017 +0800
[照][paff][c:甘俊]添加推
Git log -p -n，查看该分支的最近几条历史日志代码diff
TanLis-MacBook-Pro:App_Android aa$ git log -p -2
commit 322a392473b6435a6061a49fff1789b746b2xxxx (HEAD, origin/bzhao)
Author: 邓x
Date: Fri Sep 29 16:03:56 2017 +0800
修改个人中心
diff --git a/modules.json b/modules.json
index 1abd3748a..8de23598f 100644
--- a/modules.json
+++ b/modules.json
@@ -172,7 +172,7 @@
},
"react_native/Center": {
"repo": "http://10.20.11.111/FF/Center_rn.git",
- "branch": "branch_4.1.0"
+ "branch": "branch_4.1.0_zhao"
},
"react_native/Theme": {
"repo": "http://10.20.11.111/FF/Theme_rn.git",
commit 221d0c1c478cdd220e0ef45363f935070d23xxxx
Author: 甘俊
Date: Wed Sep 27 19:57:42 2017 +0800
[照][paff][c:甘俊]添加推
diff --git a/paff/config.gradle b/paff/config.gradle
index cdc599eb6..8dae0fdac 100644
--- a/paff/config.gradle
+++ b/paff/config.gradle
@@ -176,9 +176,9 @@ project.ext {
Config_H5_UPDATE_URL_PRD = "http://aop-core.pn.com.cn/hypmf/manifest";
/** 8. 推 */
- GETUI_APP_ID_PRD = "yrA09f2vNJ89vWvYr8"
- GETUI_APP_SECRET_PRD = "d3MfvOmQ464"
+ GETUI_APP_ID_PRD = "o2McqD9vSA8"