API tools faq
paste
ishanra

Untitled

ishanra
Jun 25th, 2021
169
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 12.20 KB | None | 0 0
raw download clone embed print report
  1. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  2. $ git status
  3. On branch payment_and_dedup
  4. Changes not staged for commit:
  5.   (use "git add <file>..." to update what will be committed)
  6.   (use "git restore <file>..." to discard changes in working directory)
  7.   (commit or discard the untracked or modified content in submodules)  
  8.         modified:   openg2p-erp-community-addon (modified content)
  9.         modified:   openg2p/models/openg2p_beneficiary.py
  10.         modified:   openg2p_disbursement_advice/__manifest__.py
  11.         modified:   openg2p_disbursement_advice/models/openg2p_disbursement_advice_line.py      
  12.         modified:   openg2p_disbursement_advice/views/openg2p_disbursement_batch_transaction.xml
  13.         modified:   openg2p_disbursement_advice/views/openg2p_disbursement_main.xml
  14.         modified:   openg2p_disbursement_advice/views/openg2p_disbursement_single_transaction.xml
  15.         modified:   openg2p_disbursement_advice/views/res_partner_bank.xml
  16.         modified:   openg2p_registration/models/openg2p_registration.py
  17.  
  18. Untracked files:
  19.   (use "git add <file>..." to include in what will be committed)
  20.         openg2p_disbursement_advice/views/action_menu.xml
  21.         openg2p_disbursement_advice/views/transaction_menu.xml
  22.  
  23. no changes added to commit (use "git add" and/or "git commit -a")
  24.  
  25. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  26. $ git add .
  27.  
  28. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  29. $ git status
  30. On branch payment_and_dedup
  31. Changes to be committed:
  32.   (use "git restore --staged <file>..." to unstage)
  33.         modified:   openg2p/models/openg2p_beneficiary.py
  34.         modified:   openg2p_disbursement_advice/__manifest__.py
  35.         modified:   openg2p_disbursement_advice/models/openg2p_disbursement_advice_line.py
  36.         new file:   openg2p_disbursement_advice/views/action_menu.xml
  37.         modified:   openg2p_disbursement_advice/views/openg2p_disbursement_batch_transaction.xml
  38.         modified:   openg2p_disbursement_advice/views/openg2p_disbursement_main.xml
  39.         modified:   openg2p_disbursement_advice/views/openg2p_disbursement_single_transaction.xml
  40.         modified:   openg2p_disbursement_advice/views/res_partner_bank.xml
  41.         new file:   openg2p_disbursement_advice/views/transaction_menu.xml
  42.         modified:   openg2p_registration/models/openg2p_registration.py
  43.  
  44. Changes not staged for commit:
  45.   (use "git add <file>..." to update what will be committed)
  46.   (use "git restore <file>..." to discard changes in working directory)
  47.   (commit or discard the untracked or modified content in submodules)
  48.         modified:   openg2p-erp-community-addon (modified content)
  49.  
  50.  
  51. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  52. $ git commit -m "added new menu and sub-menus"
  53. [payment_and_dedup 5409a75] added new menu and sub-menus
  54.  10 files changed, 76 insertions(+), 94 deletions(-)
  55.  create mode 100644 openg2p_disbursement_advice/views/action_menu.xml
  56.  create mode 100644 openg2p_disbursement_advice/views/transaction_menu.xml
  57.  
  58. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  59. $ git push origin_dev payment_and_dedup
  60. Enumerating objects: 34, done.
  61. Counting objects: 100% (34/34), done.
  62. Delta compression using up to 8 threads
  63. Compressing objects: 100% (19/19), done.
  64. Writing objects: 100% (19/19), 2.34 KiB | 1.17 MiB/s, done.
  65. Total 19 (delta 16), reused 0 (delta 0), pack-reused 0
  66. remote: Resolving deltas: 100% (16/16), completed with 15 local objects.
  67. To https://github.com/openg2p-dev/openg2p-erp
  68.    3b5fe28..5409a75  payment_and_dedup -> payment_and_dedup
  69.  
  70. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  71. $ git add .
  72.  
  73. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  74. $ git commit -m "bank field"
  75. [payment_and_dedup c22ce18] bank field
  76.  2 files changed, 14 insertions(+), 12 deletions(-)
  77.  
  78. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  79. $ git fetch --all
  80. Fetching origin_dev
  81. remote: Enumerating objects: 317, done.
  82. remote: Counting objects: 100% (230/230), done.
  83. remote: Compressing objects: 100% (81/81), done.
  84. Receiving objects:  80% (115/143)eused 98 (delta 58), pack-reused 0
  85. Receiving objects: 100% (143/143), 94.21 KiB | 1015.00 KiB/s, done.
  86. Resolving deltas: 100% (102/102), completed with 50 local objects.
  87. From https://github.com/openg2p-dev/openg2p-erp
  88.  * [new branch]      age_filter    -> origin_dev/age_filter
  89.    ed83eca..04e53f9  deduplication -> origin_dev/deduplication
  90.    8f52c1a..591ff81  dev           -> origin_dev/dev
  91.  * [new branch]      formatting    -> origin_dev/formatting
  92.  * [new branch]      master        -> origin_dev/master
  93.  * [new branch]      odk-connector -> origin_dev/odk-connector
  94.  * [new branch]      odk_connect   -> origin_dev/odk_connect
  95.  * [new branch]      regd_bank     -> origin_dev/regd_bank
  96.  * [new branch]      security      -> origin_dev/security
  97. Fetching origin
  98.  
  99. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  100. $ git checkout openg2p_dev/security
  101. error: pathspec 'openg2p_dev/security' did not match any file(s) known to git
  102.  
  103. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (payment_and_dedup)
  104. $ git checkout origin_dev/security
  105. warning: unable to rmdir 'openg2p-erp-community-addon': Directory not empty
  106. Note: switching to 'origin_dev/security'.
  107.  
  108. You are in 'detached HEAD' state. You can look around, make experimental
  109. changes and commit them, and you can discard any commits you make in this
  110. state without impacting any branches by switching back to a branch.      
  111.  
  112. If you want to create a new branch to retain commits you create, you may
  113. do so (now or later) by using -c with the switch command. Example:      
  114.  
  115.   git switch -c <new-branch-name>
  116.  
  117. Or undo this operation with:
  118.  
  119.   git switch -
  120.  
  121. Turn off this advice by setting config variable advice.detachedHead to false
  122.  
  123. HEAD is now at 2cc68a2 icon for odk-connect app: error
  124.  
  125. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp ((2cc68a2...))
  126. $ git checkout deduplication
  127. Previous HEAD position was 2cc68a2 icon for odk-connect app: error
  128. Switched to branch 'deduplication'
  129. M       openg2p-erp-community-addon
  130.  
  131. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  132. $ git pull
  133. There is no tracking information for the current branch.
  134. Please specify which branch you want to merge with.
  135. See git-pull(1) for details.
  136.  
  137.     git pull <remote> <branch>
  138.  
  139. If you wish to set tracking information for this branch you can do so with:
  140.  
  141.     git branch --set-upstream-to=<remote>/<branch> deduplication
  142.  
  143.  
  144. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  145. $ git pull origin_dev deduplication
  146. From https://github.com/openg2p-dev/openg2p-erp
  147.  * branch            deduplication -> FETCH_HEAD
  148. Updating ed83eca..04e53f9
  149. Fast-forward
  150.  default_ide.editorconfig                           | 731 +++++++++++++++++++++
  151.  .../models/openg2p_registration.py                 |   2 +-
  152.  2 files changed, 732 insertions(+), 1 deletion(-)
  153.  create mode 100644 default_ide.editorconfig
  154.  
  155. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication|MERGING)
  156. $ git add .
  157.  
  158. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication|MERGING)
  159. $ git commit
  160. hint: Waiting for your editor to close the file...
  161. [deduplication 409fb7b] Merge branch 'dev' of https://github.com/openg2p-dev/openg2p-erp into deduplication
  162.  
  163. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  164. $ git push
  165. fatal: The current branch deduplication has no upstream branch.
  166. To push the current branch and set the remote as upstream, use
  167.  
  168.     git push --set-upstream origin deduplication
  169.  
  170.  
  171. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  172. $ git push origin_dev deduplication
  173. Enumerating objects: 28, done.
  174. Counting objects: 100% (28/28), done.
  175. Delta compression using up to 8 threads
  176. Compressing objects: 100% (10/10), done.
  177. Writing objects: 100% (10/10), 999 bytes | 999.00 KiB/s, done.
  178. Total 10 (delta 9), reused 0 (delta 0), pack-reused 0
  179. remote: Resolving deltas: 100% (9/9), completed with 9 local objects.
  180. To https://github.com/openg2p-dev/openg2p-erp
  181.    04e53f9..409fb7b  deduplication -> deduplication
  182.  
  183. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  184. $ git add .
  185.  
  186. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  187. $ git commit
  188. hint: Waiting for your editor to close the file...
  189. Aborting commit due to empty commit message.
  190.  
  191. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  192. $ git status
  193. On branch deduplication
  194. Changes to be committed:
  195.   (use "git restore --staged <file>..." to unstage)
  196.         modified:   openg2p_registration/models/openg2p_registration.py
  197.  
  198.  
  199. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  200. $ git log --oneline
  201. 409fb7b (HEAD -> deduplication, origin_dev/deduplication) Merge branch 'dev' of https://github.com/openg2p-dev/openg2p-erp into deduplication
  202. 591ff81 (origin_dev/dev) [REFACTOR] Formatted all Python files with Black (#12)
  203. 04e53f9 Typo fix
  204. ed83eca changes after pull request
  205. 53ba225 checking bank_account_id
  206. 093441f changes in xml
  207. fa6b6ce all files formatted
  208. 8f52c1a [FEAT] ODK Submission -> Registration and Organisation Fields (#5)
  209. cbac77d formatting changes
  210. b540d3a uncommenting rohnaks
  211. 0b4e77f [FEAT] Bank fields in Registration (#8)
  212. 15a28fe [FEAT] Age Filter for Beneficiaries (#6)
  213. cd39ffc [Module] ODK Connector (#10)
  214. cbd8e7f (origin/deduplication) changes in bank fields
  215. c0bd4eb bank fields
  216. a218769 deduplication_code
  217. ffcf603 (regd_bank) bank account in UI fixed
  218. c68d44a bank account in regd done
  219. 216ae31 bank fields in registration
  220. b2242b8 Bank fields in registration
  221. 949706a Submission to registration
  222.  
  223. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  224. $ git checkout origin_dev/dev
  225. error: Your local changes to the following files would be overwritten by checkout:
  226.         openg2p_registration/models/openg2p_registration.py
  227. Please commit your changes or stash them before you switch branches.
  228. Aborting
  229.  
  230. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  231. $ git stash
  232. Saved working directory and index state WIP on deduplication: 409fb7b Merge branch 'dev' of https://github.com/openg2p-dev/openg2p-erp into deduplication
  233.  
  234. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  235. $ git stash clear
  236.  
  237. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp (deduplication)
  238. $ git checkout origin_dev/dev
  239. Note: switching to 'origin_dev/dev'.
  240.  
  241. You are in 'detached HEAD' state. You can look around, make experimental
  242. changes and commit them, and you can discard any commits you make in this
  243. state without impacting any branches by switching back to a branch.
  244.  
  245. If you want to create a new branch to retain commits you create, you may
  246. do so (now or later) by using -c with the switch command. Example:
  247.  
  248.   git switch -c <new-branch-name>
  249.  
  250. Or undo this operation with:
  251.  
  252.   git switch -
  253.  
  254. Turn off this advice by setting config variable advice.detachedHead to false
  255.  
  256. HEAD is now at 591ff81 [REFACTOR] Formatted all Python files with Black (#12)
  257.  
  258. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp ((591ff81...))
  259. $ git checkout origin_dev de
  260. deduplication   dev
  261.  
  262. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp ((591ff81...))
  263. $ git checkout origin_dev de
  264. deduplication   dev
  265.  
  266. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp ((591ff81...))
  267. $ git checkout origin_dev deduplication
  268. error: pathspec 'origin_dev' did not match any file(s) known to git
  269. error: pathspec 'deduplication' did not match any file(s) known to git
  270.  
  271. ISHAN RANASINGH@LAPTOP-NR399VJO MINGW64 /f/odoo12/odoo/openg2p-erp ((591ff81...))
  272. $ git checkout  deduplication
  273. Previous HEAD position was 591ff81 [REFACTOR] Formatted all Python files with Black (#12)
  274. Switched to branch 'deduplication'
Advertisement
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!