root@debian:/opt/daizc/ui-test#
# 查看本地分支
root@debian:/opt/daizc/ui-test# git branch
* master
# 查看远端分支
root@debian:/opt/daizc/ui-test# git branch -a
* master
remotes/origin/HEAD -> origin/master
remotes/origin/daizc
# 切换分支
root@debian:/opt/daizc/ui-test# git checkout daizc
Branch 'daizc' set up to track remote branch 'daizc' from 'origin'.
Switched to a new branch 'daizc'
root@debian:/opt/daizc/ui-test# git branch
* daizc
master
root@debian:/opt/daizc/ui-test#
root@debian:/opt/daizc/ui-test# git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
remote: Enumerating objects: 49, done.
remote: Counting objects: 100% (43/43), done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 23 (delta 20), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (23/23), 17.48 KiB | 1.59 MiB/s, done.
From ssh://git.xxx.com.cn:2201/qa/ui-test
c4c6ac1..1f84b08 daizc -> origin/daizc
Updating c4c6ac1..1f84b08
Fast-forward
SSLScan_UI/common/excel_utils.py | 15 ++++++++-------
SSLScan_UI/common/generate_driver.py | 2 +-
SSLScan_UI/common/https_website_security_detection.py | 6 +++---
SSLScan_UI/common/log.py | 6 ++++--
SSLScan_UI/common/sqlite_utils.py | 31 +++++++++----------------------
SSLScan_UI/test_cases/test_websites_scan2.0.py | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
SSLScan_UI/test_datas/test_site.xlsx | Bin 11300 -> 12262 bytes
SSLScan_UI/test_datas/test_site2.xlsx | Bin 11300 -> 12082 bytes
8 files changed, 76 insertions(+), 82 deletions(-)
root@debian:/opt/daizc/ui-test#