API tools faq
paste
Guest User

Untitled

a guest
Oct 16th, 2018
150
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 14.34 KB | None | 0 0
raw download clone embed print report
  1. [ntsupply@205194-web1 ~/filterfetch.com]$ sudo git reset --keep fdfc6c6
  2. error: Entry 'fuel/app/classes/controller/app.php' not uptodate. Cannot merge.
  3. fatal: Could not reset index file to revision 'fdfc6c6'.
  4. [ntsupply@205194-web1 ~/filterfetch.com]$ git status
  5. # On branch master
  6. # Your branch is ahead of 'origin/master' by 917 commits.
  7. #
  8. # Changes not staged for commit:
  9. # (use "git add <file>..." to update what will be committed)
  10. # (use "git checkout -- <file>..." to discard changes in working directory)
  11. #
  12. # modified: fuel/app/classes/controller/app.php
  13. # modified: fuel/app/classes/controller/base/api.php
  14. # modified: fuel/app/classes/controller/base/common.php
  15. # modified: fuel/app/classes/model/user.php
  16. # modified: fuel/app/classes/utility/emailscripts.php
  17. # modified: fuel/app/classes/utility/helper.php
  18. # modified: fuel/app/config/casset.php
  19. # modified: fuel/app/config/routes.php
  20. # modified: fuel/app/modules/accountmanager/classes/controller/accountma nager.php
  21. # modified: fuel/app/modules/accountmanager/classes/model/accountmanager .php
  22. # modified: fuel/app/modules/cart/classes/controller/cart.php
  23. # modified: fuel/app/modules/cart/views/layouts/cart/checkout.php
  24. # modified: fuel/app/modules/cart/views/layouts/cart/checkout_confirmati on.php
  25. # modified: fuel/app/modules/cart/views/layouts/cart/index.php
  26. # modified: fuel/app/modules/category/classes/controller/category.php
  27. # modified: fuel/app/modules/category/views/layouts/category/index.php
  28. # modified: fuel/app/modules/category/views/layouts/category/view.php
  29. # modified: fuel/app/modules/code/classes/model/code.php
  30. # modified: fuel/app/modules/contractor/classes/controller/contractor.ph p
  31. # modified: fuel/app/modules/contractor/classes/model/contractor.php
  32. # modified: fuel/app/modules/contractor/classes/model/file.php
  33. # modified: fuel/app/modules/order/classes/controller/order.php
  34. # modified: fuel/app/modules/order/classes/model/order/detail.php
  35. # modified: fuel/app/modules/order/classes/model/order/head.php
  36. # modified: fuel/app/modules/order/views/layouts/order/lookup_charge.php
  37. # modified: fuel/app/modules/order/views/layouts/order/lookup_order.php
  38. # modified: fuel/app/modules/order/views/layouts/order/view.php
  39. # modified: fuel/app/modules/product/classes/controller/product.php
  40. # modified: fuel/app/modules/product/views/layouts/product/index.php
  41. # modified: fuel/app/modules/product/views/layouts/product/list.php
  42. # modified: fuel/app/modules/product/views/layouts/product/view.php
  43. # modified: fuel/app/modules/reminder/classes/controller/reminder.php
  44. # modified: fuel/app/modules/reminder/views/layouts/reminder/view.php
  45. # modified: fuel/app/modules/search/classes/controller/api.php
  46. # modified: fuel/app/modules/user/classes/controller/user.php
  47. # modified: fuel/app/modules/user/views/layouts/user/change_password.php
  48. # modified: fuel/app/modules/user/views/layouts/user/forgot_password.php
  49. # modified: fuel/app/modules/user/views/layouts/user/login.php
  50. # modified: fuel/app/modules/user/views/layouts/user/register.php
  51. # modified: fuel/app/modules/user/views/layouts/user/reset_password.php
  52. # modified: fuel/app/views/emails/order_confirmation.php
  53. # modified: fuel/packages/cart (new commits)
  54. # modified: fuel/packages/messages/classes/message/message.php
  55. # modified: fuel/packages/payment/classes/payment/driver/litle.php
  56. # modified: public/assets/css/bootstrap.css
  57. # modified: public/assets/css/bootstrap.min.css
  58. # modified: public/robots.txt
  59. # modified: public/themes/accountmanager/assets/css/styles.css
  60. # modified: public/themes/accountmanager/assets/js/script.js
  61. # modified: public/themes/accountmanager/views/layouts/accountmanager/co ntractors.php
  62. # modified: public/themes/accountmanager/views/layouts/accountmanager/in dex.php
  63. # modified: public/themes/accountmanager/views/partials/common/footer.ph p
  64. # modified: public/themes/accountmanager/views/partials/common/head.php
  65. # modified: public/themes/accountmanager/views/partials/common/header.ph p
  66. # modified: public/themes/accountmanager/views/partials/common/js_bot.ph p
  67. # modified: public/themes/accountmanager/views/templates/template.php
  68. # modified: public/themes/admin/views/layouts/admin/index.php
  69. # modified: public/themes/admin/views/partials/common/footer.php
  70. # modified: public/themes/admin/views/partials/common/head.php
  71. # modified: public/themes/admin/views/partials/common/js_bot.php
  72. # modified: public/themes/admin/views/templates/template.php
  73. # modified: public/themes/contractor/assets/css/styles.css
  74. # modified: public/themes/contractor/assets/js/script.js
  75. # modified: public/themes/contractor/views/layouts/contractor/catalog.ph p
  76. # modified: public/themes/contractor/views/layouts/contractor/files.php
  77. # modified: public/themes/contractor/views/layouts/contractor/index.php
  78. # modified: public/themes/contractor/views/layouts/contractor/login.php
  79. # modified: public/themes/contractor/views/layouts/contractor/order_view .php
  80. # modified: public/themes/contractor/views/layouts/contractor/orders.php
  81. # modified: public/themes/contractor/views/layouts/contractor/preview_pr oduct.php
  82. # modified: public/themes/contractor/views/layouts/contractor/product_vi ew.php
  83. # modified: public/themes/contractor/views/layouts/contractor/setup.php
  84. # modified: public/themes/contractor/views/layouts/contractor/technician s.php
  85. # modified: public/themes/contractor/views/partials/common/footer.php
  86. # modified: public/themes/contractor/views/partials/common/head.php
  87. # modified: public/themes/contractor/views/partials/common/header.php
  88. # modified: public/themes/contractor/views/partials/common/js_bot.php
  89. # modified: public/themes/contractor/views/templates/template.php
  90. # modified: public/themes/default/assets/css/styles.css
  91. # modified: public/themes/default/assets/js/script.js
  92. # modified: public/themes/default/assets/js/search-code.js
  93. # modified: public/themes/default/views/layouts/public/add_reminder.php
  94. # modified: public/themes/default/views/layouts/public/add_reminder_mobi le.php
  95. # modified: public/themes/default/views/layouts/public/air_filter_finder .php
  96. # modified: public/themes/default/views/layouts/public/contact.php
  97. # modified: public/themes/default/views/layouts/public/contractor_signup .php
  98. # modified: public/themes/default/views/layouts/public/customer_service. php
  99. # modified: public/themes/default/views/layouts/public/index.php
  100. # modified: public/themes/default/views/layouts/public/privacy.php
  101. # modified: public/themes/default/views/layouts/public/return.php
  102. # modified: public/themes/default/views/layouts/public/return_policy.php
  103. # modified: public/themes/default/views/layouts/public/terms.php
  104. # modified: public/themes/default/views/partials/common/head.php
  105. # modified: public/themes/default/views/partials/common/js_bot.php
  106. # modified: public/themes/default/views/partials/public/footer-mobile.ph p
  107. # modified: public/themes/default/views/partials/public/footer.php
  108. # modified: public/themes/default/views/partials/public/header.php
  109. # modified: public/themes/default/views/templates/template.php
  110. #
  111. # Untracked files:
  112. # (use "git add <file>..." to include in what will be committed)
  113. #
  114. # fuel/app/modules/contractor/classes/controller/api.php
  115. # fuel/app/views/emails/first_order_notification.php
  116. # fuel/app/views/emails/manual_contractor_notification.php
  117. # fuel/app/views/emails/new_contractor_text.php
  118. # public/assets/css/bootstrap-responsive.css
  119. # public/assets/css/bootstrap-responsive.min.css
  120. # public/assets/css/cart_checkout.css
  121. # public/assets/css/cart_index.css
  122. # public/assets/css/category_view.css
  123. # public/assets/css/main.css
  124. # public/assets/css/order_view.css
  125. # public/assets/css/product_list.css
  126. # public/assets/css/product_view.css
  127. # public/assets/css/reminder_view.css
  128. # public/assets/files/pdf/05b27c7e25bc752d2a33a1f4d96c1abd.pdf
  129. # public/assets/files/pdf/7ed0f3b05b2ddd9a773da1d3e5d63935.pdf
  130. # public/assets/files/pdf/9d07871aabe16775111df0b9e642c037.pdf
  131. # public/assets/files/pdf/b56968a3f74d23a91ecc7b7ef7f57209.pdf
  132. # public/assets/files/png/
  133. # public/assets/img/glyphicons-halflings-white.png
  134. # public/assets/img/glyphicons-halflings.png
  135. # public/assets/img/gui/loading.gif
  136. # public/assets/js/bootstrap.js
  137. # public/assets/js/bootstrap.min.js
  138. # public/assets/js/datatables.js
  139. # public/assets/js/jquery.dataTables.columnFilter.js
  140. # public/assets/js/jquery.dataTables.js
  141. # public/assets/js/jquery.dataTables.min.js
  142. # public/assets/js/main.js
  143. # public/themes/accountmanager/assets/css/catalog.css
  144. # public/themes/accountmanager/assets/css/contractors.css
  145. # public/themes/accountmanager/assets/css/files.css
  146. # public/themes/accountmanager/assets/css/index.css
  147. # public/themes/accountmanager/assets/css/management.css
  148. # public/themes/accountmanager/assets/css/order_view.css
  149. # public/themes/accountmanager/assets/css/orders.css
  150. # public/themes/accountmanager/assets/css/product_preview.css
  151. # public/themes/accountmanager/assets/css/product_view.css
  152. # public/themes/accountmanager/assets/css/reports.css
  153. # public/themes/accountmanager/assets/css/setup.css
  154. # public/themes/accountmanager/assets/css/technicians.css
  155. # public/themes/accountmanager/views/layouts/accountmanager/orders.php
  156. # public/themes/accountmanager/views/layouts/accountmanager/reports.php
  157. # public/themes/contractor/assets/css/add_reminder.css
  158. # public/themes/contractor/assets/css/catalog.css
  159. # public/themes/contractor/assets/css/contact.css
  160. # public/themes/contractor/assets/css/files.css
  161. # public/themes/contractor/assets/css/index.css
  162. # public/themes/contractor/assets/css/management.css
  163. # public/themes/contractor/assets/css/order_view.css
  164. # public/themes/contractor/assets/css/orders.css
  165. # public/themes/contractor/assets/css/product_preview.css
  166. # public/themes/contractor/assets/css/product_view.css
  167. # public/themes/contractor/assets/css/setup.css
  168. # public/themes/contractor/assets/css/technicians.css
  169. # public/themes/contractor/assets/js/jquery.dataTables.js
  170. # public/themes/contractor/assets/js/jquery.dataTables.min.js
  171. # public/themes/contractor/views/layouts/contractor/management.php
  172. # public/themes/contractor/views/layouts/contractor/reminders.php
  173. # public/themes/default/assets/css/add_reminder.css
  174. # public/themes/default/assets/css/add_reminder_mobile.css
  175. # public/themes/default/assets/css/air_filter_finder.css
  176. # public/themes/default/assets/css/contact.css
  177. # public/themes/default/assets/css/contractor_signup.css
  178. # public/themes/default/assets/css/index.css
  179. # public/themes/default/assets/css/lookup_charge.css
  180. # public/themes/default/assets/css/lookup_order.css
  181. # public/themes/default/assets/js/contractor-select.js
  182. # public/themes/default/views/layouts/public/contractor_contact.php
  183. # public/themes/default/views/layouts/public/contractor_select.php
  184. no changes added to commit (use "git add" and/or "git commit -a")
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!