API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 20th, 2017
415
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.63 KB | None | 0 0
raw download clone embed print report
  1. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  2. $ git push origin HEAD:refs/for/master
  3. Enter passphrase for key '/c/Users/ZiontrOOper/.ssh/id_rsa':
  4. Counting objects: 5, done.
  5. Delta compression using up to 4 threads.
  6. Compressing objects: 100% (3/3), done.
  7. Writing objects: 100% (4/4), 542 bytes, done.
  8. Total 4 (delta 1), reused 0 (delta 0)
  9. To ssh://nemanja.cimbaljevic@gerrit.app:29418/shippingeasy
  10. * [new branch] HEAD -> refs/for/master
  11.  
  12. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  13. $ git commit
  14. # On branch test-branch
  15. # Changes not staged for commit:
  16. # (use "git add <file>..." to update what will be committed)
  17. # (use "git checkout -- <file>..." to discard changes in working directory)
  18. #
  19. # modified: test2/cimba_test_php.php
  20. #
  21. no changes added to commit (use "git add" and/or "git commit -a")
  22.  
  23. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  24. $ git checkout master
  25. error: Your local changes to the following files would be overwritten by checkout:
  26. test2/cimba_test_php.php
  27. Please, commit your changes or stash them before you can switch branches.
  28. Aborting
  29.  
  30. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  31. $ git commit test2/cimba_test_php.php
  32. C:/Program Files (x86)/Notepad++/notepad++.exe: -c: line 0: syntax error near unexpected token `('
  33. C:/Program Files (x86)/Notepad++/notepad++.exe: -c: line 0: `C:/Program Files (x86)/Notepad++/notepad++.exe \$@\'
  34. error: There was a problem with the editor 'C:/Program Files (x86)/Notepad++/notepad++.exe'.
  35. Please supply the message using either -m or -F option.
  36.  
  37. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  38. $ git commit test2/cimba_test_php.php -m "Removed whitespacing"
  39. [test-branch b379910] Removed whitespacing
  40. 1 files changed, 1 insertions(+), 2 deletions(-)
  41.  
  42. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  43. $ git commit test2/cimba_test_php.php -m "Removed clsoed ?> tag"
  44. [test-branch c969241] Removed clsoed ?> tag
  45. 1 files changed, 4 insertions(+), 5 deletions(-)
  46.  
  47. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  48. $ git push origin HEAD:refs/for/heEnter passphrase for key '/c/Users/ZiontrOOper/.ssh/id_rsa':
  49. $ git commit test2/cimba_test_php.php -m "Removed clsoed ?> tag"
  50.  
  51.  
  52.  
  53. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  54. $
  55.  
  56. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  57. $
  58.  
  59. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  60. $ git commit test2/cimba_test_php.php
  61. # On branch test-branch
  62. nothing to commit (working directory clean)
  63.  
  64. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  65. $ git push origin HEAD:refs/for/master --reviewer=jozef@saturized.com
  66. error: unknown option `reviewer=jozef@saturized.com'
  67. usage: git push [<options>] [<repository> [<refspec>...]]
  68.  
  69. -v, --verbose be more verbose
  70. -q, --quiet be more quiet
  71. --repo <repository> repository
  72. --all push all refs
  73. --mirror mirror all refs
  74. --delete delete refs
  75. --tags push tags (can't be used with --all or --mirror)
  76. -n, --dry-run dry run
  77. --porcelain machine-readable output
  78. -f, --force force updates
  79. --thin use thin pack
  80. --receive-pack <receive-pack>
  81. receive pack program
  82. --exec <receive-pack>
  83. receive pack program
  84. -u, --set-upstream set upstream for git pull/status
  85. --progress force progress reporting
  86.  
  87.  
  88. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  89. $ git push origin HEAD:refs/for/master --reviewer=jozef@saturized.com
  90. error: unknown option `reviewer=jozef@saturized.com'
  91. usage: git push [<options>] [<repository> [<refspec>...]]
  92.  
  93. -v, --verbose be more verbose
  94. -q, --quiet be more quiet
  95. --repo <repository> repository
  96. --all push all refs
  97. --mirror mirror all refs
  98. --delete delete refs
  99. --tags push tags (can't be used with --all or --mirror)
  100. -n, --dry-run dry run
  101. --porcelain machine-readable output
  102. -f, --force force updates
  103. --thin use thin pack
  104. --receive-pack <receive-pack>
  105. receive pack program
  106. --exec <receive-pack>
  107. receive pack program
  108. -u, --set-upstream set upstream for git pull/status
  109. --progress force progress reporting
  110.  
  111.  
  112. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  113. $ git push origin HEAD:refs/for/master --reviewer="jozef@saturized.com"
  114. error: unknown option `reviewer=jozef@saturized.com'
  115. usage: git push [<options>] [<repository> [<refspec>...]]
  116.  
  117. -v, --verbose be more verbose
  118. -q, --quiet be more quiet
  119. --repo <repository> repository
  120. --all push all refs
  121. --mirror mirror all refs
  122. --delete delete refs
  123. --tags push tags (can't be used with --all or --mirror)
  124. -n, --dry-run dry run
  125. --porcelain machine-readable output
  126. -f, --force force updates
  127. --thin use thin pack
  128. --receive-pack <receive-pack>
  129. receive pack program
  130. --exec <receive-pack>
  131. receive pack program
  132. -u, --set-upstream set upstream for git pull/status
  133. --progress force progress reporting
  134.  
  135.  
  136. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  137. $ git push origin HEAD:refs/for/master
  138. Enter passphrase for key '/c/Users/ZiontrOOper/.ssh/id_rsa':
  139. Counting objects: 11, done.
  140. Delta compression using up to 4 threads.
  141. Compressing objects: 100% (6/6), done.
  142. Writing objects: 100% (8/8), 844 bytes, done.
  143. Total 8 (delta 4), reused 0 (delta 0)
  144. To ssh://nemanja.cimbaljevic@gerrit.app:29418/shippingeasy
  145. * [new branch] HEAD -> refs/for/master
  146.  
  147. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (test-branch)
  148. $ git checkout master
  149. Switched to branch 'master'
  150.  
  151. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (master)
  152. $ git show master~2
  153. commit 245af13f3d477bdb2c7013b8ce36a2de18fc517c
  154. Author: Ivan Lukic <ivan.lukic@saturized.com>
  155. Date: Fri Jun 24 12:35:10 2011 +0200
  156.  
  157. Username changed to name, fixed store root.
  158.  
  159. Change-Id: Id4307fb7f437cd96ee6c04825f89ad95c8ea2e1c
  160.  
  161. diff --git a/web/ebay/app/model/User.js b/web/ebay/app/model/User.js
  162. index ec3b39e..98279ce 100644
  163. --- a/web/ebay/app/model/User.js
  164. +++ b/web/ebay/app/model/User.js
  165. @@ -1,10 +1,10 @@
  166. Ext.define('SE.model.User', {
  167. extend: 'Ext.data.Model',
  168. fields: [
  169. - {name: 'id', type: 'int'},
  170. - {name: 'username', type: 'string'},
  171. - {name: 'email', type: 'string'},
  172. - {name: 'password', type: 'string'}
  173. + {name: 'id', type: 'int'},
  174. + {name: 'name', type: 'string'},
  175. + {name: 'email', type: 'string'},
  176. + {name: 'password', type: 'string'}
  177. ],
  178.  
  179. associations: [
  180. diff --git a/web/ebay/app/store/Users.js b/web/ebay/app/store/Users.js
  181. index 0901a55..cd4aa55 100644
  182. --- a/web/ebay/app/store/Users.js
  183. +++ b/web/ebay/app/store/Users.js
  184. @@ -8,7 +8,7 @@ Ext.define('SE.store.Users', {
  185. url: 'data/users.json',
  186. reader: {
  187. type: 'json',
  188. - root: 'menuItems',
  189. + root: 'users',
  190. successProperty: 'success'
  191. }
  192. }
  193.  
  194. ZiontrOOper@ZIONTROOPER-PC /d/server/www/shippingeasy (master)
  195. $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!