From 84029d8b541dbaf3222cf416990fa3a2e3c4d0a0 Mon Sep 17 00:00:00 2001 From: Ansh Date: Tue, 3 Jan 2023 19:35:09 +0530 Subject: [PATCH 01/14] SSH Task Done --- .gitignore | 1 - CONTRIBUTORS/IIITA/Second Year/Ansh/info.md | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTORS/IIITA/Second Year/Ansh/info.md diff --git a/.gitignore b/.gitignore index ab658be..3d98cab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ CONTRIBUTORS/IITH/2nd/Kushagra/Info.md CONTRIBUTORS/IIITA/Second Year/Koshal/info.md CONTRIBUTORS/IIITA/Second\ Year/Ananya/info.md -CONTRIBUTORS/IIITA/Second Year/Ansh/info.md diff --git a/CONTRIBUTORS/IIITA/Second Year/Ansh/info.md b/CONTRIBUTORS/IIITA/Second Year/Ansh/info.md new file mode 100644 index 0000000..3b2f251 --- /dev/null +++ b/CONTRIBUTORS/IIITA/Second Year/Ansh/info.md @@ -0,0 +1,14 @@ +My Name is Ansh Kothari. I am in second year at IIITA. +My enrollment number is IEC2021006. + +Private Repo Link: https://github.com/anshgeez31/Private_Repo_OpenCode + +Problem facing: While mkdir we are creating a new folder but when we try to git add . it then there is a message appears which says that working tree is clean that means that no changes were detected when you create a directory. +Reason: In Git, directories exist only implicitly, through their contents. Empty directories have no contents, therefore they don't exist. Or to put it another way: Git is a content tracker. .gitkeep is a dummy file that makes sure that git recognises the empty folder so we can include this in an empty folder for git to easily detect it. +This is edited by Ansh Kothari. Roll No. IEC2021006 + +Q) What do you really understand from SSH keys in VCS? What are the advantages of using it? + +Ans). +SSH creates a routes and all the encrypted data are transferred through it with no security issues. we can securely transmit data files. It is more secured than login id and password which could be hacked. +It is a kind of networking protocol, that digs a secure tunnel between the host and the server. It's a two way channel(Secured Shell) that is meant by the exchange of data, in the form of cryptogenically key(4096 bits) used to encrypt it(by using public key:- Which is accessible to everyone) and decrypt(only by the private key:- which is accessible to only host and the server) so that the info. between them got secured, and pass through secured channel and make it free from hacking or data leakage between them by any malicious effect. From f39467c6d1b1b3b033fda66dd930148ceaaa3df9 Mon Sep 17 00:00:00 2001 From: Kapil Date: Thu, 5 Jan 2023 01:46:51 +0530 Subject: [PATCH 02/14] SSH keys added --- .gitignore | 2 +- CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md diff --git a/.gitignore b/.gitignore index 9beda06..68c1f05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ CONTRIBUTORS/IITH/2nd/Kushagra/Info.md -CONTRIBUTORS/IIITA/Second Year/Koshal/info.md + CONTRIBUTORS/IIITA/Second\ Year/Ananya/info.md CONTRIBUTORS/IIITA/Second Year/Ansh/info.md diff --git a/CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md b/CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md new file mode 100644 index 0000000..49d87a7 --- /dev/null +++ b/CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md @@ -0,0 +1,8 @@ +Ques - What do you really understand from SSH keys in VCS? What are the advantages of using it? + +Ans - SSH keys replaces username and password while connecting local repo to Github. we can write and access data in repos on github using secure shell protocol (ssh). + +Advantages: + +SSH makes it faster and secure to transfer files over untrusted network. +we dont have to login using username and password while pushing commits on remote repos. \ No newline at end of file From 3180037792c34e7d8de45b89b0d03cb976cbd3ca Mon Sep 17 00:00:00 2001 From: Abhay Singh Date: Thu, 5 Jan 2023 11:47:37 +0530 Subject: [PATCH 03/14] true --- CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md b/CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md index 46f262b..36d6128 100644 --- a/CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md +++ b/CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md @@ -1 +1,2 @@ ## Hey there +Changes for task 8. From b0c6f9fd8db2c7d112d060d145864eb9ee961b8e Mon Sep 17 00:00:00 2001 From: MistyRavager Date: Thu, 5 Jan 2023 13:30:18 +0530 Subject: [PATCH 04/14] fix for issue#115 updated Info.md file with answer and updated commit message (this is the description of commit) --- CONTRIBUTORS/IITH/2nd/kushagra/Info.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTORS/IITH/2nd/kushagra/Info.md b/CONTRIBUTORS/IITH/2nd/kushagra/Info.md index 6059d81..2317407 100644 --- a/CONTRIBUTORS/IITH/2nd/kushagra/Info.md +++ b/CONTRIBUTORS/IITH/2nd/kushagra/Info.md @@ -5,3 +5,10 @@ Hi, i am Kushagra, sophomore at IITH, and i like to learn new things **Ans** : - So SSH (Secure Shell) key helps us in not requiring us to validate our email/username/password again and again when we try to contribute on github by pushing, etc.. - Also its tough for someone to crack SSH keys as they are encoded using RSA encryption, and one needs both public and private keys to gain access. Public key is uploaded on github, while private key is stored in our desktops and is then we can securely connect to github, they can verify our connection and hence we dont need to repeatedly give username, password and we can work non-abruptly + + +**Ques** - How to edit the last commit message in git? + +**Ans** : +- We could commit the last message in git using `git commit --amend -m ""`, moreover if one wants to change commit message which is not the last one, one could use `git rebase -i` (interactive mode) and specify the commits that you want to squash , then it will open the editor where one could use the `reword/edit` option to change the commit message +- If the commit is not pushed to the remote repo, then the above command will do the changes. If the chnages are pushed to the remote repo, then we could force push the commit using `-f` flag to the remote repository. From 34a553ad72a323094527e04877e0a2f1fb8d6efe Mon Sep 17 00:00:00 2001 From: ABHAY SINGH <75938293+ABHAY0O7@users.noreply.github.com> Date: Fri, 6 Jan 2023 02:46:15 +0530 Subject: [PATCH 05/14] Update Info.md --- CONTRIBUTORS/IITH/2nd/kushagra/Info.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/CONTRIBUTORS/IITH/2nd/kushagra/Info.md b/CONTRIBUTORS/IITH/2nd/kushagra/Info.md index 2317407..6b86a8a 100644 --- a/CONTRIBUTORS/IITH/2nd/kushagra/Info.md +++ b/CONTRIBUTORS/IITH/2nd/kushagra/Info.md @@ -1,14 +1,2 @@ Hi, i am Kushagra, sophomore at IITH, and i like to learn new things -**Ques** - What do you really understand from SSH keys in VCS? What are the advantages of using it? - -**Ans** : -- So SSH (Secure Shell) key helps us in not requiring us to validate our email/username/password again and again when we try to contribute on github by pushing, etc.. -- Also its tough for someone to crack SSH keys as they are encoded using RSA encryption, and one needs both public and private keys to gain access. Public key is uploaded on github, while private key is stored in our desktops and is then we can securely connect to github, they can verify our connection and hence we dont need to repeatedly give username, password and we can work non-abruptly - - -**Ques** - How to edit the last commit message in git? - -**Ans** : -- We could commit the last message in git using `git commit --amend -m ""`, moreover if one wants to change commit message which is not the last one, one could use `git rebase -i` (interactive mode) and specify the commits that you want to squash , then it will open the editor where one could use the `reword/edit` option to change the commit message -- If the commit is not pushed to the remote repo, then the above command will do the changes. If the chnages are pushed to the remote repo, then we could force push the commit using `-f` flag to the remote repository. From e6c4410f58c830087cc0b56aa4bcd6f561be9893 Mon Sep 17 00:00:00 2001 From: MaheshKarhale2111 Date: Fri, 6 Jan 2023 12:13:22 +0530 Subject: [PATCH 06/14] ssh keys task done --- CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md b/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md index f508a33..cbeb1c4 100644 --- a/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md +++ b/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md @@ -1,3 +1,8 @@ Hello I am Mahesh, third year from IIT Madras. I am very enthuastic about web development as well as competitive programming. I am learning javascript and nodejs. I am lil inclined towards design too! Private repo link - https://github.com/MaheshKarhale2111/Repo_for_opencode- + +What do you really understand from SSH keys in VCS? What are the advantages of using it? + +GitHub ssh keys are nothing but another way of authentication, slightly different from traditional mode of authentication that is username and password. Using ssh keys gives you advantage of push and fetch data without having to authorize your github credentials everytime you push or fetch plus it comes with additional security. +Ssh keys are generated in pair- public and private, while public key is given to github and private key remains in system. Whenever authentication operation is required , the private key and public key in github try to communicate and set up authentication, kind of handshake. If matched then opertion proceed further. From 1c22640eadc34e730f437b6a23f5afa9d9502182 Mon Sep 17 00:00:00 2001 From: SUSHANT KUMAR <97659153+sushantk1274@users.noreply.github.com> Date: Sat, 7 Jan 2023 16:41:28 +0530 Subject: [PATCH 07/14] SECOND PART TITLE acha laga sikh ke --- .gitignore | 2 +- CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md diff --git a/.gitignore b/.gitignore index b04d596..68bcead 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ CONTRIBUTORS/IIITA/Second\ Year/bhumika-kalaru/info.md CONTRIBUTORS/IIITA/Second Year/Koshal/info.md CONTRIBUTORS/IIITA/Second\ Year/Ananya/info.md CONTRIBUTORS/IIITA/First Year/C Karthik Reddy/info.md -CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md + diff --git a/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md b/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md new file mode 100644 index 0000000..5a020c5 --- /dev/null +++ b/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md @@ -0,0 +1,10 @@ +We should have to follow this as if the commmit is not pushed online yet the we have to follow only two of the strps but if the message is committed online then we have also to force push the value + + +On the command line, navigate to the repository that contains the commit you want to amend. + +step1)Type "git commit --amend" and press Enter... + +step2)Use the push --force-with-lease command to force push over the old commit. + +step3)this is the command actually "$ git push --force-with-lease origin EXAMPLE-BRANCH" \ No newline at end of file From 09b5de6043519f6703de93897076ffbc708d5ab8 Mon Sep 17 00:00:00 2001 From: ABHAY SINGH <75938293+ABHAY0O7@users.noreply.github.com> Date: Sun, 8 Jan 2023 05:28:40 +0530 Subject: [PATCH 08/14] Revert "ssh keys task done" --- CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md b/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md index cbeb1c4..f508a33 100644 --- a/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md +++ b/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md @@ -1,8 +1,3 @@ Hello I am Mahesh, third year from IIT Madras. I am very enthuastic about web development as well as competitive programming. I am learning javascript and nodejs. I am lil inclined towards design too! Private repo link - https://github.com/MaheshKarhale2111/Repo_for_opencode- - -What do you really understand from SSH keys in VCS? What are the advantages of using it? - -GitHub ssh keys are nothing but another way of authentication, slightly different from traditional mode of authentication that is username and password. Using ssh keys gives you advantage of push and fetch data without having to authorize your github credentials everytime you push or fetch plus it comes with additional security. -Ssh keys are generated in pair- public and private, while public key is given to github and private key remains in system. Whenever authentication operation is required , the private key and public key in github try to communicate and set up authentication, kind of handshake. If matched then opertion proceed further. From 6def5c0c552dedba5385189d54f087a4776440d5 Mon Sep 17 00:00:00 2001 From: MaheshKarhale2111 Date: Sun, 8 Jan 2023 11:18:35 +0530 Subject: [PATCH 09/14] ssh keys task done --- CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md b/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md index f508a33..cbeb1c4 100644 --- a/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md +++ b/CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md @@ -1,3 +1,8 @@ Hello I am Mahesh, third year from IIT Madras. I am very enthuastic about web development as well as competitive programming. I am learning javascript and nodejs. I am lil inclined towards design too! Private repo link - https://github.com/MaheshKarhale2111/Repo_for_opencode- + +What do you really understand from SSH keys in VCS? What are the advantages of using it? + +GitHub ssh keys are nothing but another way of authentication, slightly different from traditional mode of authentication that is username and password. Using ssh keys gives you advantage of push and fetch data without having to authorize your github credentials everytime you push or fetch plus it comes with additional security. +Ssh keys are generated in pair- public and private, while public key is given to github and private key remains in system. Whenever authentication operation is required , the private key and public key in github try to communicate and set up authentication, kind of handshake. If matched then opertion proceed further. From 1ba4949f1fca621e634e26d202383d5e84ba2c88 Mon Sep 17 00:00:00 2001 From: Kapil Date: Sat, 7 Jan 2023 23:47:27 +0530 Subject: [PATCH 10/14] Title Description - This is description --- .gitignore | 2 +- CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md diff --git a/.gitignore b/.gitignore index 9beda06..68c1f05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ CONTRIBUTORS/IITH/2nd/Kushagra/Info.md -CONTRIBUTORS/IIITA/Second Year/Koshal/info.md + CONTRIBUTORS/IIITA/Second\ Year/Ananya/info.md CONTRIBUTORS/IIITA/Second Year/Ansh/info.md diff --git a/CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md b/CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md new file mode 100644 index 0000000..7d1a9ad --- /dev/null +++ b/CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md @@ -0,0 +1,5 @@ +Ques - How to edit the last commit message in git? +Ans - first make a commit message, make a PR then with the help git command + "git commit -m " " --amend " we can overwrite the previous commit message + after this when we force push the commit otherwise it will throw an error + as there was no modification in the repo. This we can edit the last commit message. \ No newline at end of file From 8573332c8e7d760d682ef7f07688cfc0e882f217 Mon Sep 17 00:00:00 2001 From: SUSHANT KUMAR <97659153+sushantk1274@users.noreply.github.com> Date: Sun, 8 Jan 2023 22:36:53 +0530 Subject: [PATCH 11/14] done merge task learn new thing --- .gitignore | 2 +- CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md diff --git a/.gitignore b/.gitignore index b04d596..68bcead 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ CONTRIBUTORS/IIITA/Second\ Year/bhumika-kalaru/info.md CONTRIBUTORS/IIITA/Second Year/Koshal/info.md CONTRIBUTORS/IIITA/Second\ Year/Ananya/info.md CONTRIBUTORS/IIITA/First Year/C Karthik Reddy/info.md -CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md + diff --git a/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md b/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md new file mode 100644 index 0000000..15ff350 --- /dev/null +++ b/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md @@ -0,0 +1,10 @@ +we know that the fork and PR model is a version of git's own branch-and-merge functionality, in which commits can follow separate paths (called branches) and then be brought back together. + +this is called branch and merge + +step 1 first we will git checkout branch-2 + +then we will commit and push our changes + +step 2. merge it to branch-1 and make a PR for original repo + From 6c2b634587e2b9a877456342a94dbe605272f5e4 Mon Sep 17 00:00:00 2001 From: SUSHANT KUMAR <97659153+sushantk1274@users.noreply.github.com> Date: Mon, 9 Jan 2023 10:37:06 +0530 Subject: [PATCH 12/14] my first commit i have used git reset --hard HEAD^ for deleting my second commit as it is the recent commit --- CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md b/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md index 15ff350..d8ce19a 100644 --- a/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md +++ b/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md @@ -8,3 +8,8 @@ then we will commit and push our changes step 2. merge it to branch-1 and make a PR for original repo +# Different delete task + +i will give description in first commit and delete my most recent commit that is my second commit using the command + +git reset --hard HEAD^ \ No newline at end of file From 54996fcd634c64a7f8d807a14a201fa5dfed9932 Mon Sep 17 00:00:00 2001 From: ABHAY SINGH <75938293+ABHAY0O7@users.noreply.github.com> Date: Fri, 13 Jan 2023 00:45:36 +0530 Subject: [PATCH 13/14] Update Info.md --- CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md b/CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md index 36d6128..46f262b 100644 --- a/CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md +++ b/CONTRIBUTORS/IIITA/Third year/Abhay Singh/Info.md @@ -1,2 +1 @@ ## Hey there -Changes for task 8. From 08ac350a4412afc4e8675c4d412d0fe71be06d79 Mon Sep 17 00:00:00 2001 From: SUSHANT KUMAR <97659153+sushantk1274@users.noreply.github.com> Date: Fri, 13 Jan 2023 23:04:59 +0530 Subject: [PATCH 14/14] done first pART (#1) --- .../IIITA/Second Year/sushant_kumar/info.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md b/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md index d26e238..954bcbe 100644 --- a/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md +++ b/CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md @@ -1,4 +1,18 @@ +It is a 3 way merge as defintion is down... + + +The reason it is called a 3-way merge is because the Merge Commit is based on 3 different commits. + +The common ancestor of our branches, in this case sir you have added a commit. This commit contains code before we diverge into different branches. + +The tip of the Master branch, that is the last commit performed on the Master branch that i have done while mergig my branch-2 to branch-1 + +The tip of the Feature branch, the last commit performed on the Feature branch that i will do while while merging my branch-1 to your branch-1 + +To merge the changes from both the branches, Git looks at the three different snapshots - the before snapshot and the after snapshots. Based on these snapshots, Git combines the changes by creating the new commit called the Merge Commit.. +======= + we know that the fork and PR model is a version of git's own branch-and-merge functionality, in which commits can follow separate paths (called branches) and then be brought back together. this is called branch and merge