API tools faq
paste
Guest User

Untitled

a guest
Aug 11th, 2018
316
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 13.95 KB | None | 0 0
raw download clone embed print report
  1. $ git status
  2. # On branch black_friday
  3. # Your branch and 'origin/black_friday' have diverged,
  4. # and have 10 and 5 different commit(s) each, respectively.
  5. #
  6. # Changes to be committed:
  7. #
  8. # modified: kohana/application/bootstrap.php
  9. # new file: kohana/application/classes/model/review.php
  10. # new file: kohana/application/classes/model/seller/rating.php
  11. # new file: kohana/application/config/cache.php
  12. # modified: kohana/modules/cache/classes/kohana/cache.php
  13. # modified: kohana/modules/database/config/database.php
  14. # new file: kohana/modules/rr/classes/cache.php
  15. # new file: kohana/modules/rr/classes/helper/header.php
  16. # new file: kohana/modules/rr/classes/helper/nexttag/categorybar.php
  17. # new file: kohana/modules/rr/classes/model.php
  18. # modified: public/forum/includes/config.php
  19. # new file: public/vbseo.php
  20. #
  21. # Unmerged paths:
  22. # (use "git add/rm <file>..." as appropriate to mark resolution)
  23. #
  24. # both modified: kohana/application/classes/controller/index.php
  25. # both modified: kohana/application/classes/controller/search.php
  26. # added by them: kohana/application/classes/model/seller.php
  27. # both modified: kohana/application/views/layout/_head.php
  28. # both modified: kohana/application/views/layout/_header.php
  29. # both modified: kohana/modules/rr/classes/vendor/nextag.php
  30. # both added: public/static/css/master2.css
  31. # both added: public/static/js/jquery-1.4.2.js
  32. # both added: public/static/js/jquery.bgiframe-2.1.1.js
  33. # both added: public/static/js/ui/i18n/jquery-ui-i18n.js
  34. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-af.js
  35. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-ar.js
  36. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-az.js
  37. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-bg.js
  38. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-bs.js
  39. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-ca.js
  40. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-cs.js
  41. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-da.js
  42. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-de.js
  43. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-el.js
  44. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-en-GB.
  45. js
  46. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-eo.js
  47. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-es.js
  48. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-et.js
  49. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-eu.js
  50. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-fa.js
  51. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-fi.js
  52. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-fo.js
  53. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-fr-CH.
  54. js
  55. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-fr.js
  56. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-he.js
  57. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-hr.js
  58. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-hu.js
  59. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-hy.js
  60. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-id.js
  61. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-is.js
  62. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-it.js
  63. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-ja.js
  64. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-ko.js
  65. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-lt.js
  66. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-lv.js
  67. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-ms.js
  68. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-nl.js
  69. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-no.js
  70. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-pl.js
  71. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-pt-BR.
  72. js
  73. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-ro.js
  74. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-ru.js
  75. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-sk.js
  76. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-sl.js
  77. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-sq.js
  78. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-sr-SR.
  79. js
  80. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-sr.js
  81. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-sv.js
  82. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-ta.js
  83. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-th.js
  84. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-tr.js
  85. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-uk.js
  86. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-vi.js
  87. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-zh-CN.
  88. js
  89. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-zh-HK.
  90. js
  91. # both added: public/static/js/ui/i18n/jquery.ui.datepicker-zh-TW.
  92. js
  93. # both added: public/static/js/ui/jquery-ui-1.8.4.custom.js
  94. # both added: public/static/js/ui/jquery.effects.blind.js
  95. # both added: public/static/js/ui/jquery.effects.bounce.js
  96. # both added: public/static/js/ui/jquery.effects.clip.js
  97. # both added: public/static/js/ui/jquery.effects.core.js
  98. # both added: public/static/js/ui/jquery.effects.drop.js
  99. # both added: public/static/js/ui/jquery.effects.explode.js
  100. # both added: public/static/js/ui/jquery.effects.fold.js
  101. # both added: public/static/js/ui/jquery.effects.highlight.js
  102. # both added: public/static/js/ui/jquery.effects.pulsate.js
  103. # both added: public/static/js/ui/jquery.effects.scale.js
  104. # both added: public/static/js/ui/jquery.effects.shake.js
  105. # both added: public/static/js/ui/jquery.effects.slide.js
  106. # both added: public/static/js/ui/jquery.effects.transfer.js
  107. # both added: public/static/js/ui/jquery.ui.accordion.js
  108. # both added: public/static/js/ui/jquery.ui.autocomplete.js
  109. # both added: public/static/js/ui/jquery.ui.button.js
  110. # both added: public/static/js/ui/jquery.ui.core.js
  111. # both added: public/static/js/ui/jquery.ui.datepicker.js
  112. # both added: public/static/js/ui/jquery.ui.dialog.js
  113. # both added: public/static/js/ui/jquery.ui.draggable.js
  114. # both added: public/static/js/ui/jquery.ui.droppable.js
  115. # both added: public/static/js/ui/jquery.ui.mouse.js
  116. # both added: public/static/js/ui/jquery.ui.position.js
  117. # both added: public/static/js/ui/jquery.ui.progressbar.js
  118. # both added: public/static/js/ui/jquery.ui.resizable.js
  119. # both added: public/static/js/ui/jquery.ui.selectable.js
  120. # both added: public/static/js/ui/jquery.ui.slider.js
  121. # both added: public/static/js/ui/jquery.ui.sortable.js
  122. # both added: public/static/js/ui/jquery.ui.tabs.js
  123. # both added: public/static/js/ui/jquery.ui.widget.js
  124. # both added: public/static/js/ui/minified/jquery.effects.blind.mi
  125. n.js
  126. # both added: public/static/js/ui/minified/jquery.effects.bounce.m
  127. in.js
  128. # both added: public/static/js/ui/minified/jquery.effects.clip.min
  129. .js
  130. # both added: public/static/js/ui/minified/jquery.effects.core.min
  131. .js
  132. # both added: public/static/js/ui/minified/jquery.effects.drop.min
  133. .js
  134. # both added: public/static/js/ui/minified/jquery.effects.explode.
  135. min.js
  136. # both added: public/static/js/ui/minified/jquery.effects.fold.min
  137. .js
  138. # both added: public/static/js/ui/minified/jquery.effects.highligh
  139. t.min.js
  140. # both added: public/static/js/ui/minified/jquery.effects.pulsate.
  141. min.js
  142. # both added: public/static/js/ui/minified/jquery.effects.scale.mi
  143. n.js
  144. # both added: public/static/js/ui/minified/jquery.effects.shake.mi
  145. n.js
  146. # both added: public/static/js/ui/minified/jquery.effects.slide.mi
  147. n.js
  148. # both added: public/static/js/ui/minified/jquery.effects.transfer
  149. .min.js
  150. # both added: public/static/js/ui/minified/jquery.ui.accordion.min
  151. .js
  152. # both added: public/static/js/ui/minified/jquery.ui.autocomplete.
  153. min.js
  154. # both added: public/static/js/ui/minified/jquery.ui.button.min.js
  155.  
  156. # both added: public/static/js/ui/minified/jquery.ui.core.min.js
  157. # both added: public/static/js/ui/minified/jquery.ui.datepicker.mi
  158. n.js
  159. # both added: public/static/js/ui/minified/jquery.ui.dialog.min.js
  160.  
  161. # both added: public/static/js/ui/minified/jquery.ui.draggable.min
  162. .js
  163. # both added: public/static/js/ui/minified/jquery.ui.droppable.min
  164. .js
  165. # both added: public/static/js/ui/minified/jquery.ui.mouse.min.js
  166. # both added: public/static/js/ui/minified/jquery.ui.position.min.
  167. js
  168. # both added: public/static/js/ui/minified/jquery.ui.progressbar.m
  169. in.js
  170. # both added: public/static/js/ui/minified/jquery.ui.resizable.min
  171. .js
  172. # both added: public/static/js/ui/minified/jquery.ui.selectable.mi
  173. n.js
  174. # both added: public/static/js/ui/minified/jquery.ui.slider.min.js
  175.  
  176. # both added: public/static/js/ui/minified/jquery.ui.sortable.min.
  177. js
  178. # both added: public/static/js/ui/minified/jquery.ui.tabs.min.js
  179. # both added: public/static/js/ui/minified/jquery.ui.widget.min.js
  180.  
  181. #
  182. # Changed but not updated:
  183. # (use "git add/rm <file>..." to update what will be committed)
  184. # (use "git checkout -- <file>..." to discard changes in working directory)
  185. #
  186. # modified: kohana/application/views/search/product.php
  187. # modified: public/.htaccess
  188. # deleted: public/billing/index.html?action=cron
  189. # deleted: public/billing/index.html?action=cron.1
  190. # deleted: public/billing/index.html?action=cron.2
  191. # deleted: public/lib2/DBD-mysql-2.1011/blib/man3/5.6.0::i386-freebsd::
  192. perllocal.3
  193. # deleted: public/lib2/DBD-mysql-2.1011/blib/man3/Bundle::DBD::mysql.3
  194. # deleted: public/lib2/DBD-mysql-2.1011/blib/man3/DBD::mysql.3
  195. # deleted: public/lib2/DBD-mysql-2.1011/blib/man3/DBD::mysql::INSTALL.3
  196.  
  197. # deleted: public/lib2/DBD-mysql-2.1011/blib/man3/site_perl::5.6.0::i38
  198. 6-freebsd::Bundle::DBD::mysql.3
  199. # deleted: public/lib2/DBD-mysql-2.1011/blib/man3/site_perl::5.6.0::i38
  200. 6-freebsd::DBD::mysql.3
  201. # deleted: public/lib2/DBD-mysql-2.1011/blib/man3/site_perl::5.6.0::i38
  202. 6-freebsd::DBD::mysql::INSTALL.3
  203. # deleted: public/lib2/DBD-mysql-2.1011/blib/man3/site_perl::5.6.0::i38
  204. 6-freebsd::Mysql.3
  205. # deleted: public/lib2/DBD-mysql-2.1011/man/man3/Bundle::DBD::mysql.3
  206. # deleted: public/lib2/DBD-mysql-2.1011/man/man3/DBD::mysql.3
  207. # deleted: public/lib2/DBD-mysql-2.1011/man/man3/DBD::mysql::INSTALL.3
  208. # deleted: public/lib2/DBI-1.21/blib/man3/Bundle::DBI.3
  209. # deleted: public/lib2/DBI-1.21/blib/man3/DBD::Proxy.3
  210. # deleted: public/lib2/DBI-1.21/blib/man3/DBI::DBD.3
  211. # deleted: public/lib2/DBI-1.21/blib/man3/DBI::FAQ.3
  212. # deleted: public/lib2/DBI-1.21/blib/man3/DBI::Format.3
  213. # deleted: public/lib2/DBI-1.21/blib/man3/DBI::ProxyServer.3
  214. # deleted: public/lib2/DBI-1.21/blib/man3/DBI::Shell.3
  215. # deleted: public/lib2/DBI-1.21/blib/man3/DBI::W32ODBC.3
  216. # deleted: public/lib2/DBI-1.21/blib/man3/Win32::DBIODBC.3
  217. # deleted: public/lib2/man/man3/5.6.0::i386-freebsd::perllocal.3
  218. # deleted: public/lib2/man/man3/Bundle::DBD::mysql.3
  219. # deleted: public/lib2/man/man3/Bundle::DBI.3
  220. # deleted: public/lib2/man/man3/DBD::Proxy.3
  221. # deleted: public/lib2/man/man3/DBD::mysql.3
  222. # deleted: public/lib2/man/man3/DBD::mysql::INSTALL.3
  223. # deleted: public/lib2/man/man3/DBI::DBD.3
  224. # deleted: public/lib2/man/man3/DBI::FAQ.3
  225. # deleted: public/lib2/man/man3/DBI::Format.3
  226. # deleted: public/lib2/man/man3/DBI::ProxyServer.3
  227. # deleted: public/lib2/man/man3/DBI::Shell.3
  228. # deleted: public/lib2/man/man3/DBI::W32ODBC.3
  229. # deleted: public/lib2/man/man3/Win32::DBIODBC.3
  230. # deleted: public/lib2/man/man3/site_perl::5.6.0::i386-freebsd::Bundle:
  231. :DBD::mysql.3
  232. # deleted: public/lib2/man/man3/site_perl::5.6.0::i386-freebsd::DBD::my
  233. sql.3
  234. # deleted: public/lib2/man/man3/site_perl::5.6.0::i386-freebsd::DBD::my
  235. sql::INSTALL.3
  236. # deleted: public/lib2/man/man3/site_perl::5.6.0::i386-freebsd::Mysql.3
  237.  
  238. # deleted: public/stats/mytop/TermReadKey-2.30/blib/man3/Term::ReadKey.
  239. 3pm
  240. # deleted: public/stats/mytop/blib/man3/Term::ReadKey.3pm
  241. #
  242. # Untracked files:
  243. # (use "git add <file>..." to include in what will be committed)
  244. #
  245. # kohana/application.zip
Add Comment
Please, Sign In to add comment
Public Pastes
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!