API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 24th, 2018
335
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 11.01 KB | None | 0 0
raw download clone embed print report
  1. Last login: Mon Sep 24 14:52:22 on console
  2. MacBook-Pro-Evgenij:~ evgenabramov$ git checkout master
  3. fatal: not a git repository (or any of the parent directories): .git
  4. MacBook-Pro-Evgenij:~ evgenabramov$ cd abramov
  5. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout master
  6. Switched to branch 'master'
  7. Your branch is ahead of 'origin/master' by 1 commit.
  8. (use "git push" to publish your local commits)
  9. MacBook-Pro-Evgenij:abramov evgenabramov$ git status
  10. On branch master
  11. Your branch is ahead of 'origin/master' by 1 commit.
  12. (use "git push" to publish your local commits)
  13.  
  14. nothing to commit, working tree clean
  15. MacBook-Pro-Evgenij:abramov evgenabramov$ git log
  16. commit 7677cc0cc353dcbda942b4efd6285e6190a73531 (HEAD -> master, 1-2-4)
  17. Author: Евгений Абрамов <abramov.ed@phystech.edu>
  18. Date: Mon Sep 24 02:53:44 2018 +0300
  19.  
  20. Пофиксил кодстайл
  21.  
  22. commit 115005b259dbf3a63d0a088eef938f8b1244f0b7 (origin/master, origin/HEAD)
  23. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  24. Date: Tue Sep 18 19:52:03 2018 +0000
  25.  
  26. Add .gitlab-ci.yml
  27.  
  28. commit 5a4b361c882b95dca8efc12402c96716c0896b30
  29. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  30. Date: Mon Sep 17 21:12:14 2018 +0000
  31.  
  32. Add new file
  33.  
  34. commit 8337713f2a091613289ee7ea634ec09d73801dbc
  35. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  36. Date: Mon Sep 17 21:01:48 2018 +0000
  37.  
  38. Add README.md
  39. MacBook-Pro-Evgenij:abramov evgenabramov$ git reset -hard HEAD-
  40. error: did you mean `--hard` (with two dashes ?)
  41. MacBook-Pro-Evgenij:abramov evgenabramov$ git reset --hard HEAD-
  42. fatal: ambiguous argument 'HEAD-': unknown revision or path not in the working tree.
  43. Use '--' to separate paths from revisions, like this:
  44. 'git <command> [<revision>...] -- [<file>...]'
  45. MacBook-Pro-Evgenij:abramov evgenabramov$ git status
  46. On branch master
  47. Your branch is ahead of 'origin/master' by 1 commit.
  48. (use "git push" to publish your local commits)
  49.  
  50. nothing to commit, working tree clean
  51. MacBook-Pro-Evgenij:abramov evgenabramov$ git reset --hard HEAD^1
  52. HEAD is now at 115005b Add .gitlab-ci.yml
  53. MacBook-Pro-Evgenij:abramov evgenabramov$ git status
  54. On branch master
  55. Your branch is up to date with 'origin/master'.
  56.  
  57. nothing to commit, working tree clean
  58. MacBook-Pro-Evgenij:abramov evgenabramov$ git log
  59. commit 115005b259dbf3a63d0a088eef938f8b1244f0b7 (HEAD -> master, origin/master, origin/HEAD)
  60. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  61. Date: Tue Sep 18 19:52:03 2018 +0000
  62.  
  63. Add .gitlab-ci.yml
  64.  
  65. commit 5a4b361c882b95dca8efc12402c96716c0896b30
  66. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  67. Date: Mon Sep 17 21:12:14 2018 +0000
  68.  
  69. Add new file
  70.  
  71. commit 8337713f2a091613289ee7ea634ec09d73801dbc
  72. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  73. Date: Mon Sep 17 21:01:48 2018 +0000
  74.  
  75. Add README.md
  76. MacBook-Pro-Evgenij:abramov evgenabramov$
  77. MacBook-Pro-Evgenij:abramov evgenabramov$
  78. MacBook-Pro-Evgenij:abramov evgenabramov$
  79. MacBook-Pro-Evgenij:abramov evgenabramov$ ls
  80. 1-3-1 1-4-3 README.md
  81. MacBook-Pro-Evgenij:abramov evgenabramov$ git status
  82. On branch master
  83. Your branch is up to date with 'origin/master'.
  84.  
  85. nothing to commit, working tree clean
  86. MacBook-Pro-Evgenij:abramov evgenabramov$ git status
  87. On branch master
  88. Your branch is up to date with 'origin/master'.
  89.  
  90. nothing to commit, working tree clean
  91. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout 1-3-1
  92. Branch '1-3-1' set up to track remote branch '1-3-1' from 'origin'.
  93. Switched to a new branch '1-3-1'
  94. MacBook-Pro-Evgenij:abramov evgenabramov$ ls
  95. 1-2-4 1-3-1 README.md
  96. MacBook-Pro-Evgenij:abramov evgenabramov$ rm -rf
  97. MacBook-Pro-Evgenij:abramov evgenabramov$ ls
  98. 1-3-1 README.md
  99. MacBook-Pro-Evgenij:abramov evgenabramov$ git add .
  100. MacBook-Pro-Evgenij:abramov evgenabramov$ git commit
  101. [1-3-1 7d257ee] Remove eztra folder
  102. 1 file changed, 31 deletions(-)
  103. delete mode 100644 1-2-4/main.cpp
  104. MacBook-Pro-Evgenij:abramov evgenabramov$ git push
  105. Enumerating objects: 3, done.
  106. Counting objects: 100% (3/3), done.
  107. Delta compression using up to 12 threads.
  108. Compressing objects: 100% (2/2), done.
  109. Writing objects: 100% (2/2), 235 bytes | 235.00 KiB/s, done.
  110. Total 2 (delta 1), reused 0 (delta 0)
  111. remote:
  112. remote: View merge request for 1-3-1:
  113. remote: https://gitlab.com/diht824/abramov/merge_requests/2
  114. remote:
  115. To https://gitlab.com/diht824/abramov.git
  116. df3fcc8..7d257ee 1-3-1 -> 1-3-1
  117. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout 1-4-3
  118. Branch '1-4-3' set up to track remote branch '1-4-3' from 'origin'.
  119. Switched to a new branch '1-4-3'
  120. MacBook-Pro-Evgenij:abramov evgenabramov$ git add .
  121. MacBook-Pro-Evgenij:abramov evgenabramov$ git commit -m "Remove extra folders"
  122. [1-4-3 da29de6] Remove extra folders
  123. 2 files changed, 75 deletions(-)
  124. delete mode 100644 1-2-4/main.cpp
  125. delete mode 100644 1-3-1/main.cpp
  126. MacBook-Pro-Evgenij:abramov evgenabramov$ git push
  127. Enumerating objects: 3, done.
  128. Counting objects: 100% (3/3), done.
  129. Delta compression using up to 12 threads.
  130. Compressing objects: 100% (2/2), done.
  131. Writing objects: 100% (2/2), 237 bytes | 237.00 KiB/s, done.
  132. Total 2 (delta 1), reused 0 (delta 0)
  133. remote:
  134. remote: View merge request for 1-4-3:
  135. remote: https://gitlab.com/diht824/abramov/merge_requests/3
  136. remote:
  137. To https://gitlab.com/diht824/abramov.git
  138. b6b2ae9..da29de6 1-4-3 -> 1-4-3
  139. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout 1-2-4
  140. Switched to branch '1-2-4'
  141. MacBook-Pro-Evgenij:abramov evgenabramov$ git add .
  142. MacBook-Pro-Evgenij:abramov evgenabramov$ git commit -m "Fixed codestyle"
  143. [1-2-4 a7bc294] Fixed codestyle
  144. 2 files changed, 162 deletions(-)
  145. delete mode 100644 1-3-1/main.cpp
  146. delete mode 100644 1-4-3/main.cpp
  147. MacBook-Pro-Evgenij:abramov evgenabramov$ git push
  148. fatal: The current branch 1-2-4 has no upstream branch.
  149. To push the current branch and set the remote as upstream, use
  150.  
  151. git push --set-upstream origin 1-2-4
  152.  
  153. MacBook-Pro-Evgenij:abramov evgenabramov$ git push --set-upstream origin 1-2-4
  154. To https://gitlab.com/diht824/abramov.git
  155. ! [rejected] 1-2-4 -> 1-2-4 (non-fast-forward)
  156. error: failed to push some refs to 'https://gitlab.com/diht824/abramov.git'
  157. hint: Updates were rejected because the tip of your current branch is behind
  158. hint: its remote counterpart. Integrate the remote changes (e.g.
  159. hint: 'git pull ...') before pushing again.
  160. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  161. MacBook-Pro-Evgenij:abramov evgenabramov$ git pull
  162. remote: Enumerating objects: 8, done.
  163. remote: Counting objects: 100% (8/8), done.
  164. remote: Compressing objects: 100% (5/5), done.
  165. remote: Total 6 (delta 2), reused 5 (delta 1)
  166. Unpacking objects: 100% (6/6), done.
  167. From https://gitlab.com/diht824/abramov
  168. 115005b..76d58cf master -> origin/master
  169. There is no tracking information for the current branch.
  170. Please specify which branch you want to merge with.
  171. See git-pull(1) for details.
  172.  
  173. git pull <remote> <branch>
  174.  
  175. If you wish to set tracking information for this branch you can do so with:
  176.  
  177. git branch --set-upstream-to=origin/<branch> 1-2-4
  178.  
  179. MacBook-Pro-Evgenij:abramov evgenabramov$ git log
  180. commit a7bc294b07d0a8f2e26dde77b2ebcd1983fd12dd (HEAD -> 1-2-4)
  181. Author: Evgeny Abramov <abramov.ed@phystech.edu>
  182. Date: Mon Sep 24 16:00:24 2018 +0300
  183.  
  184. Fixed codestyle
  185.  
  186. commit a7bc294b07d0a8f2e26dde77b2ebcd1983fd12dd (HEAD -> 1-2-4)
  187. Author: Evgeny Abramov <abramov.ed@phystech.edu>
  188. Date: Mon Sep 24 16:00:24 2018 +0300
  189.  
  190. Fixed codestyle
  191.  
  192. commit 7677cc0cc353dcbda942b4efd6285e6190a73531
  193. Author: Евгений Абрамов <abramov.ed@phystech.edu>
  194. Date: Mon Sep 24 02:53:44 2018 +0300
  195.  
  196. Пофиксил кодстайл
  197.  
  198. commit 115005b259dbf3a63d0a088eef938f8b1244f0b7 (master)
  199. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  200. Date: Tue Sep 18 19:52:03 2018 +0000
  201.  
  202. Add .gitlab-ci.yml
  203.  
  204. commit 5a4b361c882b95dca8efc12402c96716c0896b30
  205. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  206. Date: Mon Sep 17 21:12:14 2018 +0000
  207.  
  208. Add new file
  209. MacBook-Pro-Evgenij:abramov evgenabramov$ git branch -d 1-2-4
  210. error: Cannot delete branch '1-2-4' checked out at '/Users/evgenabramov/abramov'
  211. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout master
  212. Switched to branch 'master'
  213. Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
  214. (use "git pull" to update your local branch)
  215. MacBook-Pro-Evgenij:abramov evgenabramov$ git branch -d 1-2-4
  216. error: The branch '1-2-4' is not fully merged.
  217. If you are sure you want to delete it, run 'git branch -D 1-2-4'.
  218. MacBook-Pro-Evgenij:abramov evgenabramov$ -D
  219. -bash: -D: command not found
  220. MacBook-Pro-Evgenij:abramov evgenabramov$ git branch -D 1-2-4
  221. Deleted branch 1-2-4 (was a7bc294).
  222. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout -b 1-2-4
  223. Switched to a new branch '1-2-4'
  224. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout master
  225. Switched to branch 'master'
  226. Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
  227. (use "git pull" to update your local branch)
  228. MacBook-Pro-Evgenij:abramov evgenabramov$ git branch -D 1-2-4
  229. Deleted branch 1-2-4 (was 115005b).
  230. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout --track origin/1-2-4
  231. Branch '1-2-4' set up to track remote branch '1-2-4' from 'origin'.
  232. Switched to a new branch '1-2-4'
  233. MacBook-Pro-Evgenij:abramov evgenabramov$ ls
  234. 1-2-4 README.md
  235. MacBook-Pro-Evgenij:abramov evgenabramov$ git log
  236. commit c3e8719a25d7a528fc43ac9a70128bd651ba04c3 (HEAD -> 1-2-4, origin/1-2-4)
  237. Author: Evgeny Abramov <abramod.ed@phystech.edu>
  238. Date: Fri Sep 21 00:47:14 2018 +0300
  239.  
  240. Решение задачи 2
  241.  
  242. commit df67afce76ef37aa43af9a78526b62a29d824654
  243. Author: Evgeny Abramov <abramod.ed@phystech.edu>
  244. Date: Thu Sep 20 22:09:59 2018 +0300
  245.  
  246. Решение задачи 2
  247.  
  248. commit 115005b259dbf3a63d0a088eef938f8b1244f0b7 (master)
  249. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  250. Date: Tue Sep 18 19:52:03 2018 +0000
  251.  
  252. Add .gitlab-ci.yml
  253.  
  254. commit 5a4b361c882b95dca8efc12402c96716c0896b30
  255. Author: Evgeny Shlykov <e.a.shlykov@gmail.com>
  256. Date: Mon Sep 17 21:12:14 2018 +0000
  257.  
  258. Add new file
  259. MacBook-Pro-Evgenij:abramov evgenabramov$ git add .
  260. MacBook-Pro-Evgenij:abramov evgenabramov$ git commit -m "Fixed codestyle"
  261. [1-2-4 9f91f2c] Fixed codestyle
  262. 1 file changed, 43 insertions(+), 31 deletions(-)
  263. rewrite 1-2-4/main.cpp (90%)
  264. MacBook-Pro-Evgenij:abramov evgenabramov$ git push
  265. Enumerating objects: 7, done.
  266. Counting objects: 100% (7/7), done.
  267. Delta compression using up to 12 threads.
  268. Compressing objects: 100% (3/3), done.
  269. Writing objects: 100% (4/4), 976 bytes | 976.00 KiB/s, done.
  270. Total 4 (delta 1), reused 0 (delta 0)
  271. remote:
  272. remote: View merge request for 1-2-4:
  273. remote: https://gitlab.com/diht824/abramov/merge_requests/1
  274. remote:
  275. To https://gitlab.com/diht824/abramov.git
  276. c3e8719..9f91f2c 1-2-4 -> 1-2-4
  277. MacBook-Pro-Evgenij:abramov evgenabramov$ git checkout master
  278. Switched to branch 'master'
  279. Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
  280. (use "git pull" to update your local branch)
  281. MacBook-Pro-Evgenij:abramov evgenabramov$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
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!