Advertisement
Guest User

git log

a guest
Jan 12th, 2019
168
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.46 KB | None | 0 0
  1. kc@kc-VirtualBox:~/lab6$ git log --pretty
  2. commit e70baec4ba95fccaa4ddb7137aa529255bdd0c2e (HEAD -> karol, np/master, master)
  3. Author: kcieslewicz <karcie003@utp.edu.pl>
  4. Date: Fri Jan 11 19:25:00 2019 +0100
  5.  
  6. zmiana master do merga
  7.  
  8. commit 962e7d65488f15d29b2f035ec177e8ef6dcf1a10 (origin/master)
  9. Merge: 50d6bca df78218
  10. Author: kcieslewicz <karcie003@utp.edu.pl>
  11. Date: Fri Jan 11 17:56:45 2019 +0100
  12.  
  13. mozliwe rozwiazanie konfliktu
  14.  
  15. commit 50d6bca35434fa4824a01f11fecb4285ce6bf87f
  16. Author: kcieslewicz <karcie003@utp.edu.pl>
  17. Date: Fri Jan 11 17:46:34 2019 +0100
  18.  
  19. main konflikt na master
  20.  
  21. commit df78218a55c8e1075d2788d9b938d6c1867d37e6 (origin/karol, np/karol)
  22. Author: kcieslewicz <karcie003@utp.edu.pl>
  23. Date: Fri Jan 11 17:41:47 2019 +0100
  24.  
  25. main konflikt działający
  26.  
  27. commit 89dfb3641ff9178c211d0fdcb7334a3df35d6997
  28. Author: kcieslewicz <karcie003@utp.edu.pl>
  29. Date: Fri Jan 11 17:29:41 2019 +0100
  30.  
  31. main do konfliktu
  32.  
  33. commit 369c5ae2798dd1745d6b5994835b0b1d0ab33ac9
  34. Author: kcieslewicz <karcie003@utp.edu.pl>
  35. Date: Fri Jan 11 17:16:12 2019 +0100
  36.  
  37. main zmiana do konfliktu
  38.  
  39. commit 20eedd0516e864e8fba7c537b9fa0170714e5afa
  40. Author: kcieslewicz <karcie003@utp.edu.pl>
  41. Date: Fri Jan 11 16:23:57 2019 +0100
  42.  
  43. main + funkcja
  44.  
  45. commit a92244bacb7f3fecd721e7a5f98a9395d8f11859
  46. Author: kcieslewicz <karcie003@utp.edu.pl>
  47. Date: Fri Jan 11 16:19:57 2019 +0100
  48.  
  49. head
  50.  
  51. commit c5a3f328a11dccf8c0e111be9919952a640c7566
  52. Author: kcieslewicz <karcie003@utp.edu.pl>
  53. Date: Fri Jan 11 16:07:40 2019 +0100
  54.  
  55. full even
  56.  
  57. commit ef9d1ba5988acbccab55f3c419f3e692c4109d30
  58. Author: kcieslewicz <karcie003@utp.edu.pl>
  59. Date: Fri Jan 11 16:05:51 2019 +0100
  60.  
  61. full even
  62.  
  63. commit 9af428b2f6cd415e252ae80415e3d5b671d909f9
  64. Author: kcieslewicz <karcie003@utp.edu.pl>
  65. Date: Fri Jan 11 16:03:28 2019 +0100
  66.  
  67. even
  68.  
  69. commit e8b40536bb81108c718fde2b9d3b642eea8f55fe
  70. Author: kcieslewicz <karcie003@utp.edu.pl>
  71. Date: Fri Jan 11 16:01:16 2019 +0100
  72.  
  73. modulo->even
  74.  
  75. commit bfa2f58bc90926b0754eac3948f98b5aac1b7fe8
  76. Author: kcieslewicz <karcie003@utp.edu.pl>
  77. Date: Fri Jan 11 15:50:09 2019 +0100
  78.  
  79. modulo
  80.  
  81. commit b7bee8aa25d6e204b0f5e4bcd4ee54e077c1deb1
  82. Author: kcieslewicz <karcie003@utp.edu.pl>
  83. Date: Thu Jan 3 17:32:02 2019 +0100
  84.  
  85. second commit
  86.  
  87. commit 320a9e4a6c843ce5a73b6e53821bff767940ca09
  88. Author: kcieslewicz <karcie003@utp.edu.pl>
  89. Date: Thu Jan 3 16:49:04 2019 +0100
  90.  
  91. first commit
  92. (END)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement