chrisluiz16

Day 4 GIT

Jul 8th, 2023
86
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 10.03 KB | None | 0 0
  1.  
  2.  
  3.  
  4. ----------------------------------- Tasks -------------------------------------
  5.  
  6.  
  7. [ec2-user@ip-172-31-10-148 git-project]$ git log
  8. commit 2dac4a98a7ea0159b2b2f6c40bad8cd94e45bd7e (HEAD -> mariadb)
  9. Author: chrisluiz <luizchris23@gmail.com>
  10. Date:   Sat Jul 8 16:34:42 2023 +0000
  11.  
  12.     mysql seperate partiiton added
  13.  
  14. commit 6c48a0c385f5f197b73bd68f83d6ae40dcb04916
  15. Author: chrisluiz <luizchris23@gmail.com>
  16. Date:   Sat Jul 8 16:29:28 2023 +0000
  17.  
  18.     mysql root passwd changed
  19.  
  20. commit 49a968a6037c0b4783c8a7e15b55d3a8ad497cdb (main)
  21. Author: chrisluiz <luizchris23@gmail.com>
  22. Date:   Sat Jul 8 16:25:55 2023 +0000
  23.  
  24.     virtualhostconf.tmpl 8080 added
  25.  
  26. commit 521405e4d16e50f369df831e3d801883c9ba01bf
  27. Author: chrisluiz <luizchris23@gmail.com>
  28. Date:   Sat Jul 8 16:11:28 2023 +0000
  29.  
  30.     Adding httpd.conf.tmpl
  31.  
  32. commit 0588a4135f695196fae354ff700d00163d882ead
  33. Author: chrisluiz <luizchris23@gmail.com>
  34. Date:   Sat Jul 8 16:07:51 2023 +0000
  35.  
  36.     php support added
  37.  
  38. commit abc24d855287b574afd753f1dd0e2b1e6df728aa
  39. Author: EC2 Default User <ec2-user@ip-172-31-10-148.ap-south-1.compute.internal>
  40. Date:   Sat Jul 8 16:04:20 2023 +0000
  41.  
  42.  
  43.  
  44. ### Creating a new branch new-master to copy ####
  45.  
  46. [ec2-user@ip-172-31-10-148 .git]$ git branch new-master
  47. Switched to branch 'new-master'
  48. [ec2-user@ip-172-31-10-148 git-project]$ git merge mariadb
  49. Updating 49a968a..2dac4a9
  50. Fast-forward
  51.  main.yml      | 24 ++++++++++++++++++++++++
  52.  variables.yml |  1 +
  53.  2 files changed, 25 insertions(+)
  54.  
  55.  
  56. ##### Merging Maridb to master ####
  57.  
  58.  
  59.  
  60. [ec2-user@ip-172-31-10-148 git-project]$ git switch main
  61. Switched to branch 'main'
  62. [ec2-user@ip-172-31-10-148 git-project]$
  63. [ec2-user@ip-172-31-10-148 git-project]$ git branch -D  new-master
  64. Deleted branch new-master (was 2dac4a9).
  65. [ec2-user@ip-172-31-10-148 git-project]$ git branch -v
  66.   main    49a968a virtualhostconf.tmpl 8080 added
  67. * mariadb 2dac4a9 mysql seperate partiiton added
  68.  
  69. [ec2-user@ip-172-31-10-148 git-project]$
  70. [ec2-user@ip-172-31-10-148 git-project]$
  71. [ec2-user@ip-172-31-10-148 git-project]$ git merge mariadb
  72. Updating 49a968a..2dac4a9
  73. Fast-forward
  74.  main.yml      | 24 ++++++++++++++++++++++++
  75.  variables.yml |  1 +
  76.  2 files changed, 25 insertions(+)
  77.  
  78.  
  79. [ec2-user@ip-172-31-10-148 git-project]$ git log
  80. commit 2dac4a98a7ea0159b2b2f6c40bad8cd94e45bd7e (HEAD -> main, mariadb)
  81. Author: chrisluiz <luizchris23@gmail.com>
  82. Date:   Sat Jul 8 16:34:42 2023 +0000
  83.  
  84.     mysql seperate partiiton added
  85.  
  86. commit 6c48a0c385f5f197b73bd68f83d6ae40dcb04916
  87. Author: chrisluiz <luizchris23@gmail.com>
  88. Date:   Sat Jul 8 16:29:28 2023 +0000
  89.  
  90.     mysql root passwd changed
  91.  
  92. commit 49a968a6037c0b4783c8a7e15b55d3a8ad497cdb
  93. Author: chrisluiz <luizchris23@gmail.com>
  94. Date:   Sat Jul 8 16:25:55 2023 +0000
  95.  
  96.     virtualhostconf.tmpl 8080 added
  97.  
  98. commit 521405e4d16e50f369df831e3d801883c9ba01bf
  99. Author: chrisluiz <luizchris23@gmail.com>
  100. Date:   Sat Jul 8 16:11:28 2023 +0000
  101.  
  102.     Adding httpd.conf.tmpl
  103.  
  104. commit 0588a4135f695196fae354ff700d00163d882ead
  105. Author: chrisluiz <luizchris23@gmail.com>
  106. Date:   Sat Jul 8 16:07:51 2023 +0000
  107.  
  108.     php support added
  109.  
  110. commit abc24d855287b574afd753f1dd0e2b1e6df728aa
  111. Author: EC2 Default User <ec2-user@ip-172-31-10-148.ap-south-1.compute.internal>
  112. Date:   Sat Jul 8 16:04:20 2023 +0000
  113.  
  114.     apache webserver installed and restarted
  115.    
  116.    
  117.    
  118. ##### Git checkout ####
  119.  
  120.  
  121. [ec2-user@ip-172-31-10-148 git-project]$ git checkout -b mysql 49a968a6037c0b4783c8a7e15b55d3a8ad497cdb
  122. Switched to a new branch 'mysql'
  123.  
  124.  
  125. [[ec2-user@ip-172-31-10-148 git-project]$ git log
  126. commit 49a968a6037c0b4783c8a7e15b55d3a8ad497cdb (HEAD -> mysql)
  127. Author: chrisluiz <luizchris23@gmail.com>
  128. Date:   Sat Jul 8 16:25:55 2023 +0000
  129.  
  130.     virtualhostconf.tmpl 8080 added
  131.  
  132. commit 521405e4d16e50f369df831e3d801883c9ba01bf
  133. Author: chrisluiz <luizchris23@gmail.com>
  134. Date:   Sat Jul 8 16:11:28 2023 +0000
  135.  
  136.     Adding httpd.conf.tmpl
  137.  
  138. commit 0588a4135f695196fae354ff700d00163d882ead
  139. Author: chrisluiz <luizchris23@gmail.com>
  140. Date:   Sat Jul 8 16:07:51 2023 +0000
  141.  
  142.     php support added
  143.  
  144. commit abc24d855287b574afd753f1dd0e2b1e6df728aa
  145.  
  146.  
  147.  
  148. [ec2-user@ip-172-31-10-148 git-project]$ git status
  149. On branch mysql
  150. Changes not staged for commit:
  151.   (use "git add <file>..." to update what will be committed)
  152.   (use "git restore <file>..." to discard changes in working directory)
  153.         modified:   main.yml
  154.  
  155. no changes added to commit (use "git add" and/or "git commit -a")
  156. [ec2-user@ip-172-31-10-148 git-project]$
  157. [ec2-user@ip-172-31-10-148 git-project]$
  158. [ec2-user@ip-172-31-10-148 git-project]$ git add .
  159. [ec2-user@ip-172-31-10-148 git-project]$
  160. [ec2-user@ip-172-31-10-148 git-project]$ git commit -m "mysql installation"
  161. [mysql a22eac2] mysql installation
  162.  1 file changed, 5 insertions(+)
  163. [ec2-user@ip-172-31-10-148 git-project]$
  164. [ec2-user@ip-172-31-10-148 git-project]$
  165. [ec2-user@ip-172-31-10-148 git-project]$
  166. [ec2-user@ip-172-31-10-148 git-project]$ git log
  167. commit a22eac2b5dbd56cc1900711d424f37517fcfb767 (HEAD -> mysql)
  168. Author: chrisluiz <luizchris23@gmail.com>
  169. Date:   Sat Jul 8 17:11:11 2023 +0000
  170.  
  171.     mysql installation
  172.  
  173. commit 49a968a6037c0b4783c8a7e15b55d3a8ad497cdb
  174. Author: chrisluiz <luizchris23@gmail.com>
  175. Date:   Sat Jul 8 16:25:55 2023 +0000
  176.  
  177.     virtualhostconf.tmpl 8080 added
  178.  
  179. commit 521405e4d16e50f369df831e3d801883c9ba01bf
  180. Author: chrisluiz <luizchris23@gmail.com>
  181. Date:   Sat Jul 8 16:11:28 2023 +0000
  182.  
  183.     Adding httpd.conf.tmpl
  184.  
  185. commit 0588a4135f695196fae354ff700d00163d882ead
  186. Author: chrisluiz <luizchris23@gmail.com>
  187. Date:   Sat Jul 8 16:07:51 2023 +0000
  188.  
  189.     php support added
  190.  
  191. commit abc24d855287b574afd753f1dd0e2b1e6df728aa
  192. Author: EC2 Default User <ec2-user@ip-172-31-10-148.ap-south-1.compute.internal>
  193. Date:   Sat Jul 8 16:04:20 2023 +0000
  194.  
  195.     apache webserver installed and restarted
  196. [ec2-user@ip-172-31-10-148 git-project]$ git switch main
  197. Switched to branch 'main'
  198. [ec2-user@ip-172-31-10-148 git-project]$
  199. [ec2-user@ip-172-31-10-148 git-project]$ git log
  200. commit 2dac4a98a7ea0159b2b2f6c40bad8cd94e45bd7e (HEAD -> main, mariadb)
  201. Author: chrisluiz <luizchris23@gmail.com>
  202. Date:   Sat Jul 8 16:34:42 2023 +0000
  203.  
  204.     mysql seperate partiiton added
  205.  
  206. commit 6c48a0c385f5f197b73bd68f83d6ae40dcb04916
  207. Author: chrisluiz <luizchris23@gmail.com>
  208. Date:   Sat Jul 8 16:29:28 2023 +0000
  209.  
  210.     mysql root passwd changed
  211.  
  212. commit 49a968a6037c0b4783c8a7e15b55d3a8ad497cdb
  213. Author: chrisluiz <luizchris23@gmail.com>
  214. Date:   Sat Jul 8 16:25:55 2023 +0000
  215.  
  216.     virtualhostconf.tmpl 8080 added
  217.  
  218. commit 521405e4d16e50f369df831e3d801883c9ba01bf
  219. Author: chrisluiz <luizchris23@gmail.com>
  220. Date:   Sat Jul 8 16:11:28 2023 +0000
  221.  
  222.     Adding httpd.conf.tmpl
  223.  
  224. commit 0588a4135f695196fae354ff700d00163d882ead
  225. Author: chrisluiz <luizchris23@gmail.com>
  226. Date:   Sat Jul 8 16:07:51 2023 +0000
  227.  
  228.     php support added
  229.  
  230. commit abc24d855287b574afd753f1dd0e2b1e6df728aa
  231. Author: EC2 Default User <ec2-user@ip-172-31-10-148.ap-south-1.compute.internal>
  232. Date:   Sat Jul 8 16:04:20 2023 +0000
  233.  
  234.     apache webserver installed and restarted
  235.    
  236.  
  237.  
  238. #### new branch added ####
  239.  
  240.  
  241. [ec2-user@ip-172-31-10-148 git-project]$ git checkout -b oracle 0588a4135f695196fae354ff700d00163d882ead
  242. Switched to a new branch 'oracle'
  243.  
  244.  
  245. [ec2-user@ip-172-31-10-148 git-project]$ echo "oracle  support added" > oracle.txt
  246. [ec2-user@ip-172-31-10-148 git-project]$ git add .
  247. [ec2-user@ip-172-31-10-148 git-project]$ git commit -m "oracle file added"
  248. [oracle 3ed0227] oracle file added
  249.  1 file changed, 1 insertion(+)
  250.  create mode 100644 oracle.txt
  251.  
  252.  [ec2-user@ip-172-31-10-148 git-project]$ git log
  253. commit 3ed022786900b0f307a19c7cb5512e1ddf4f660e (HEAD -> oracle)
  254. Author: chrisluiz <luizchris23@gmail.com>
  255. Date:   Sat Jul 8 17:26:05 2023 +0000
  256.  
  257.     oracle file added
  258.  
  259. commit 0588a4135f695196fae354ff700d00163d882ead
  260. Author: chrisluiz <luizchris23@gmail.com>
  261. Date:   Sat Jul 8 16:07:51 2023 +0000
  262.  
  263.     php support added
  264.  
  265. commit abc24d855287b574afd753f1dd0e2b1e6df728aa
  266. Author: EC2 Default User <ec2-user@ip-172-31-10-148.ap-south-1.compute.internal>
  267. Date:   Sat Jul 8 16:04:20 2023 +0000
  268.  
  269.     apache webserver installed and restarted
  270. [ec2-user@ip-172-31-10-148 git-project]$
  271. [ec2-user@ip-172-31-10-148 git-project]$
  272.  
  273. [ec2-user@ip-172-31-10-148 git-project]$
  274. [ec2-user@ip-172-31-10-148 git-project]$ git log
  275. commit 3ed022786900b0f307a19c7cb5512e1ddf4f660e (HEAD -> oracle)
  276. Author: chrisluiz <luizchris23@gmail.com>
  277. Date:   Sat Jul 8 17:26:05 2023 +0000
  278.  
  279.     oracle file added
  280.  
  281. commit 0588a4135f695196fae354ff700d00163d882ead
  282. Author: chrisluiz <luizchris23@gmail.com>
  283. Date:   Sat Jul 8 16:07:51 2023 +0000
  284.  
  285.     php support added
  286.  
  287. commit abc24d855287b574afd753f1dd0e2b1e6df728aa
  288. Author: EC2 Default User <ec2-user@ip-172-31-10-148.ap-south-1.compute.internal>
  289. Date:   Sat Jul 8 16:04:20 2023 +0000
  290.  
  291.     apache webserver installed and restarted
  292. [ec2-user@ip-172-31-10-148 git-project]$ git switch main
  293. Switched to branch 'main'
  294. [ec2-user@ip-172-31-10-148 git-project]$
  295. [ec2-user@ip-172-31-10-148 git-project]$
  296. [ec2-user@ip-172-31-10-148 git-project]$ git log
  297. commit 2dac4a98a7ea0159b2b2f6c40bad8cd94e45bd7e (HEAD -> main, mariadb)
  298. Author: chrisluiz <luizchris23@gmail.com>
  299. Date:   Sat Jul 8 16:34:42 2023 +0000
  300.  
  301.     mysql seperate partiiton added
  302.  
  303. commit 6c48a0c385f5f197b73bd68f83d6ae40dcb04916
  304. Author: chrisluiz <luizchris23@gmail.com>
  305. Date:   Sat Jul 8 16:29:28 2023 +0000
  306.  
  307.     mysql root passwd changed
  308.  
  309. commit 49a968a6037c0b4783c8a7e15b55d3a8ad497cdb
  310. Author: chrisluiz <luizchris23@gmail.com>
  311. Date:   Sat Jul 8 16:25:55 2023 +0000
  312.  
  313.     virtualhostconf.tmpl 8080 added
  314.  
  315. commit 521405e4d16e50f369df831e3d801883c9ba01bf
  316. Author: chrisluiz <luizchris23@gmail.com>
  317. Date:   Sat Jul 8 16:11:28 2023 +0000
  318.  
  319.     Adding httpd.conf.tmpl
  320.  
  321. commit 0588a4135f695196fae354ff700d00163d882ead
  322. Author: chrisluiz <luizchris23@gmail.com>
  323. Date:   Sat Jul 8 16:07:51 2023 +0000
  324.  
  325.     php support added
  326.  
  327. commit abc24d855287b574afd753f1dd0e2b1e6df728aa
  328. Author: EC2 Default User <ec2-user@ip-172-31-10-148.ap-south-1.compute.internal>
  329. Date:   Sat Jul 8 16:04:20 2023 +0000
  330.  
  331.     apache webserver installed and restarted
Advertisement
Add Comment
Please, Sign In to add comment