github同步fork上游
add upstream#
~/Projects/git/framework/mars|master⚡
⇒ git remote -v
origin [email protected]:fan2/mars.git (fetch)
origin [email protected]:fan2/mars.git (push)
~/Projects/git/framework/mars|master⚡
⇒ git remote add upstream https://github.com/Tencent/mars
~/Projects/git/framework/mars|master⚡
⇒ git remote -v
origin [email protected]:fan2/mars.git (fetch)
origin [email protected]:fan2/mars.git (push)
upstream https://github.com/Tencent/mars (fetch)
upstream https://github.com/Tencent/mars (push)
执行
git remote rm upstream可解除 upstream。
fetch upstream#
~/Projects/git/framework/mars|master⚡
⇒ git fetch upstream
remote: Counting objects: 149, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 149 (delta 103), reused 124 (delta 103), pack-reused 17
merge upstream/branch#
~/Projects/git/framework/mars|master⚡
⇒ git merge upstream/master
Merge made by the 'recursive' strategy.
README.md | 29 +++++++++++++++++++++++------
mars/comm/dns/dns.cc | 39 +++++++++++++++++++++------------------
mars/comm/dns/dns.h | 5 +++++
mars/comm/network/getgateway.c | 2 +-
mars/comm/socket/local_ipstack.cc | 4 ++--
mars/comm/socket/socket_address.cc | 6 +++---
mars/comm/socket/socket_address.h | 2 +-
mars/comm/verinfo.h | 8 ++++----
mars/libraries/build_android.py | 10 ++++++++--
mars/libraries/mars_android_sdk/gradle.properties | 2 +-
mars/libraries/mars_xlog_sdk/gradle.properties | 2 +-
mars/log/jni/Java2C_Xlog.cc | 3 ++-
mars/sdt/src/checkimpl/dnsquery.cc | 2 +-
samples/android/marsSampleChat/build.gradle | 4 ++--
samples/android/marsSampleChat/wrapper/gradle.properties | 2 +-
samples/android/xlogSample/build.gradle | 2 +-
16 files changed, 77 insertions(+), 45 deletions(-)
mode change 100755 => 100644 mars/libraries/build_android.py
merge upstream of libetpan#
