Skip to content

corrected spelling mistake #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 25, 2023
+34 −29
Merged

corrected spelling mistake #362

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42b33d2
corrected spelling mistake
pranay999000 Mar 21, 2023
c125db4
changed text to code in git/README.md
pranay999000 Mar 21, 2023
1ad0d94
corrected spelling mistake
pranay999000 Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 34 additions & 29 deletions topics/git/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

## Exercises

|Name|Topic|Objective & Instructions|Solution|Comments|
|--------|--------|------|----|----|
| My first Commit | Commit | [Exercise](commit_01.md) | [Solution](solutions/commit_01_solution.md) | |
| Time to Branch | Branch | [Exercise](branch_01.md) | [Solution](solutions/branch_01_solution.md) | |
| Squashing Commits | Commit | [Exercise](squashing_commits.md) | [Solution](solutions/squashing_commits.md) | |
| Name | Topic | Objective & Instructions | Solution | Comments |
| ----------------- | ------ | -------------------------------- | ------------------------------------------- | -------- |
| My first Commit | Commit | [Exercise](commit_01.md) | [Solution](solutions/commit_01_solution.md) | |
| Time to Branch | Branch | [Exercise](branch_01.md) | [Solution](solutions/branch_01_solution.md) | |
| Squashing Commits | Commit | [Exercise](squashing_commits.md) | [Solution](solutions/squashing_commits.md) | |

## Questions

Expand Down Expand Up @@ -47,10 +47,10 @@ a separate branch in your local repository

There are different ways to check whether a file is tracked or not:

- `git ls-files <file>` -> exit code of 0 means it's tracked
- `git blame <file>`
- `git ls-files <file>` -> exit code of 0 means it's tracked
- `git blame <file>`
...
</b></details>
</b></details>

<details>
<summary>Explain what the file <code>gitignore</code> is used for</summary><br><b>
Expand Down Expand Up @@ -95,8 +95,8 @@ One thing to do about it, would be to use the built-in `fsmonitor` (filesystem m

Next, you can try to enable `feature.manyFile` with `git config feature.manyFiles true`. This does two things:

1. Sets `index.version = 4` which enables path-prefix compression in the index
2. Sets `core.untrackedCache=true` which by default is set to `keep`. The untracked cache is quite important concept. What it does is to record the mtime of all the files and directories in the working directory. This way, when time comes to iterate over all the files and directories, it can skip those whom mtime wasn't updated.
1. Sets `index.version = 4` which enables path-prefix compression in the index
2. Sets `core.untrackedCache=true` which by default is set to `keep`. The untracked cache is quite important concept. What it does is to record the mtime of all the files and directories in the working directory. This way, when time comes to iterate over all the files and directories, it can skip those whom mtime wasn't updated.

Before enabling it, you might want to run `git update-index --test-untracked-cache` to test it out and make sure mtime operational on your system.

Expand All @@ -113,10 +113,10 @@ Finally, with certain build systems, you can know which files are being used/rel
<details>
<summary>What's is the branch strategy (flow) you know?</summary><br><b>

* Git flow
* GitHub flow
* Trunk based development
* GitLab flow
- Git flow
- GitHub flow
- Trunk based development
- GitLab flow

[Explanation](https://www.bmc.com/blogs/devops-branching-strategies/#:~:text=What%20is%20a%20branching%20strategy,used%20in%20the%20development%20process).

Expand All @@ -137,6 +137,7 @@ git pull
git checkout devel
git merge main
```

</b></details>

<details>
Expand All @@ -154,7 +155,7 @@ Using the HEAD file: `.git/HEAD`
<details>
<summary>What <code>unstaged</code> means in regards to Git?</summary><br><b>

A file the is in the working directory but is not in the HEAD nor in the staging area, referred to as "unstaged".
A file that is in the working directory but is not in the HEAD nor in the staging area is referred to as "unstaged".
</b></details>

<details>
Expand All @@ -168,9 +169,12 @@ True
<details>
<summary>You have two branches - main and devel. How do you merge devel into main?</summary><br><b>

```
git checkout main
git merge devel
git push origin main
```

</b></details>

<details>
Expand Down Expand Up @@ -203,8 +207,8 @@ This page explains it the best: https://git-scm.com/docs/merge-strategies

Probably good to mention that it's:

* It's good for cases of merging more than one branch (and also the default of such use cases)
* It's primarily meant for bundling topic branches together
- It's good for cases of merging more than one branch (and also the default of such use cases)
- It's primarily meant for bundling topic branches together

This is a great article about Octopus merge: http://www.freblogg.com/2016/12/git-octopus-merge.html
</b></details>
Expand All @@ -218,6 +222,7 @@ This is a great article about Octopus merge: http://www.freblogg.com/2016/12/git

`git reset` depends on the usage, can modify the index or change the commit which the branch head
is currently pointing at.

</p>
</b></details>

Expand All @@ -240,6 +245,7 @@ Suppose a team is working on a `feature` branch that is coming from the `main` b
```
git checkout HEAD~1 -- /path/of/the/file
```

</b></details>

<details>
Expand All @@ -250,16 +256,15 @@ git checkout HEAD~1 -- /path/of/the/file
<summary>What is the <code>.git</code> directory? What can you find there?</summary><br><b>
The <code>.git</code> folder contains all the information that is necessary for your project in version control and all the information about commits, remote repository address, etc. All of them are present in this folder. It also contains a log that stores your commit history so that you can roll back to history.


This info copied from [https://stackoverflow.com/questions/29217859/what-is-the-git-folder](https://stackoverflow.com/questions/29217859/what-is-the-git-folder)
</b></details>

<details>
<summary>What are some Git anti-patterns? Things that you shouldn't do</summary><br><b>

* Not waiting too long between commits
* Not removing the .git directory :)
</b></details>
- Not waiting too long between commits
- Not removing the .git directory :)
</b></details>

<details>
<summary>How do you remove a remote branch?</summary><br><b>
Expand Down Expand Up @@ -334,20 +339,20 @@ Shortly, it runs `git diff` twice:

1. Compare between HEAD to staging area
2. Compare staging area to working directory
</b></details>
</b></details>

<details>
<summary>If <code>git status</code> has to run diff on all the files in the HEAD commit to those in staging area/index and another one on staging area/index and working directory, how is it fairly fast? </summary><br><b>

One reason is about the structure of the index, commits, etc.

* Every file in a commit is stored in tree object
* The index is then a flattened structure of tree objects
* All files in the index have pre-computed hashes
* The diff operation then, is comparing the hashes
- Every file in a commit is stored in tree object
- The index is then a flattened structure of tree objects
- All files in the index have pre-computed hashes
- The diff operation then, is comparing the hashes

Another reason is caching

* Index caches information on working directory
* When Git has the information for certain file cached, there is no need to look at the working directory file
</b></details>
- Index caches information on working directory
- When Git has the information for certain file cached, there is no need to look at the working directory file
</b></details>