Advertisement
Guest User

Untitled

a guest
Jul 29th, 2015
354
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C 5.09 KB | None | 0 0
  1. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git branch
  2. * merge-test
  3.  
  4.  
  5. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ echo "test" > 1.txt && git add . && git commit -am "1"                                                          
  6. [merge-test a59d8db] 1
  7.  1 file changed, 1 insertion(+)
  8.  create mode 100644 1.txt
  9.  
  10. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ echo "test" > 2.txt && git add . && git commit -am "2"  
  11. [merge-test cdfb9fa] 2
  12.  1 file changed, 1 insertion(+)
  13.  create mode 100644 2.txt
  14.  
  15. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ echo "test" > 3.txt && git add . && git commit -am "3"  
  16. [merge-test b367714] 3
  17.  1 file changed, 1 insertion(+)
  18.  create mode 100644 3.txt
  19.  
  20. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ echo "test" > 4.txt && git add . && git commit -am "4"  
  21. [merge-test 13954e9] 4
  22.  1 file changed, 1 insertion(+)
  23.  create mode 100644 4.txt
  24.  
  25. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ echo "test" > 5.txt && git add . && git commit -am "5"  
  26. [merge-test f6961d8] 5
  27.  1 file changed, 1 insertion(+)
  28.  create mode 100644 5.txt
  29.  
  30.  
  31. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git push
  32. fatal: The current branch merge-test has no upstream branch.
  33. To push the current branch and set the remote as upstream, use
  34.  
  35.     git push --set-upstream origin merge-test
  36.  
  37.  
  38. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git push --set-upstream origin merge-test
  39. Counting objects: 11, виконано.
  40. Delta compression using up to 4 threads.
  41. Compressing objects: 100% (10/10), виконано.
  42. Writing objects: 100% (11/11), 1.04 KiB | 0 bytes/s, виконано.
  43. Total 11 (delta 4), reused 0 (delta 0)
  44. remote:
  45. remote: Create pull request for merge-test:
  46. remote:   https://stash.wargaming.net/projects/WOTG/repos/wotgw/compare/commits?sourceBranch=refs/heads/merge-test
  47. remote:
  48. To ssh://git@stash.wargaming.net:2222/wotg/wotgw.git
  49.  * [new branch]      merge-test -> merge-test
  50. Гілка merge-test налаштує для відстеження віддаленої гілки merge-test з origin.
  51.  
  52.  
  53. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git log
  54. commit f6961d80e66991aa1cfce34785ed69e91571fa35
  55. Author: Pavel Ponomarenko <p_ponomarenko@wargaming.net>
  56. Date:   Wed Jul 29 13:45:18 2015 +0300
  57.  
  58.     5
  59.  
  60. commit 13954e9cb38d7fc64c4f1ff9f0bb662e8c99241b
  61. Author: Pavel Ponomarenko <p_ponomarenko@wargaming.net>
  62. Date:   Wed Jul 29 13:45:14 2015 +0300
  63.  
  64.     4
  65.  
  66. commit b3677147958a55d1c66bfc9e1183660d7921a209
  67. Author: Pavel Ponomarenko <p_ponomarenko@wargaming.net>
  68. Date:   Wed Jul 29 13:45:10 2015 +0300
  69.  
  70.     3
  71.  
  72. commit cdfb9faac5a525b719b47f3322c6850ec9be96b5
  73. Author: Pavel Ponomarenko <p_ponomarenko@wargaming.net>
  74. Date:   Wed Jul 29 13:45:06 2015 +0300
  75.  
  76.     2
  77.  
  78. commit a59d8db31aa13b21b6dc6ef732952df494d03821
  79. Author: Pavel Ponomarenko <p_ponomarenko@wargaming.net>
  80. Date:   Wed Jul 29 13:44:58 2015 +0300
  81.  
  82.     1
  83.  
  84. commit f99d91fdf6461492d90d4c3f24bd5ec775aacab6
  85. Author: Victor <glukozavr.91@gmail.com>
  86. Date:   Mon Jun 15 19:08:20 2015 +0300
  87.  
  88.     Cleaning from test files.
  89.  
  90.  
  91. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git branch merge-test-second cdfb9faac5a525b719b47f3322c6850ec9be96b5
  92.  
  93. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git checkout merge-test-second
  94. Перейшов до гілки 'merge-test-second'
  95.  
  96. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git log
  97. commit cdfb9faac5a525b719b47f3322c6850ec9be96b5
  98. Author: Pavel Ponomarenko <p_ponomarenko@wargaming.net>
  99. Date:   Wed Jul 29 13:45:06 2015 +0300
  100.  
  101.     2
  102.  
  103. commit a59d8db31aa13b21b6dc6ef732952df494d03821
  104. Author: Pavel Ponomarenko <p_ponomarenko@wargaming.net>
  105. Date:   Wed Jul 29 13:44:58 2015 +0300
  106.  
  107.     1
  108.  
  109. commit f99d91fdf6461492d90d4c3f24bd5ec775aacab6
  110. Author: Victor <glukozavr.91@gmail.com>
  111. Date:   Mon Jun 15 19:08:20 2015 +0300
  112.  
  113.     Cleaning from test files.
  114.  
  115.  
  116. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git push --set-upstream origin merge-test-second
  117. Total 0 (delta 0), reused 0 (delta 0)
  118. remote:
  119. remote: Create pull request for merge-test-second:
  120. remote:   https://stash.wargaming.net/projects/WOTG/repos/wotgw/compare/commits?sourceBranch=refs/heads/merge-test-second
  121. remote:
  122. To ssh://git@stash.wargaming.net:2222/wotg/wotgw.git
  123.  * [new branch]      merge-test-second -> merge-test-second
  124. Гілка merge-test-second налаштує для відстеження віддаленої гілки merge-test-second з origin.
  125.  
  126.  
  127. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ echo "test" > 6.txt && git add . && git commit -am "6"
  128. [merge-test-second 5171637] 6
  129.  1 file changed, 1 insertion(+)
  130.  create mode 100644 6.txt
  131.  
  132. p_ponomarenko@ua1-lw-658:~/Dev/wotg/wotgw$ git push
  133. Counting objects: 2, виконано.
  134. Delta compression using up to 4 threads.
  135. Compressing objects: 100% (2/2), виконано.
  136. Writing objects: 100% (2/2), 234 bytes | 0 bytes/s, виконано.
  137. Total 2 (delta 1), reused 0 (delta 0)
  138. remote:
  139. remote: Create pull request for merge-test-second:
  140. remote:   https://stash.wargaming.net/projects/WOTG/repos/wotgw/compare/commits?sourceBranch=refs/heads/merge-test-second
  141. remote:
  142. To ssh://git@stash.wargaming.net:2222/wotg/wotgw.git
  143.    cdfb9fa..5171637  merge-test-second -> merge-test-second
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement