API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Apr 19th, 2017
645
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 19.54 KB | None | 0 0
raw download clone embed print report
  1. vanmaren@vanmaren-VirtualBox:~/my_repo$ git clone https://github.com/vanmaren/cal_2com
  2. Clonar en «cal_2com»...
  3. remote: Counting objects: 7, done.
  4. remote: Total 7 (delta 0), reused 0 (delta 0), pack-reused 7
  5. Unpacking objects: 100% (7/7), done.
  6. Comprobando la conectividad… hecho.
  7. vanmaren@vanmaren-VirtualBox:~/my_repo$ ls
  8. cal_2com calculator.html README.md
  9. vanmaren@vanmaren-VirtualBox:~/my_repo$ cd cal_2com/
  10. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ ls
  11. calculator.html LICENSE README.md
  12. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ nano calculator.html
  13. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ diff calculator.html
  14. diff: falta un operando después de 'calculator.html'
  15. diff: Pruebe 'diff --help' para más información.
  16. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ gut status
  17. No se ha encontrado la orden «gut», quizás quiso decir:
  18. La orden «cut» del paquete «coreutils» (main)
  19. La orden «gmt» del paquete «gmt» (universe)
  20. La orden «gpt» del paquete «gpt» (universe)
  21. La orden «git» del paquete «git» (main)
  22. La orden «gout» del paquete «scotch» (universe)
  23. La orden «gst» del paquete «gnu-smalltalk» (universe)
  24. La orden «gt» del paquete «genometools» (universe)
  25. gut: no se encontró la orden
  26. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git status
  27. En la rama master
  28. Su rama está actualizada con «origin/master».
  29. Cambios no preparados para el commit:
  30. (use «git add <archivo>...» para actualizar lo que se confirmará)
  31. (use «git checkout -- <archivo>...» para descartar cambios en el directorio de trabajo)
  32.  
  33. modificado: calculator.html
  34.  
  35. no hay cambios agregados al commit (use «git add» o «git commit -a»)
  36. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git lg
  37. git: «lg» no es una orden de git. Vea «git --help»
  38.  
  39. ¿Se refiere a este?
  40. log
  41. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log
  42. commit b0e63ad0a57510d65814ac8ff98c7eb16bf359c1
  43. Author: Juan Quemada <jquemada@dit.upm.es>
  44. Date: Tue Feb 14 19:23:10 2017 +0100
  45.  
  46. x^2 button
  47.  
  48. commit 1096247078156a7fb1726d567d4345070d5eb5f0
  49. Author: Juan Quemada <jquemada@dit.upm.es>
  50. Date: Tue Feb 14 18:53:39 2017 +0100
  51.  
  52. Readme & License
  53. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git add .
  54. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log
  55. commit b0e63ad0a57510d65814ac8ff98c7eb16bf359c1
  56. Author: Juan Quemada <jquemada@dit.upm.es>
  57. Date: Tue Feb 14 19:23:10 2017 +0100
  58.  
  59. x^2 button
  60.  
  61. commit 1096247078156a7fb1726d567d4345070d5eb5f0
  62. Author: Juan Quemada <jquemada@dit.upm.es>
  63. Date: Tue Feb 14 18:53:39 2017 +0100
  64.  
  65. Readme & License
  66. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log
  67. commit b0e63ad0a57510d65814ac8ff98c7eb16bf359c1
  68. Author: Juan Quemada <jquemada@dit.upm.es>
  69. Date: Tue Feb 14 19:23:10 2017 +0100
  70.  
  71. x^2 button
  72.  
  73. commit 1096247078156a7fb1726d567d4345070d5eb5f0
  74. Author: Juan Quemada <jquemada@dit.upm.es>
  75. Date: Tue Feb 14 18:53:39 2017 +0100
  76.  
  77. Readme & License
  78. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git status
  79. En la rama master
  80. Su rama está actualizada con «origin/master».
  81. Cambios para hacer commit:
  82. (use «git reset HEAD <archivo>...» para sacar del stage)
  83.  
  84. modificado: calculator.html
  85.  
  86. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git commit -m "Calculadora: Autores"
  87. [master e0d18f0] Calculadora: Autores
  88. 1 file changed, 1 insertion(+)
  89. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log **oneline
  90. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --oneline
  91. e0d18f0 Calculadora: Autores
  92. b0e63ad x^2 button
  93. 1096247 Readme & License
  94. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch
  95. * master
  96. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git remote -v
  97. origin https://github.com/vanmaren/cal_2com (fetch)
  98. origin https://github.com/vanmaren/cal_2com (push)
  99. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch -a -vv
  100. * master e0d18f0 [origin/master: ahead 1] Calculadora: Autores
  101. remotes/origin/HEAD -> origin/master
  102. remotes/origin/master b0e63ad x^2 button
  103. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git fetch hhtps://github.com/jquemada/cal_branches inverse:inverse
  104. fatal: Unable to find remote helper for 'hhtps'
  105. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git fetch https://github.com/jquemada/cal_branches inverse:inverse
  106. remote: Counting objects: 3, done.
  107. remote: Compressing objects: 100% (3/3), done.
  108. remote: Total 3 (delta 0), reused 1 (delta 0), pack-reused 0
  109. Unpacking objects: 100% (3/3), done.
  110. De https://github.com/jquemada/cal_branches
  111. * [new branch] inverse -> inverse
  112. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --onelinee0d18f0 Calculadora: Autores
  113. b0e63ad x^2 button
  114. 1096247 Readme & License
  115. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch -a -vv inverse e868dc4 1/x button
  116. * master e0d18f0 [origin/master: ahead 1] Calculadora: Autores
  117. remotes/origin/HEAD -> origin/master
  118. remotes/origin/master b0e63ad x^2 button
  119. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git merge -m "Integrar inverse" inverse
  120. Automezclado calculator.html
  121. CONFLICTO(añadir/añadir): conflicto de fusión en calculator.html
  122. Automatic merge failed; fix conflicts and then commit the result.
  123. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ ls
  124. calculator.html LICENSE README.md
  125. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ diff calculator.html
  126. diff: falta un operando después de 'calculator.html'
  127. diff: Pruebe 'diff --help' para más información.
  128. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git diff c
  129. fatal: ambiguous argument 'c': unknown revision or path not in the working tree.
  130. Use '--' to separate paths from revisions, like this:
  131. 'git <command> [<revision>...] -- [<file>...]'
  132. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git diff calculator.html
  133. diff --cc calculator.html
  134. index 7aec492,fc74320..0000000
  135. --- a/calculator.html
  136. +++ b/calculator.html
  137. @@@ -2,17 -2,16 +2,30 @@@
  138. <title>Calculator</title><meta charset="utf-8">
  139. <script type="text/javascript">
  140.  
  141. ++<<<<<<< HEAD
  142. +function square() {
  143. + var num = document.getElementById("n1");
  144. + num.value = num.value * num.value;
  145. ++=======
  146. + function inverse() {
  147. + var num = document.getElementById("n1");
  148. + num.value = 1/num.value;
  149. ++>>>>>>> inverse
  150. }
  151. </script>
  152. </head>
  153. <body>
  154. ++<<<<<<< HEAD
  155. +<h1>ENRIQUE VAÑÓ MARTINEZ ESTER VICARIO BRAVO</h1>
  156. + Number:
  157. + <input type="text" id="n1"><p>
  158. +
  159. + <button onclick="square()"> x<sup>2</sup> </button>
  160. ++=======
  161. + Number:
  162. + <input type="text" id="n1"><p>
  163. +
  164. + <button onclick="inverse()"> 1/x </button>
  165. ++>>>>>>> inverse
  166. </body>
  167. </html>
  168. ^X
  169. [3]+ Detenido git diff calculator.html
  170. ^C^C
  171. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ nano calculator.html
  172. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --oneline
  173. e0d18f0 Calculadora: Autores
  174. b0e63ad x^2 button
  175. 1096247 Readme & License
  176. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch -a -vv
  177. inverse e868dc4 1/x button
  178. * master e0d18f0 [origin/master: ahead 1] Calculadora: Autores
  179. remotes/origin/HEAD -> origin/master
  180. remotes/origin/master b0e63ad x^2 button
  181. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git status -s
  182. AA calculator.html
  183. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ nano
  184. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ nano calculator.html
  185. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ nano calculator.html
  186. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ nano calculator.html
  187. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git diff
  188. diff --cc calculator.html
  189. index 7aec492,fc74320..0000000
  190. --- a/calculator.html
  191. +++ b/calculator.html
  192. @@@ -2,10 -2,10 +2,16 @@@
  193. <title>Calculator</title><meta charset="utf-8">
  194. <script type="text/javascript">
  195.  
  196. ++<head>
  197. +function square() {
  198. + var num = document.getElementById("n1");
  199. + num.value = num.value * num.value;
  200. +}
  201. ++
  202. + function inverse() {
  203. + var num = document.getElementById("n1");
  204. + num.value = 1/num.value;
  205. + }
  206. </script>
  207. </head>
  208. <body>
  209. @@@ -13,6 -12,6 +19,7 @@@
  210. Number:
  211. <input type="text" id="n1"><p>
  212.  
  213. + <button onclick="square()"> x<sup>2</sup> </button>
  214. + <button onclick="inverse()"> 1/x </button>
  215. </body>
  216. </html>
  217. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$
  218. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ cd
  219. vanmaren@vanmaren-VirtualBox:~$ ls
  220. Descargas Escritorio Imágenes my_repo Público
  221. Documentos examples.desktop Música Plantillas Vídeos
  222. vanmaren@vanmaren-VirtualBox:~$ cd my_repo/
  223. vanmaren@vanmaren-VirtualBox:~/my_repo$ s
  224. s: no se encontró la orden
  225. vanmaren@vanmaren-VirtualBox:~/my_repo$ ls
  226. cal_2com calculator.html README.md
  227. vanmaren@vanmaren-VirtualBox:~/my_repo$ cd c
  228. bash: cd: c: No existe el archivo o el directorio
  229. vanmaren@vanmaren-VirtualBox:~/my_repo$ cd cal_2com/
  230. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ cd ..
  231. vanmaren@vanmaren-VirtualBox:~/my_repo$ nano cal
  232. vanmaren@vanmaren-VirtualBox:~/my_repo$ nano cal
  233. cal_2com/ calculator.html
  234. vanmaren@vanmaren-VirtualBox:~/my_repo$ ls
  235. cal_2com calculator.html README.md
  236. vanmaren@vanmaren-VirtualBox:~/my_repo$ nano calculator.html
  237. vanmaren@vanmaren-VirtualBox:~/my_repo$ cd cal_2com/
  238. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ nano calculator.html
  239. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch
  240. inverse
  241. * master
  242. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --oneline
  243. e0d18f0 Calculadora: Autores
  244. b0e63ad x^2 button
  245. 1096247 Readme & License
  246. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git status
  247. En la rama master
  248. Su rama está delante de «origin/master» para 1 commit.
  249. (use "git push" to publish your local commits)
  250. Tiene rutas sin fusionar.
  251. (solucione los conflictos y ejecute «git commit»)
  252.  
  253. Rutas no combinadas:
  254. (use «git add <archivo>...» para marcar resolución)
  255.  
  256. añadido por ambos: calculator.html
  257.  
  258. no hay cambios agregados al commit (use «git add» o «git commit -a»)
  259. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git status -s
  260. AA calculator.html
  261. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git commit -m "Integrar inverse"
  262. U calculator.html
  263. error: commit is not possible because you have unmerged files.
  264. consejo: Fix them up in the work tree, and then use 'git add/rm <file>'
  265. consejo: as appropriate to mark resolution and make a commit.
  266. fatal: Exiting because of an unresolved conflict.
  267. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git diff
  268. diff --cc calculator.html
  269. index 7aec492,fc74320..0000000
  270. --- a/calculator.html
  271. +++ b/calculator.html
  272. @@@ -2,10 -2,10 +2,15 @@@
  273. <title>Calculator</title><meta charset="utf-8">
  274. <script type="text/javascript">
  275.  
  276. +function square() {
  277. + var num = document.getElementById("n1");
  278. + num.value = num.value * num.value;
  279. +}
  280. ++
  281. + function inverse() {
  282. + var num = document.getElementById("n1");
  283. + num.value = 1/num.value;
  284. + }
  285. </script>
  286. </head>
  287. <body>
  288. @@@ -13,6 -12,6 +18,7 @@@
  289. Number:
  290. <input type="text" id="n1"><p>
  291.  
  292. + <button onclick="square()"> x<sup>2</sup> </button>
  293. + <button onclick="inverse()"> 1/x </button>
  294. </body>
  295. </html>
  296. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git commit -a -m "Integrar inverse"
  297. [master d3b697a] Integrar inverse
  298. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git status -s
  299. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --oneline
  300. d3b697a Integrar inverse
  301. e0d18f0 Calculadora: Autores
  302. e868dc4 1/x button
  303. b0e63ad x^2 button
  304. 1096247 Readme & License
  305. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch --all --graph
  306. error: unknown option `graph'
  307. uso: git branch [<options>] [-r | -a] [--merged | --no-merged]
  308. o: git branch [<options>] [-l] [-f] <branch-name> [<start-point>]
  309. o: git branch [<options>] [-r] (-d | -D) <branch-name>...
  310. o: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
  311. o: git branch [<options>] [-r | -a] [--points-at]
  312.  
  313. Opciones genéricas
  314. -v, --verbose show hash and subject, give twice for upstream branch
  315. -q, --quiet Eliminar mensajes informativos
  316. -t, --track set up tracking mode (see git-pull(1))
  317. --set-upstream change upstream info
  318. -u, --set-upstream-to <upstream>
  319. change the upstream info
  320. --unset-upstream Unset the upstream info
  321. --color[=<when>] usar salida coloreada
  322. -r, --remotes act on remote-tracking branches
  323. --contains <commit> print only branches that contain the commit
  324. --abbrev[=<n>] use <n> digits to display SHA-1s
  325.  
  326. Specific git-branch actions:
  327. -a, --all list both remote-tracking and local branches
  328. -d, --delete delete fully merged branch
  329. -D delete branch (even if not merged)
  330. -m, --move move/rename a branch and its reflog
  331. -M move/rename a branch, even if target exists
  332. --list listar los nombres de las ramas
  333. -l, --create-reflog create the branch's reflog
  334. --edit-description editar la descripción de la rama
  335. -f, --force force creation, move/rename, deletion
  336. --merged <commit> print only branches that are merged
  337. --no-merged <commit> print only branches that are not merged
  338. --column[=<style>] listar las ramas en columnas
  339. --sort <key> field name to sort on
  340. --points-at <object> print only branches of the object
  341.  
  342. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch --graph
  343. error: unknown option `graph'
  344. uso: git branch [<options>] [-r | -a] [--merged | --no-merged]
  345. o: git branch [<options>] [-l] [-f] <branch-name> [<start-point>]
  346. o: git branch [<options>] [-r] (-d | -D) <branch-name>...
  347. o: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
  348. o: git branch [<options>] [-r | -a] [--points-at]
  349.  
  350. Opciones genéricas
  351. -v, --verbose show hash and subject, give twice for upstream branch
  352. -q, --quiet Eliminar mensajes informativos
  353. -t, --track set up tracking mode (see git-pull(1))
  354. --set-upstream change upstream info
  355. -u, --set-upstream-to <upstream>
  356. change the upstream info
  357. --unset-upstream Unset the upstream info
  358. --color[=<when>] usar salida coloreada
  359. -r, --remotes act on remote-tracking branches
  360. --contains <commit> print only branches that contain the commit
  361. --abbrev[=<n>] use <n> digits to display SHA-1s
  362.  
  363. Specific git-branch actions:
  364. -a, --all list both remote-tracking and local branches
  365. -d, --delete delete fully merged branch
  366. -D delete branch (even if not merged)
  367. -m, --move move/rename a branch and its reflog
  368. -M move/rename a branch, even if target exists
  369. --list listar los nombres de las ramas
  370. -l, --create-reflog create the branch's reflog
  371. --edit-description editar la descripción de la rama
  372. -f, --force force creation, move/rename, deletion
  373. --merged <commit> print only branches that are merged
  374. --no-merged <commit> print only branches that are not merged
  375. --column[=<style>] listar las ramas en columnas
  376. --sort <key> field name to sort on
  377. --points-at <object> print only branches of the object
  378.  
  379. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --graph
  380. * commit d3b697a44e9754db24d2d6979014e52b993a7f11
  381. |\ Merge: e0d18f0 e868dc4
  382. | | Author: vanmaren <vanmaren81@gmail.com>
  383. | | Date: Mon Apr 10 13:19:27 2017 +0200
  384. | |
  385. | | Integrar inverse
  386. | |
  387. | * commit e868dc46711f323fc5b9eb568e117446fc90b03a
  388. | | Author: Juan Quemada <jquemada@dit.upm.es>
  389. | | Date: Tue Feb 14 22:38:24 2017 +0100
  390. | |
  391. | | 1/x button
  392. | |
  393. * | commit e0d18f007758f024fb2c80ed8b2ff292c571105f
  394. | | Author: vanmaren <vanmaren81@gmail.com>
  395. | | Date: Wed Apr 5 13:23:04 2017 +0200
  396. | |
  397. | | Calculadora: Autores
  398. | |
  399. * | commit b0e63ad0a57510d65814ac8ff98c7eb16bf359c1
  400. |/ Author: Juan Quemada <jquemada@dit.upm.es>
  401. | Date: Tue Feb 14 19:23:10 2017 +0100
  402. |
  403. | x^2 button
  404. |
  405. * commit 1096247078156a7fb1726d567d4345070d5eb5f0
  406. Author: Juan Quemada <jquemada@dit.upm.es>
  407. Date: Tue Feb 14 18:53:39 2017 +0100
  408.  
  409. Readme & License
  410. ^X
  411. [4]+ Detenido git log --graph
  412.  
  413.  
  414. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --graph -s
  415. * commit d3b697a44e9754db24d2d6979014e52b993a7f11
  416. |\ Merge: e0d18f0 e868dc4
  417. | | Author: vanmaren <vanmaren81@gmail.com>
  418. | | Date: Mon Apr 10 13:19:27 2017 +0200
  419. | |
  420. | | Integrar inverse
  421. | |
  422. | * commit e868dc46711f323fc5b9eb568e117446fc90b03a
  423. | | Author: Juan Quemada <jquemada@dit.upm.es>
  424. | | Date: Tue Feb 14 22:38:24 2017 +0100
  425. | |
  426. | | 1/x button
  427. | |
  428. * | commit e0d18f007758f024fb2c80ed8b2ff292c571105f
  429. | | Author: vanmaren <vanmaren81@gmail.com>
  430. | | Date: Wed Apr 5 13:23:04 2017 +0200
  431. | |
  432. | | Calculadora: Autores
  433. | |
  434. * | commit b0e63ad0a57510d65814ac8ff98c7eb16bf359c1
  435. |/ Author: Juan Quemada <jquemada@dit.upm.es>
  436. | Date: Tue Feb 14 19:23:10 2017 +0100
  437. |
  438. | x^2 button
  439. |
  440. * commit 1096247078156a7fb1726d567d4345070d5eb5f0
  441. Author: Juan Quemada <jquemada@dit.upm.es>
  442. Date: Tue Feb 14 18:53:39 2017 +0100
  443.  
  444. Readme & License
  445. (END)
  446. [5]+ Detenido git log --graph -s
  447.  
  448.  
  449. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch
  450. inverse
  451. * master
  452. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --oneline --graph
  453. * d3b697a Integrar inverse
  454. |\
  455. | * e868dc4 1/x button
  456. * | e0d18f0 Calculadora: Autores
  457. * | b0e63ad x^2 button
  458. |/
  459. * 1096247 Readme & License
  460. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git merge inverse
  461. Already up-to-date.
  462. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch
  463. inverse
  464. * master
  465. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git log --graph
  466. * commit d3b697a44e9754db24d2d6979014e52b993a7f11
  467. |\ Merge: e0d18f0 e868dc4
  468. | | Author: vanmaren <vanmaren81@gmail.com>
  469. | | Date: Mon Apr 10 13:19:27 2017 +0200
  470. | |
  471. | | Integrar inverse
  472. | |
  473. | * commit e868dc46711f323fc5b9eb568e117446fc90b03a
  474. | | Author: Juan Quemada <jquemada@dit.upm.es>
  475. | | Date: Tue Feb 14 22:38:24 2017 +0100
  476. | |
  477. | | 1/x button
  478. | |
  479. * | commit e0d18f007758f024fb2c80ed8b2ff292c571105f
  480. | | Author: vanmaren <vanmaren81@gmail.com>
  481. | | Date: Wed Apr 5 13:23:04 2017 +0200
  482. | |
  483. | | Calculadora: Autores
  484. | |
  485. * | commit b0e63ad0a57510d65814ac8ff98c7eb16bf359c1
  486. |/ Author: Juan Quemada <jquemada@dit.upm.es>
  487. | Date: Tue Feb 14 19:23:10 2017 +0100
  488. |
  489. | x^2 button
  490. |
  491. * commit 1096247078156a7fb1726d567d4345070d5eb5f0
  492. Author: Juan Quemada <jquemada@dit.upm.es>
  493. Date: Tue Feb 14 18:53:39 2017 +0100
  494.  
  495. Readme & License
  496. (END)
  497. [6]+ Detenido git log --graph
  498.  
  499.  
  500. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git branch
  501. inverse
  502. * master
  503. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$ git push --all
  504. Username for 'https://github.com': vanmaren
  505. Password for 'https://vanmaren@github.com':
  506. Counting objects: 9, done.
  507. Compressing objects: 100% (9/9), done.
  508. Writing objects: 100% (9/9), 926 bytes | 0 bytes/s, done.
  509. Total 9 (delta 6), reused 0 (delta 0)
  510. remote: Resolving deltas: 100% (6/6), completed with 2 local objects.
  511. To https://github.com/vanmaren/cal_2com
  512. b0e63ad..d3b697a master -> master
  513. * [new branch] inverse -> inverse
  514. vanmaren@vanmaren-VirtualBox:~/my_repo/cal_2com$
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!