+ git -C /home/pub/jenkins_BFB_test_configs/sys_admin 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.
From https://github.com/larson-group/sys_admin
bde28f6..a563882 master -> origin/master
Updating bde28f6..a563882
Fast-forward
python_nightly_test_suite/tests/bit_diff_test.py | 4 ++++
1 file changed, 4 insertions(+)