Priem19

GraphRange branch

Dec 1st, 2019
83
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.02 KB | None | 0 0
  1. x@x:~/Software$ git clone https://github.com/priem19/bitcoin.git
  2. Cloning into 'bitcoin'...
  3. remote: Enumerating objects: 4, done.
  4. remote: Counting objects: 100% (4/4), done.
  5. remote: Compressing objects: 100% (3/3), done.
  6. remote: Total 150626 (delta 1), reused 2 (delta 1), pack-reused 150622
  7. Receiving objects: 100% (150626/150626), 134.35 MiB | 20.31 MiB/s, done.
  8. Resolving deltas: 100% (105144/105144), done.
  9.  
  10. x@x:~/Software$ cd bitcoin/
  11. x@x:~/Software/bitcoin$ git remote -v
  12. origin https://github.com/priem19/bitcoin.git (fetch)
  13. origin https://github.com/priem19/bitcoin.git (push)
  14.  
  15. x@x:~/Software/bitcoin$ git remote add upstream https://github.com/bitcoin/bitcoin.git
  16. x@x:~/Software/bitcoin$ git remote -v
  17. origin https://github.com/priem19/bitcoin.git (fetch)
  18. origin https://github.com/priem19/bitcoin.git (push)
  19. upstream https://github.com/bitcoin/bitcoin.git (fetch)
  20. upstream https://github.com/bitcoin/bitcoin.git (push)
  21.  
  22. x@x:~/Software/bitcoin$ git status
  23. On branch master
  24. Your branch is up to date with 'origin/master'.
  25.  
  26. nothing to commit, working tree clean
  27.  
  28. x@x:~/Software/bitcoin$ git branch GraphRange
  29.  
  30. x@x:~/Software/bitcoin$ git checkout GraphRange
  31. Switched to branch 'GraphRange'
  32.  
  33. x@x:~/Software/bitcoin$ git status
  34. On branch GraphRange
  35. nothing to commit, working tree clean
  36.  
  37. x@x:~/Software/bitcoin$ git status
  38. On branch GraphRange
  39. Changes not staged for commit:
  40. (use "git add <file>..." to update what will be committed)
  41. (use "git checkout -- <file>..." to discard changes in working directory)
  42.  
  43. modified: src/qt/forms/debugwindow.ui
  44.  
  45. no changes added to commit (use "git add" and/or "git commit -a")
  46.  
  47. x@x:~/Software/bitcoin$ git branch
  48. * GraphRange
  49. master
  50.  
  51. x@x:~/Software/bitcoin$ git commit -a -m "gui: increases default GraphRange of Network Traffic to 12 hours."
  52. [GraphRange 21936e973] gui: increases default GraphRange of Network Traffic to 12 hours.
  53. 1 file changed, 1 insertion(+), 1 deletion(-)
  54.  
  55. x@x:~/Software/bitcoin$ git checkout master
  56. Switched to branch 'master'
  57. Your branch is up to date with 'origin/master'.
  58.  
  59. x@x:~/Software/bitcoin$ git fetch upstream
  60. remote: Enumerating objects: 14, done.
  61. remote: Counting objects: 100% (14/14), done.
  62. remote: Total 16 (delta 13), reused 14 (delta 13), pack-reused 2
  63. Unpacking objects: 100% (16/16), done.
  64. From https://github.com/bitcoin/bitcoin
  65. * [new branch] 0.14 -> upstream/0.14
  66. * [new branch] 0.15 -> upstream/0.15
  67. * [new branch] 0.16 -> upstream/0.16
  68. * [new branch] 0.17 -> upstream/0.17
  69. * [new branch] 0.18 -> upstream/0.18
  70. * [new branch] 0.19 -> upstream/0.19
  71. * [new branch] master -> upstream/master
  72.  
  73. x@x:~/Software/bitcoin$ git checkout master
  74. Already on 'master'
  75. Your branch is up to date with 'origin/master'.
  76.  
  77. x@x:~/Software/bitcoin$ git merge upstream/master
  78. Updating 2ecb7e155..19698ac6b
  79. Fast-forward
  80. src/wallet/wallet.cpp | 11 ++++-------
  81. test/functional/rpc_fundrawtransaction.py | 13 +++++++++++++
  82. 2 files changed, 17 insertions(+), 7 deletions(-)
  83.  
  84. x@x:~/Software/bitcoin$ git status
  85. On branch master
  86. Your branch is ahead of 'origin/master' by 3 commits.
  87. (use "git push" to publish your local commits)
  88.  
  89. nothing to commit, working tree clean
  90.  
  91. x@x:~/Software/bitcoin$ git branch
  92. GraphRange
  93. * master
  94.  
  95. x@x:~/Software/bitcoin$ git merge GraphRange
  96. Merge made by the 'recursive' strategy.
  97. src/qt/forms/debugwindow.ui | 2 +-
  98. 1 file changed, 1 insertion(+), 1 deletion(-)
  99.  
  100. x@x:~/Software/bitcoin$ git status
  101. On branch master
  102. Your branch is ahead of 'origin/master' by 5 commits.
  103. (use "git push" to publish your local commits)
  104.  
  105. nothing to commit, working tree clean
  106.  
  107. x@x:~/Software/bitcoin$ git push -u origin master
  108. Username for 'https://github.com': Priem19
  109. Password for 'https://[email protected]':
  110. Counting objects: 9, done.
  111. Delta compression using up to 8 threads.
  112. Compressing objects: 100% (9/9), done.
  113. Writing objects: 100% (9/9), 904 bytes | 904.00 KiB/s, done.
  114. Total 9 (delta 7), reused 0 (delta 0)
  115. remote: Resolving deltas: 100% (7/7), completed with 6 local objects.
  116. To https://github.com/priem19/bitcoin.git
  117. 2ecb7e155..b984bfcdf master -> master
  118. Branch 'master' set up to track remote branch 'master' from 'origin'.
  119.  
  120. x@x:~/Software/bitcoin$ git branch
  121. GraphRange
  122. * master
  123.  
  124. x@x:~/Software/bitcoin$ git checkout GraphRange
  125. Switched to branch 'GraphRange'
  126.  
  127. x@x:~/Software/bitcoin$ git status
  128. On branch GraphRange
  129. nothing to commit, working tree clean
  130.  
  131. x@x:~/Software/bitcoin$ git push -u origin GraphRange
  132. Username for 'https://github.com': Priem19
  133. Password for 'https://[email protected]':
  134. Total 0 (delta 0), reused 0 (delta 0)
  135. remote:
  136. remote: Create a pull request for 'GraphRange' on GitHub by visiting:
  137. remote: https://github.com/priem19/bitcoin/pull/new/GraphRange
  138. remote:
  139. To https://github.com/priem19/bitcoin.git
  140. * [new branch] GraphRange -> GraphRange
  141. Branch 'GraphRange' set up to track remote branch 'GraphRange' from 'origin'.
Advertisement
Add Comment
Please, Sign In to add comment