From 39b4f8d3078332dbb4b49aa8a602b26d2fb62ce4 Mon Sep 17 00:00:00 2001 From: mkshamir Date: Tue, 17 May 2022 14:16:05 +0300 Subject: [PATCH 1/8] making alterations --- 07_git_exercises/mkshamir_ex1/README.txt | 133 +++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 07_git_exercises/mkshamir_ex1/README.txt diff --git a/07_git_exercises/mkshamir_ex1/README.txt b/07_git_exercises/mkshamir_ex1/README.txt new file mode 100644 index 00000000..24b2192f --- /dev/null +++ b/07_git_exercises/mkshamir_ex1/README.txt @@ -0,0 +1,133 @@ +Git Basics +~~~~~~~~~~~~~~~ +#after creating a repo in GitHub I cloned it to a new proj in pycharm +1- git clone https://github.com/mkshamir/git_ex1 + git status + git add git_ex1 + +#after copying the file init.sh to my proj and running it +#I add the files to the index and commit +2- git add . + git commit -m "adding generated files" + +#after adding a file abc.txt and writing into it I add it to the index and commit +3+4- git status + git add abc.txt + git status + git commit "adding abc.txt" + git status + +5- cat abc.txt + +6- echo -e \n2 >> abc.txt + +7- git diff HEAD..main (or just git diff main) + +8- git diff --staged doesn't show anything because there are no added (staged) files since last I commited. + +9- git diff master gives an error because git syntax was changed from master to main. master is no longer recognized. + +10- git add abc.txt + +11- at this point git diff doesn't print anything because there are no changes made relative to the index after adding abc.txt + +12- git diff --cached or git diff --staged + +#after appending the line '3' to abc.txt +13+14- the commands 'git diff main' and 'git diff --staged' don't show the same thing. In the main branch the change +(line '3') is updated. +However, in the index that change has yet to be added. + +15- Using 'git status' it is shown that abc.txt has been modified. The file appears twice after running the command. +Once to indicate that there are changes to be committed. And once to indicate that said changes haven't been staged +to be committed. + +16- git restore --staged abc.txt + +17- git branch -a + bugfix/fix_readme_typo + bugfix/open_kibana_port + dev + feature/data_retention_policy + feature/elasticsearch_helm_chart + feature/upgrade_angular_version + feature/version1 + feature/version2 +* main + reset_question + + +18- git checkout -b mybranch + +19- git merge feature/version1 + +20- git merge feature/version2 +to enter the pycharm UI I entered: Git > resolve conflict > added all the changes(left and right) + +21- Using 'git status' it is shown that there are commits to be made. Firstly, app.py was modified and is ready +to be committed. Secondly abc.txt has been modified and has yet to be staged. And lastly main.py is listed as +an untracked file that needs to be added as well. + +22- touch take.txt + +23- git checkout main + +24- using 'git status' take.txt no longer appears as an unstaged file. this is a change that was made in a separate branch. + +preliminaries +~~~~~~~~~~~~~ + +git clone https://github.com/mkshamir/git_ex1 + +Git Basics +~~~~~~~~~~~ + +1- touch abc.txt + echo 1 >> abc.txt + cat abc.txt + git status + +2- red + +3- git add abc.txt + now the color is green + git status + git commit -m "adding and editing abc.txt" + now the color is white + git status + +4- echo 2 >> abc.txt + +5- now the color is green again + +6- git diff HEAD..main (or just git diff main) + +7- the change to abc.txt was made. but it wasn't added to the index, and it wasn't committed to the workingtree. + 'git diff --staged' shows the difference between the HEAD and the index. at this point there is no difference + so the command prints nothing. + +8- 'git diff staged2' prints an error for two reasons. firstly because there must be '--' before the name of the + index/commit we are comparing to, as a syntax convention. secondly because the path for a second staging act + between commits won't be called staged2 by default. the terminal doesn't recognize that name. + +9- git add abc.txt + git status + +10- 'git diff' prints all the merge conflicts. currently, there aren't any, so it prints nothing. + +11- git diff --staged main + +12- echo 3 >> abc.txt + cat abc.txt + git status + +13- 'git diff --staged' only shows +2 as the difference with HEAD, while 'git diff main' shows +2 and +3. + this is because both changes were made since last commit. but only +2 was added to the index. + +14- abc.txt shows up twice with 'git status' because there are both changes to be committed and to be staged. + +15- git restore --staged abc.txt + +resolve conflicts +~~~~~~~~~~~~~~~~~ + From fe5001504077886b9d88d688b279cbf21b5dbb13 Mon Sep 17 00:00:00 2001 From: mkshamir Date: Tue, 17 May 2022 14:18:02 +0300 Subject: [PATCH 2/8] making alterations --- 07_git_exercises/mkshamir_ex1/README.txt | 76 ------------------------ 1 file changed, 76 deletions(-) diff --git a/07_git_exercises/mkshamir_ex1/README.txt b/07_git_exercises/mkshamir_ex1/README.txt index 24b2192f..125ce885 100644 --- a/07_git_exercises/mkshamir_ex1/README.txt +++ b/07_git_exercises/mkshamir_ex1/README.txt @@ -1,79 +1,3 @@ -Git Basics -~~~~~~~~~~~~~~~ -#after creating a repo in GitHub I cloned it to a new proj in pycharm -1- git clone https://github.com/mkshamir/git_ex1 - git status - git add git_ex1 - -#after copying the file init.sh to my proj and running it -#I add the files to the index and commit -2- git add . - git commit -m "adding generated files" - -#after adding a file abc.txt and writing into it I add it to the index and commit -3+4- git status - git add abc.txt - git status - git commit "adding abc.txt" - git status - -5- cat abc.txt - -6- echo -e \n2 >> abc.txt - -7- git diff HEAD..main (or just git diff main) - -8- git diff --staged doesn't show anything because there are no added (staged) files since last I commited. - -9- git diff master gives an error because git syntax was changed from master to main. master is no longer recognized. - -10- git add abc.txt - -11- at this point git diff doesn't print anything because there are no changes made relative to the index after adding abc.txt - -12- git diff --cached or git diff --staged - -#after appending the line '3' to abc.txt -13+14- the commands 'git diff main' and 'git diff --staged' don't show the same thing. In the main branch the change -(line '3') is updated. -However, in the index that change has yet to be added. - -15- Using 'git status' it is shown that abc.txt has been modified. The file appears twice after running the command. -Once to indicate that there are changes to be committed. And once to indicate that said changes haven't been staged -to be committed. - -16- git restore --staged abc.txt - -17- git branch -a - bugfix/fix_readme_typo - bugfix/open_kibana_port - dev - feature/data_retention_policy - feature/elasticsearch_helm_chart - feature/upgrade_angular_version - feature/version1 - feature/version2 -* main - reset_question - - -18- git checkout -b mybranch - -19- git merge feature/version1 - -20- git merge feature/version2 -to enter the pycharm UI I entered: Git > resolve conflict > added all the changes(left and right) - -21- Using 'git status' it is shown that there are commits to be made. Firstly, app.py was modified and is ready -to be committed. Secondly abc.txt has been modified and has yet to be staged. And lastly main.py is listed as -an untracked file that needs to be added as well. - -22- touch take.txt - -23- git checkout main - -24- using 'git status' take.txt no longer appears as an unstaged file. this is a change that was made in a separate branch. - preliminaries ~~~~~~~~~~~~~ From 57df5224bd27504d51ec935c2f85890c4bae2ff6 Mon Sep 17 00:00:00 2001 From: mkshamir Date: Tue, 17 May 2022 14:18:45 +0300 Subject: [PATCH 3/8] deleting irrelevant text --- 06_linux_ex2/cert.pem | 0 06_linux_ex2/response.txt | 1 + 06_linux_ex2/serverVersion.txt | 0 06_linux_ex2/sessionID.txt | 0 4 files changed, 1 insertion(+) create mode 100644 06_linux_ex2/cert.pem create mode 100644 06_linux_ex2/response.txt create mode 100644 06_linux_ex2/serverVersion.txt create mode 100644 06_linux_ex2/sessionID.txt diff --git a/06_linux_ex2/cert.pem b/06_linux_ex2/cert.pem new file mode 100644 index 00000000..e69de29b diff --git a/06_linux_ex2/response.txt b/06_linux_ex2/response.txt new file mode 100644 index 00000000..f116b1d5 --- /dev/null +++ b/06_linux_ex2/response.txt @@ -0,0 +1 @@ +{"serverVersion": "3.2", "sessionID": "28f07da4-c213-4e41-8ade-bfe1c178fa09", "serverCert": "-----BEGIN CERTIFICATE-----\nMIIFcTCCA1mgAwIBAgIUUWl6ztFzDZo2t3ryVtQljDb4uMowDQYJKoZIhvcNAQEL\nBQAwSDELMAkGA1UEBhMCSUwxETAPBgNVBAgMCFRlbC1Bdml2MRgwFgYDVQQKDA9E\nDXZPcHNKYW4yMiBMdGQxDDAKBgNVBAMMA0JvYjAeFw0yMjAzMTExNDM4NDlaFw0y\nMzAzMTExNDM4NDlaMEgxCzAJBgNVBAYTAklMMREwDwYDVQQIDAhUZWwtQXZpdjEY\nMBYGA1UECgwPRGV2T3BzSmFuMjIgTHRkMQwwCgYDVQQDDANCb2IwggIiMA0GCSqG\nSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE8cWwZEm76PYms56y7pVuupYGaG7bB0qD\ntRbkOLkQ3lyRfczSqq5XnvmAGfBt5eumpA9pxRwfRg885lF1pMpzxXP13VFYls1h\nZhVH1G5Oo6QFiVigWkUC3aYwKF1sb7fdeL8nN76dXTt/J1SvyoQXMIi7GoD1hHuR\n4xpkYkDXsTqUksZzofX5YeLTaiYHGewvHHHJcDeOS6tYuljLeXhLIHqfUdTGUCaf\nnX4vXl+jQCzCJ7VMgalfS3KPxga2Jva31o66/oLfOW7q2PEXeIMz6pEjy+UWe7WS\nS49bhis2vJa7yb/eKGhakmyGsRWzTzPWF2bXttAopqkuir92SC1EHyVS/y9IZk3B\n0HeYw4aL1rVXluXZ15NWwLkVFL7CMPlG8D7w4ixqpqinH5qKeZbW3sP9hDaPh4Xj\nleie9yXEpzAKG+cwvdu0rDqoD/ZEos3DMljEKtAByELfCsINkJc6uP9AXTyYL+Fn\nRhAIiHGSx2M41HNOVsnFRuRGt/6l1Y9hwmAAaUMtE+e/l23ZDpPV7NzkSnKktKgE\nABfpqyw6Hp3VAKrcc6274iZb8c8l5oNOuZNy/YWB798BSwRJQd/AQ+TdCUm7Q9vv\nMFyflFq/kSyx7RXth0KG2KoK+1l8X27a3p1MIgbravlMx7kwd14q+AbOAdvt6wlq\nAfn7hk2VGQIDAQABo1MwUTAdBgNVHQ4EFgQURZ1LutzEIMtEzRMLHQMX66oYqlIw\nHwYDVR0jBBgwFoAURZ1LutzEIMtEzRMLHQMX66oYqlIwDwYDVR0TAQH/BAUwAwEB\n/zANBgkqhkiG9w0BAQsFAAOCAgEAfJ0jg/4DlCjppypOcu4jIeZ7lmP3eO9wMRbV\nNezGNVlQA9zmxwx+7Fa2kz2dAiZ62k6As7ri34BAfQyLp9fFzwwKiPiGVvU9uAaT\nm9IRum9GeE8U2EChw8NlxytCylmfe572a3tTsHGwqGoIt7owK/4acMLPQxpsRCyE\nju7R7nBbiwEf7Ntsu7LTQxmCqVnxG6SaYFI0Om79IbyKLxENb9niZ7a8OwSwQjKV\nwx4eCku78GSDpp1+Tjz7p/Qngc0LKX8+ab6sUtTRloVvmGXglIdlqGVCjT1j7POK\nsEEefsd/djBjEW4aPdCiuWix89dIVOFmG+kOzzLRFrdJFtt/t82vCpBbnoiOvq+C\nItGTS1BWcR08+TICZzEGHiLUB5Nz9KR6vcS4IqQ1NnUgOcPZTaQBJ3bGhXGsf1jL\nr9ghpkUtKClOn92796APW2KPcbzK2JoDks/xWoTKfIY91UMmFwxvPxVWpfuf49TB\nhRvkc2US336tgIyHmCA6RMYKXWhQD1wUMuCSVS6TDHzsyCCRxISDJodzSg/galdU\n6GeW4CGYE7LpUaIg7QiT2qwAW2ixt7pqyK0J0d9IM8rznGKWLHnQ9eRRnAUiYUBn\nccisKJ4lvKs4wE5pSNlOSs8RxrkmnfnOvetjFfZzLeIjcVGQPTlw3+0I1BEPRLEp\n/9DUjHE=\n-----END CERTIFICATE-----\n\n"} \ No newline at end of file diff --git a/06_linux_ex2/serverVersion.txt b/06_linux_ex2/serverVersion.txt new file mode 100644 index 00000000..e69de29b diff --git a/06_linux_ex2/sessionID.txt b/06_linux_ex2/sessionID.txt new file mode 100644 index 00000000..e69de29b From 47edfb11b6a853d5e45210e0b80690a05308ae12 Mon Sep 17 00:00:00 2001 From: mkshamir Date: Tue, 17 May 2022 14:18:45 +0300 Subject: [PATCH 4/8] deleting irrelevant text --- 06_linux_ex2/cert.pem | 0 06_linux_ex2/response.txt | 1 + 06_linux_ex2/serverVersion.txt | 0 06_linux_ex2/sessionID.txt | 0 4 files changed, 1 insertion(+) create mode 100644 06_linux_ex2/cert.pem create mode 100644 06_linux_ex2/response.txt create mode 100644 06_linux_ex2/serverVersion.txt create mode 100644 06_linux_ex2/sessionID.txt diff --git a/06_linux_ex2/cert.pem b/06_linux_ex2/cert.pem new file mode 100644 index 00000000..e69de29b diff --git a/06_linux_ex2/response.txt b/06_linux_ex2/response.txt new file mode 100644 index 00000000..f116b1d5 --- /dev/null +++ b/06_linux_ex2/response.txt @@ -0,0 +1 @@ +{"serverVersion": "3.2", "sessionID": "28f07da4-c213-4e41-8ade-bfe1c178fa09", "serverCert": "-----BEGIN CERTIFICATE-----\nMIIFcTCCA1mgAwIBAgIUUWl6ztFzDZo2t3ryVtQljDb4uMowDQYJKoZIhvcNAQEL\nBQAwSDELMAkGA1UEBhMCSUwxETAPBgNVBAgMCFRlbC1Bdml2MRgwFgYDVQQKDA9E\nDXZPcHNKYW4yMiBMdGQxDDAKBgNVBAMMA0JvYjAeFw0yMjAzMTExNDM4NDlaFw0y\nMzAzMTExNDM4NDlaMEgxCzAJBgNVBAYTAklMMREwDwYDVQQIDAhUZWwtQXZpdjEY\nMBYGA1UECgwPRGV2T3BzSmFuMjIgTHRkMQwwCgYDVQQDDANCb2IwggIiMA0GCSqG\nSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE8cWwZEm76PYms56y7pVuupYGaG7bB0qD\ntRbkOLkQ3lyRfczSqq5XnvmAGfBt5eumpA9pxRwfRg885lF1pMpzxXP13VFYls1h\nZhVH1G5Oo6QFiVigWkUC3aYwKF1sb7fdeL8nN76dXTt/J1SvyoQXMIi7GoD1hHuR\n4xpkYkDXsTqUksZzofX5YeLTaiYHGewvHHHJcDeOS6tYuljLeXhLIHqfUdTGUCaf\nnX4vXl+jQCzCJ7VMgalfS3KPxga2Jva31o66/oLfOW7q2PEXeIMz6pEjy+UWe7WS\nS49bhis2vJa7yb/eKGhakmyGsRWzTzPWF2bXttAopqkuir92SC1EHyVS/y9IZk3B\n0HeYw4aL1rVXluXZ15NWwLkVFL7CMPlG8D7w4ixqpqinH5qKeZbW3sP9hDaPh4Xj\nleie9yXEpzAKG+cwvdu0rDqoD/ZEos3DMljEKtAByELfCsINkJc6uP9AXTyYL+Fn\nRhAIiHGSx2M41HNOVsnFRuRGt/6l1Y9hwmAAaUMtE+e/l23ZDpPV7NzkSnKktKgE\nABfpqyw6Hp3VAKrcc6274iZb8c8l5oNOuZNy/YWB798BSwRJQd/AQ+TdCUm7Q9vv\nMFyflFq/kSyx7RXth0KG2KoK+1l8X27a3p1MIgbravlMx7kwd14q+AbOAdvt6wlq\nAfn7hk2VGQIDAQABo1MwUTAdBgNVHQ4EFgQURZ1LutzEIMtEzRMLHQMX66oYqlIw\nHwYDVR0jBBgwFoAURZ1LutzEIMtEzRMLHQMX66oYqlIwDwYDVR0TAQH/BAUwAwEB\n/zANBgkqhkiG9w0BAQsFAAOCAgEAfJ0jg/4DlCjppypOcu4jIeZ7lmP3eO9wMRbV\nNezGNVlQA9zmxwx+7Fa2kz2dAiZ62k6As7ri34BAfQyLp9fFzwwKiPiGVvU9uAaT\nm9IRum9GeE8U2EChw8NlxytCylmfe572a3tTsHGwqGoIt7owK/4acMLPQxpsRCyE\nju7R7nBbiwEf7Ntsu7LTQxmCqVnxG6SaYFI0Om79IbyKLxENb9niZ7a8OwSwQjKV\nwx4eCku78GSDpp1+Tjz7p/Qngc0LKX8+ab6sUtTRloVvmGXglIdlqGVCjT1j7POK\nsEEefsd/djBjEW4aPdCiuWix89dIVOFmG+kOzzLRFrdJFtt/t82vCpBbnoiOvq+C\nItGTS1BWcR08+TICZzEGHiLUB5Nz9KR6vcS4IqQ1NnUgOcPZTaQBJ3bGhXGsf1jL\nr9ghpkUtKClOn92796APW2KPcbzK2JoDks/xWoTKfIY91UMmFwxvPxVWpfuf49TB\nhRvkc2US336tgIyHmCA6RMYKXWhQD1wUMuCSVS6TDHzsyCCRxISDJodzSg/galdU\n6GeW4CGYE7LpUaIg7QiT2qwAW2ixt7pqyK0J0d9IM8rznGKWLHnQ9eRRnAUiYUBn\nccisKJ4lvKs4wE5pSNlOSs8RxrkmnfnOvetjFfZzLeIjcVGQPTlw3+0I1BEPRLEp\n/9DUjHE=\n-----END CERTIFICATE-----\n\n"} \ No newline at end of file diff --git a/06_linux_ex2/serverVersion.txt b/06_linux_ex2/serverVersion.txt new file mode 100644 index 00000000..e69de29b diff --git a/06_linux_ex2/sessionID.txt b/06_linux_ex2/sessionID.txt new file mode 100644 index 00000000..e69de29b From f336c6f0d3dac16ef8c0e007fa5b1d6eddf85b12 Mon Sep 17 00:00:00 2001 From: mkshamir Date: Tue, 17 May 2022 14:24:20 +0300 Subject: [PATCH 5/8] deleting irrelevant text --- 07_git_exercises/mkshamir_ex1/README.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/07_git_exercises/mkshamir_ex1/README.txt b/07_git_exercises/mkshamir_ex1/README.txt index 125ce885..d1a4aa81 100644 --- a/07_git_exercises/mkshamir_ex1/README.txt +++ b/07_git_exercises/mkshamir_ex1/README.txt @@ -55,3 +55,4 @@ Git Basics resolve conflicts ~~~~~~~~~~~~~~~~~ +1- \ No newline at end of file From 5087cebf4157a1df5dda6a2ebaa32dda66c4c42b Mon Sep 17 00:00:00 2001 From: mkshamir Date: Fri, 20 May 2022 11:02:15 +0300 Subject: [PATCH 6/8] adding cherry-picking --- 07_git_exercises/mkshamir_ex1/README.txt | 38 +++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/07_git_exercises/mkshamir_ex1/README.txt b/07_git_exercises/mkshamir_ex1/README.txt index d1a4aa81..0357e19d 100644 --- a/07_git_exercises/mkshamir_ex1/README.txt +++ b/07_git_exercises/mkshamir_ex1/README.txt @@ -55,4 +55,40 @@ Git Basics resolve conflicts ~~~~~~~~~~~~~~~~~ -1- \ No newline at end of file +17- git branch + bugfix/fix_readme_typo + bugfix/open_kibana_port + dev + feature/data_retention_policy + feature/elasticsearch_helm_chart + feature/upgrade_angular_version + feature/version1 + feature/version2 +* main + +18- git checkout -b feature/lambda_migration + +19- git merge feature/version1 + +20+21- merging and resolving feature/version2 into feature/lambda_migration using the Pycharm UI. + +22- git status + it's shown that 'app.py' is set to be committed now that the merge conflicts have been resolved. + also, 'abc.txt' is to be staged before committing. + git commit -m "adding app.py after resolving merge conflicts" + +cherry picking +~~~~~~~~~~~~~~ + +1- git checkout main + git checkout -b feature/lambda_migration2 + +2+3- using the pycharm UI to cherry-pick specific commits from feature/lambda_migration branch. + +4- '.env' and 'config.json' were added as result of the cherry-picking. + +5- the order in which commits are picked matters, and I should care about it, because the commits build on top of each + other. it's possible that a commit that is ahead in the git history tree won't make sense unless an earlier commit + is picked first. moreover, if I pick commits in a backward order I might delete wanted progress. + also, the order in which I pick commits determines which commit will ultimately be the HEAD. + From bffdba44ec85a5035221893c3e17d46e341b9df8 Mon Sep 17 00:00:00 2001 From: mkshamir Date: Fri, 20 May 2022 12:39:37 +0300 Subject: [PATCH 7/8] adding changes in the working tree and switch branches --- 07_git_exercises/mkshamir_ex1/README.txt | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/07_git_exercises/mkshamir_ex1/README.txt b/07_git_exercises/mkshamir_ex1/README.txt index 0357e19d..b9c753e0 100644 --- a/07_git_exercises/mkshamir_ex1/README.txt +++ b/07_git_exercises/mkshamir_ex1/README.txt @@ -92,3 +92,29 @@ cherry picking is picked first. moreover, if I pick commits in a backward order I might delete wanted progress. also, the order in which I pick commits determines which commit will ultimately be the HEAD. +changes in working tree and switch branches +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +22- using 'git status' it is shown that I'm on 'feature/lambda_migration2' branch (which isn't 'dev'). + +23- touch take.txt + ls + echo "take your time, look around" >> take.txt + cat take.txt + git status + git add take.txt + git status + +24- git checkout dev + the solutions proposed by git terminal are committing or stashing before checking out. + +25- using the pycharm UI to force checkout into dev branch. + +26- 'take.txt' has a completely different text in it now that I've force checked out. (a b c) + +27- git checkout feature/lambda_migration2 + 'take.txt' no longer exists in this branch. it can be inferred that force checkout allows switching branches without + committing or stashing therefore causing the loss of progress. + +reset +~~~~~ \ No newline at end of file From 59d1ab506ea7a510dc376c92638265c71476f1d4 Mon Sep 17 00:00:00 2001 From: mkshamir Date: Fri, 20 May 2022 15:21:33 +0300 Subject: [PATCH 8/8] adding reset and finishing the assignment --- 07_git_exercises/mkshamir_ex1/README.txt | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/07_git_exercises/mkshamir_ex1/README.txt b/07_git_exercises/mkshamir_ex1/README.txt index b9c753e0..8e6908bf 100644 --- a/07_git_exercises/mkshamir_ex1/README.txt +++ b/07_git_exercises/mkshamir_ex1/README.txt @@ -117,4 +117,27 @@ changes in working tree and switch branches committing or stashing therefore causing the loss of progress. reset -~~~~~ \ No newline at end of file +~~~~~ + +25- git checkout reset_question + git status + +26- i. git reset --soft HEAD~1 + git status + it appears that the last commit was undone. 10.txt is now a stage to be committed and also the last commit + was omitted from the Git UI. + ii. git reset --mixed HEAD~1 + git status + once again the last commit was undone. only this time the changes aren't staged and are marked as untracked files. + iii. git reset --hard HEAD~1 + git status + one more time the last commit was undone. but this time not only are the changes not staged they were completely + erased from the working tree. + vi. git revert HEAD~1 + git status + this created a new commit which is a copy of the previous commit. this action altered the state of one file + and deleted another file all together. + +27- the meaning of the notation HEAD~1 is the number of commits to count down from the front end of the branch history. + the head is the most recent staging area and the tilda specifies the number of commits to count back from that + starting point. \ No newline at end of file