From Denim Panda, 4 Years ago, written in Bash.
- view diff
Embed
  1. [builder@build64 freeswitch-forked]$ git pull
  2. Current branch master is up to date.
  3. [builder@build64 freeswitch-forked]$ git pull origin master
  4. From https://freeswitch.org/stash/scm/~Denis/freeswitch
  5.  * branch            master     -> FETCH_HEAD
  6. Current branch master is up to date.
  7. [builder@build64 freeswitch-forked]$ git status
  8. # On branch master
  9. nothing to commit (working directory clean)
  10. [builder@build64 freeswitch-forked]$
  11. [builder@build64 freeswitch-forked]$
  12. [builder@build64 freeswitch-forked]$
  13. [builder@build64 freeswitch-forked]$ git branch
  14.   bugfix/FS-9621-More-flexible-load-via-xml_curl
  15. * master
  16. [builder@build64 freeswitch-forked]$ git checkout bugfix/FS-9621-More-flexible-load-via-xml_curl
  17. Switched to branch 'bugfix/FS-9621-More-flexible-load-via-xml_curl'
  18. [builder@build64 freeswitch-forked]$ git pull
  19. There is no tracking information for the current branch.
  20. Please specify which branch you want to rebase against.
  21. See git-pull(1) for details
  22.  
  23.     git pull <remote> <branch>
  24.  
  25. If you wish to set tracking information for this branch you can do so with:
  26.  
  27.     git branch --set-upstream bugfix/FS-9621-More-flexible-load-via-xml_curl origin/<branch>
  28.  
  29. [builder@build64 freeswitch-forked]$ git status
  30. # On branch bugfix/FS-9621-More-flexible-load-via-xml_curl
  31. nothing to commit (working directory clean)
  32. [builder@build64 freeswitch-forked]$ git log
  33. commit 98473ceb2fab3190204726984e601efcd4532b3b
  34. Author: Denis Maksimov <denis@ringme.ru>
  35. Date:   Thu Oct 6 18:15:43 2016 +0300
  36.  
  37.     FS-9621 More flexible load via xml_curl
  38.  
  39. commit 1a693f90b2975e7ef72363f805be9f9f31e11e82
  40. Merge: 8670e5f e138187
  41. Author: Mike Jerris <mike@jerris.com>
  42. Date:   Mon Dec 14 16:18:50 2015 -0600
  43.  
  44.     Merge pull request #634 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8656-identifier-redeclared-switch_event_channel_broadcast to master
  45.    
  46.     * commit 'e1381874492f6adf072aa6557a0e28de81c5d70a':
  47.       Fix switch_event_channel_broadcast identifier redeclared
  48.  
  49. commit 8670e5f801b5fd3717e88854fef28041350ceca1
  50. Author: Anthony Minessale <anthm@freeswitch.org>
  51. Date:   Mon Dec 14 16:05:51 2015 -0600
  52.  
  53.     FS-8642 addtl patch
  54.  
  55. commit b1206d0b50c6776f5be8511d267aa7b75a0f970b
  56. Author: Michael Jerris <mike@jerris.com>
  57. Date:   Mon Dec 14 14:23:31 2015 -0600
  58.  
  59.     FS-9658: [mod_verto] windows fixes for mod_verto
  60.  
  61. commit e1381874492f6adf072aa6557a0e28de81c5d70a
  62. Author: Spencer Thomason <spencer@whiteskycommunications.com>
  63. Date:   Mon Dec 14 20:03:44 2015 +0000
  64.  
  65.     Fix switch_event_channel_broadcast identifier redeclared
  66.    
  67.     FS-8656 #resolve
  68.  
  69. commit ebda34e1d933e0dada84c1c35148edb27144dcc2
  70. Author: Ken Rice <krice@freeswitch.org>
  71. Date:   Mon Dec 14 10:58:29 2015 -0600
  72.  
  73.     FS-8655 #resolve Update the windows build for MSVS2015 and WiX 3.10.1 to build an MSI
  74.  
  75. commit cbc23f4db8047a4d50b7c0ff54d38fb67a3ff994
  76. Author: Ken Rice <krice@freeswitch.org>
  77. Date:   Fri Dec 11 16:38:31 2015 -0600
  78.  
  79. [builder@build64 freeswitch-forked]$ git checkout master
  80. Switched to branch 'master'
  81. [builder@build64 freeswitch-forked]$ git merge
  82. fatal: No commit specified and merge.defaultToUpstream not set.
  83. [builder@build64 freeswitch-forked]$ git merge bugfix/FS-9621-More-flexible-load-via-xml_curl
  84. Updating 1a693f9..98473ce
  85. Fast-forward
  86.  src/mod/applications/mod_callcenter/mod_callcenter.c | 22 ++++++++++++++++++++--
  87.  1 file changed, 20 insertions(+), 2 deletions(-)
  88. [builder@build64 freeswitch-forked]$ git pull
  89. Current branch master is up to date.
  90. [builder@build64 freeswitch-forked]$ git merge
  91. fatal: No commit specified and merge.defaultToUpstream not set.
  92. [builder@build64 freeswitch-forked]$ git merge bugfix/FS-9621-More-flexible-load-via-xml_curl
  93. Already up-to-date.
  94.