Advertisement
Guest User

Untitled

a guest
Nov 4th, 2015
226
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 33.41 KB | None | 0 0
  1. 1.  The-Dorfchester:gordo.dev ajh$ git checkout -b trouble
  2. 2.  M       .idea/workspace.xml
  3. 3.  M       wp-content/themes/goTheme2015/blog-loadMore.php
  4. 4.  M       wp-content/themes/goTheme2015/home.php
  5. 5.  M       wp-content/themes/goTheme2015/stylesheets/layout.css
  6. 6.  M       wp-content/themes/goTheme2015/stylesheets/layout.scss
  7. 7.  Switched to a new branch 'trouble'
  8. 8.  The-Dorfchester:gordo.dev ajh$ git push trouble
  9. 9.  warning: push.default is unset; its implicit value has changed in
  10. 10. Git 2.0 from 'matching' to 'simple'. To squelch this message
  11. 11. and maintain the traditional behavior, use:
  12. 12.  
  13. 13.   git config --global push.default matching
  14. 14.  
  15. 15. To squelch this message and adopt the new behavior now, use:
  16. 16.  
  17. 17.   git config --global push.default simple
  18. 18.  
  19. 19. When push.default is set to 'matching', git will push local branches
  20. 20. to the remote branches that already exist with the same name.
  21. 21.  
  22. 22. Since Git 2.0, Git defaults to the more conservative 'simple'
  23. 23. behavior, which only pushes the current branch to the corresponding
  24. 24. remote branch that 'git pull' uses to update the current branch.
  25. 25.  
  26. 26. See 'git help config' and search for 'push.default' for further information.
  27. 27. (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
  28. 28. 'current' instead of 'simple' if you sometimes use older versions of Git)
  29. 29.  
  30. 30. fatal: The current branch trouble has no upstream branch.
  31. 31. To push the current branch and set the remote as upstream, use
  32. 32.  
  33. 33.     git push --set-upstream trouble trouble
  34. 34.  
  35. 35. The-Dorfchester:gordo.dev ajh$ git push trouble trouble
  36. 36. fatal: 'trouble' does not appear to be a git repository
  37. 37. fatal: Could not read from remote repository.
  38. 38.  
  39. 39. Please make sure you have the correct access rights
  40. 40. and the repository exists.
  41. 41. The-Dorfchester:gordo.dev ajh$ git remote show
  42. 42. staging
  43. 43. The-Dorfchester:gordo.dev ajh$ git branch-show --current
  44. 44. git: 'branch-show' is not a git command. See 'git --help'.
  45. 45. The-Dorfchester:gordo.dev ajh$ git show-branch --current
  46. 46. ! [master] Fixed auto scroll on homepage (header had no height, wasn't accounted for)
  47. 47. ! [master-staging] not sure
  48. 48.  * [trouble] not sure
  49. 49. ---
  50. 50. +* [master-staging] not sure
  51. 51. +* [master-staging^] some xml file
  52. 52. +* [master-staging~2] rm conflict from hta
  53. 53. -- [master-staging~3] fix conflicts
  54. 54. +* [master-staging~3^2] fixed untracked files
  55. 55. +* [master-staging~3^2^] fix gitignores
  56. 56. +* [master-staging~3^2~2] fix gitignore
  57. 57. +* [master-staging~3^2~3] Ajax
  58. 58. +* [master-staging~3^2~4] home.php blog archive html n css done, need custom fields and ajax
  59. 59. +* [master-staging~3^2~5] fix da columnz
  60. 60. +* [master-staging~3^2~6] popularArticles esta bien
  61. 61. +* [master-staging~3^2~7] versace breadcrumbs
  62. 62. +* [master-staging~3^2~8] Add untracked files
  63. 63. +* [master-staging~3^2~9] everything but breadcrumbs, sidebar, and pagination
  64. 64. +* [master-staging~3^2~10] pull relevant classses from bdc
  65. 65. +* [master-staging~3^2~11] more layout
  66. 66. +* [master-staging~3^2~12] layout
  67. 67. -- [master-staging~3^2~13] merge conflicts
  68. 68. +* [master-staging~3^2~14] init
  69. 69. +* [master-staging~4] temp commit
  70. 70. +* [master-staging~5] Created About Page Template
  71. 71. +* [master-staging~6] Made Logo slider have 2 versions instead of one. Began About Page Template Installed Lightbox Plugin
  72. 72. +* [master-staging~7] Created new templates:  - Business Landing Page - Insurance Template ( business and individual use the same) - logo slider callout - fixed homepage natural language form to submit a value using post - added ACF dynamic fill code
  73. 73. +* [master-staging~8] Added Our Difference Page & the Cardo Italic Font. Added Checkmark and down arrow to homepage natural language form.
  74. 74. ++* [master] Fixed auto scroll on homepage (header had no height, wasn't accounted for)
  75. 75. The-Dorfchester:gordo.dev ajh$ git checkout staging master
  76. 76. error: pathspec 'staging' did not match any file(s) known to git.
  77. 77. error: pathspec 'master' did not match any file(s) known to git.
  78. 78. The-Dorfchester:gordo.dev ajh$ git checkout staging
  79. 79. error: pathspec 'staging' did not match any file(s) known to git.
  80. 80. The-Dorfchester:gordo.dev ajh$ git checkout master
  81. 81. error: Your local changes to the following files would be overwritten by checkout:
  82. 82.         .idea/workspace.xml
  83. 83.         wp-content/themes/goTheme2015/blog-loadMore.php
  84. 84.         wp-content/themes/goTheme2015/home.php
  85. 85.         wp-content/themes/goTheme2015/stylesheets/layout.css
  86. 86.         wp-content/themes/goTheme2015/stylesheets/layout.scss
  87. 87. Please, commit your changes or stash them before you can switch branches.
  88. 88. Aborting
  89. 89. The-Dorfchester:gordo.dev ajh$ git commit -am "idk"
  90. 90. [trouble 820decb] idk
  91. 91.  5 files changed, 39 insertions(+), 93 deletions(-)
  92. 92. The-Dorfchester:gordo.dev ajh$ git push master
  93. 93. warning: push.default is unset; its implicit value has changed in
  94. 94. Git 2.0 from 'matching' to 'simple'. To squelch this message
  95. 95. and maintain the traditional behavior, use:
  96. 96.  
  97. 97.   git config --global push.default matching
  98. 98.  
  99. 99. To squelch this message and adopt the new behavior now, use:
  100. 100.     
  101. 101.      git config --global push.default simple
  102. 102.     
  103. 103.    When push.default is set to 'matching', git will push local branches
  104. 104.    to the remote branches that already exist with the same name.
  105. 105.     
  106. 106.    Since Git 2.0, Git defaults to the more conservative 'simple'
  107. 107.    behavior, which only pushes the current branch to the corresponding
  108. 108.    remote branch that 'git pull' uses to update the current branch.
  109. 109.     
  110. 110.    See 'git help config' and search for 'push.default' for further information.
  111. 111.    (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
  112. 112.    'current' instead of 'simple' if you sometimes use older versions of Git)
  113. 113.     
  114. 114.    fatal: The current branch trouble has no upstream branch.
  115. 115.    To push the current branch and set the remote as upstream, use
  116. 116.     
  117. 117.        git push --set-upstream master trouble
  118. 118.     
  119. 119.    The-Dorfchester:gordo.dev ajh$ git pull master
  120. 120.    fatal: 'master' does not appear to be a git repository
  121. 121.    fatal: Could not read from remote repository.
  122. 122.     
  123. 123.    Please make sure you have the correct access rights
  124. 124.    and the repository exists.
  125. 125.    The-Dorfchester:gordo.dev ajh$ git push --set-upstream master trouble
  126. 126.    fatal: 'master' does not appear to be a git repository
  127. 127.    fatal: Could not read from remote repository.
  128. 128.     
  129. 129.    Please make sure you have the correct access rights
  130. 130.    and the repository exists.
  131. 131.    The-Dorfchester:gordo.dev ajh$ git push --set-upstream staging trouble
  132. 132.    Counting objects: 20, done.
  133. 133.    Delta compression using up to 4 threads.
  134. 134.    Compressing objects: 100% (20/20), done.
  135. 135.    Writing objects: 100% (20/20), 2.05 KiB | 0 bytes/s, done.
  136. 136.    Total 20 (delta 17), reused 0 (delta 0)
  137. 137.    remote:   git.wpengine.com: validating
  138. 138.    remote:   - info: detected push to staging application ...
  139. 139.    remote:   - info: validating files in 820decb ...
  140. 140.    remote:   - info: found application servers ...
  141. 141.    remote:   - success: validation complete!
  142. 142.    remote:   git.wpengine.com: deploying
  143. 143.    remote:   - info: preparing application updates ........................ done.
  144. 144.    remote:   - info: checking submodules ............ done.
  145. 145.    remote:   - info: ensuring permissions ............ done.
  146. 146.    remote:   - info: deploying to staging environment ............ done.
  147. 147.    remote:   git.wpengine.com: complete!
  148. 148.    To git@git.wpengine.com:staging/gordo.git
  149. 149.     * [new branch]      trouble -> trouble
  150. 150.    Branch trouble set up to track remote branch trouble from staging.
  151. 151.    The-Dorfchester:gordo.dev ajh$ git checkout staging master
  152. 152.    error: pathspec 'staging' did not match any file(s) known to git.
  153. 153.    error: pathspec 'master' did not match any file(s) known to git.
  154. 154.    The-Dorfchester:gordo.dev ajh$ git checkout master
  155. 155.    Switched to branch 'master'
  156. 156.    Your branch is behind 'staging/master' by 16 commits, and can be fast-forwarded.
  157. 157.      (use "git pull""pull from staging/master to master, idk"
  158. 389.    On branch master
  159. 390.    Your branch is up-to-date with 'staging/master'.
  160. 391.    nothing to commit, working directory clean
  161. 392.    The-Dorfchester:gordo.dev ajh$ git push master
  162. 393.    warning: push.default is unset; its implicit value has changed in
  163. 394.    Git 2.0 from 'matching' to 'simple'. To squelch this message
  164. 395.    and maintain the traditional behavior, use:
  165. 396.     
  166. 397.      git config --global push.default matching
  167. 398.     
  168. 399.    To squelch this message and adopt the new behavior now, use:
  169. 400.     
  170. 401.      git config --global push.default simple
  171. 402.     
  172. 403.    When push.default is set to 'matching', git will push local branches
  173. 404.    to the remote branches that already exist with the same name.
  174. 405.     
  175. 406.    Since Git 2.0, Git defaults to the more conservative 'simple'
  176. 407.    behavior, which only pushes the current branch to the corresponding
  177. 408.    remote branch that 'git pull' uses to update the current branch.
  178. 409.     
  179. 410.    See 'git help config' and search for 'push.default' for further information.
  180. 411.    (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
  181. 412.    'current' instead of 'simple' if you sometimes use older versions of Git)
  182. 413.     
  183. 414.    fatal: 'master' does not appear to be a git repository
  184. 415.    fatal: Could not read from remote repository.
  185. 416.     
  186. 417.    Please make sure you have the correct access rights
  187. 418.    and the repository exists.
  188. 419.    The-Dorfchester:gordo.dev ajh$ git push staging master
  189. 420.    Everything up-to-date
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement