[builder@build64 freeswitch-forked]$ git pull
Current branch master is up to date.
[builder@build64 freeswitch-forked]$ git pull origin master
From https://freeswitch.org/stash/scm/~Denis/freeswitch
* branch master -> FETCH_HEAD
Current branch master is up to date.
[builder@build64 freeswitch-forked]$ git status
# On branch master
nothing to commit (working directory clean)
[builder@build64 freeswitch-forked]$
[builder@build64 freeswitch-forked]$
[builder@build64 freeswitch-forked]$
[builder@build64 freeswitch-forked]$ git branch
bugfix/FS-9621-More-flexible-load-via-xml_curl
* master
[builder@build64 freeswitch-forked]$ git checkout bugfix/FS-9621-More-flexible-load-via-xml_curl
Switched to branch 'bugfix/FS-9621-More-flexible-load-via-xml_curl'
[builder@build64 freeswitch-forked]$ git pull
There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-pull(1) for details
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream bugfix/FS-9621-More-flexible-load-via-xml_curl origin/<branch>
[builder@build64 freeswitch-forked]$ git status
# On branch bugfix/FS-9621-More-flexible-load-via-xml_curl
nothing to commit (working directory clean)
[builder@build64 freeswitch-forked]$ git log
commit 98473ceb2fab3190204726984e601efcd4532b3b
Author: Denis Maksimov <denis@ringme.ru>
Date: Thu Oct 6 18:15:43 2016 +0300
FS-9621 More flexible load via xml_curl
commit 1a693f90b2975e7ef72363f805be9f9f31e11e82
Merge: 8670e5f e138187
Author: Mike Jerris <mike@jerris.com>
Date: Mon Dec 14 16:18:50 2015 -0600
Merge pull request #634 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8656-identifier-redeclared-switch_event_channel_broadcast to master
* commit 'e1381874492f6adf072aa6557a0e28de81c5d70a':
Fix switch_event_channel_broadcast identifier redeclared
commit 8670e5f801b5fd3717e88854fef28041350ceca1
Author: Anthony Minessale <anthm@freeswitch.org>
Date: Mon Dec 14 16:05:51 2015 -0600
FS-8642 addtl patch
commit b1206d0b50c6776f5be8511d267aa7b75a0f970b
Author: Michael Jerris <mike@jerris.com>
Date: Mon Dec 14 14:23:31 2015 -0600
FS-9658: [mod_verto] windows fixes for mod_verto
commit e1381874492f6adf072aa6557a0e28de81c5d70a
Author: Spencer Thomason <spencer@whiteskycommunications.com>
Date: Mon Dec 14 20:03:44 2015 +0000
Fix switch_event_channel_broadcast identifier redeclared
FS-8656 #resolve
commit ebda34e1d933e0dada84c1c35148edb27144dcc2
Author: Ken Rice <krice@freeswitch.org>
Date: Mon Dec 14 10:58:29 2015 -0600
FS-8655 #resolve Update the windows build for MSVS2015 and WiX 3.10.1 to build an MSI
commit cbc23f4db8047a4d50b7c0ff54d38fb67a3ff994
Author: Ken Rice <krice@freeswitch.org>
Date: Fri Dec 11 16:38:31 2015 -0600
[builder@build64 freeswitch-forked]$ git checkout master
Switched to branch 'master'
[builder@build64 freeswitch-forked]$ git merge
fatal: No commit specified and merge.defaultToUpstream not set.
[builder@build64 freeswitch-forked]$ git merge bugfix/FS-9621-More-flexible-load-via-xml_curl
Updating 1a693f9..98473ce
Fast-forward
src/mod/applications/mod_callcenter/mod_callcenter.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
[builder@build64 freeswitch-forked]$ git pull
Current branch master is up to date.
[builder@build64 freeswitch-forked]$ git merge
fatal: No commit specified and merge.defaultToUpstream not set.
[builder@build64 freeswitch-forked]$ git merge bugfix/FS-9621-More-flexible-load-via-xml_curl
Already up-to-date.