diff --git a/submission1.md b/submission1.md new file mode 100644 index 0000000..4796e52 --- /dev/null +++ b/submission1.md @@ -0,0 +1,33 @@ +## Summury on signed commits +The key point for using commit signature verification is to other people to know a person and a time when the commit was done. +On Github there's three ways to sign commit: GPG or SSH those used by individual users or S/MIME that more suitable for big companies. +Repository administrators can required commit signing on a branch to block unsigned commits. + +## Summary on merge types +#### Standart merge +Combines two branches by creating a merge commit. +###### Advantages: +- Provides descriptive and verbose history that helps to have better understanding about code changes +- Allows us to see a graph of when branches were made using `git log --oneline --graph` +- no loss of granularity +###### Disadvantages: +- Empty commits are created by merge operation can mess up the history a bit +- A graph can be too complex when we have a lot of branches +#### Squash & merge +Combines all commits from a feature branch into a single commit before merging. +###### Advantages: +- Keeps a very clean commit history +- Can look at a single commit to see a full piece of work, rather than shifting through multiple commits in the log +###### Disadvantages: +- Lost of granularity, any useful detail +#### Rebase & merge +Reapplies commits from a feature branch onto the base branch. +###### Advantages: +- Keeps a very clean commit history +- Keeps the individual commit granularity +###### Disadvantages: +- You have to rebase again if someone was to commit to the base branch before you get to merge +- Difficult to see which commits relate to which PR or branch + +#### Why standart merge +Standart merge is often preferred in collaborative environments by the reason that it keeps more detailed change history than others. It is suit more for larger teams. \ No newline at end of file diff --git a/submission5.md b/submission5.md new file mode 100644 index 0000000..4345f97 --- /dev/null +++ b/submission5.md @@ -0,0 +1,46 @@ +## Task 1.1 + +Before I was able to use htop I had to + +Update my Ubuntu system, run: `sudo apt update && sudo apt upgrade` + + +Install htop on Ubuntu using apt: `sudo apt install htop` + + +To install the latest version of htop on Ubuntu Linux: `snap install htop` + + +I took an hour T.T + + +After all I finaly use `htop` command and get this +![Screenshot from 2024-09-17 15-14-04](https://github.com/user-attachments/assets/cce5aea9-2007-4695-8d99-2791c6335b83) +Before I was able to use `iostat` I had to + + +`sudo apt-get install sysstat` + + +and get this +![Screenshot from 2024-09-17 15-17-03](https://github.com/user-attachments/assets/98a12586-5a8b-4b0f-baa4-ef23c8fd18b3) + +So, because I have a new virtual machine I can identify and document only top 2 most consuming applications for CPU, memory, and I/O usage: firefox and terminal + +### 1.2 +I used `du -h /var | sort -rh | head -n 3` command and get this output: +``` +4,2G /var + +3,5G /var/lib + +3,2G /var/lib/snapd +``` +Input `df -h /var` give me this output: +``` +Filesystem Size Used Avail Use% Mounted on + +/dev/sda3 24G 14G 9,2G 60% / + +``` + diff --git a/submission8.md b/submission8.md new file mode 100644 index 0000000..8e09dea --- /dev/null +++ b/submission8.md @@ -0,0 +1,41 @@ +## Task 1 + +### 1 +![image](https://github.com/user-attachments/assets/c9c16654-f6fb-41d6-93ad-0aa817abe2fc) + +### 2 +![image](https://github.com/user-attachments/assets/3a3aa9bc-af79-42dd-8fc9-6cf6ded4aad2) + +### 3 +![image](https://github.com/user-attachments/assets/c8d976f7-8a09-4c49-87ed-6850107de5c4) + +### 4 +![image](https://github.com/user-attachments/assets/0ada3b32-66c2-4faf-b849-e36bd9909161) + +## Task 2 + +### 1 +![image](https://github.com/user-attachments/assets/c179f39e-c3e5-46a8-9ab2-24b1f74f1a2e) + +### 2 +![image](https://github.com/user-attachments/assets/3ee99e1f-3ac5-4852-a557-c687a93c6123) + +### 3 +![image](https://github.com/user-attachments/assets/8c7f9f1e-dea9-4ee7-b12f-20e46e21825d) + +### 4 + +sha256:36efe5a3f9e81406839d54a936b13019515e580c3814577dfa235f34f173a44b + +### 5 +![image](https://github.com/user-attachments/assets/5b87563c-f8fe-46e8-b5fd-cb7a3963522f) + +### 6 +624d681c74f49564a46e509acc7e2a1fd7e7b23c1ff7bcff0691f0fc88061136 + +### 7 +![image](https://github.com/user-attachments/assets/6920ae7c-22ca-4f4a-8936-49780e47bfb1) + +### 8 +![image](https://github.com/user-attachments/assets/b00fa782-5ab5-4444-aa77-c2d103c3659d) +This command shows me added files and directories