Skip to content

Commit 12c1644

Browse files
authored
Merge branch 'github:main' into main
2 parents d4a6f00 + a50017c commit 12c1644

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

git-guides/git-add.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ If the time is right to stage all files, there are several commands that you can
7575
* `git add .`: adds the entire directory recursively, including files whose names begin with a dot
7676
* `git add -u`: stages modified and deleted files only, NOT new files
7777

78-
| | New files | Modified files | Deleted files | Files with names beginning with a dot | Current directory | Higher directories|
78+
| Command | New files | Modified files | Deleted files | Files with names beginning with a dot | Current directory | Higher directories|
7979
| ------------- | ------------- | ---- | ---- | ------ | ----- | ----- |
8080
| `git add -A` | Yes | Yes | Yes | Yes | Yes | Yes |
8181
| `git add .` | Yes | Yes | Yes | Yes | Yes | No |

git-guides/git-clone.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The `git clone` command is used to create a copy of a specific repository or bra
44

55
Git is a distributed version control system. Maximize the advantages of a full repository on your own machine by cloning.
66

7-
### What Does `git clone` Do?
7+
## What Does `git clone` Do?
88

99
```sh
1010
git clone https://github.com/github/training-kit.git

git-guides/git-pull.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Without `git pull`, (or the effect of it,) your local branch wouldn't have any of the updates that are present on the remote.
66

7-
### What Does `git pull` Do?
7+
## What Does `git pull` Do?
88

99
```sh
1010
git pull
@@ -20,7 +20,7 @@ git pull
2020

2121
However, you may want to use `git fetch` instead. One reason to do this may be that you expect conflicts. Conflicts can occur in this way if you have new local commits and new commits on the remote. Just like a merge conflict that would happen between two different branches, these two different lines of history could contain changes to the same parts of the same file. If you first operate `git fetch`, the merge won't be initiated, and you won't be prompted to solve the conflict. This gives you the flexibility to resolve the conflict later without the need for network connectivity.
2222

23-
Another reason you may want to run `git fetch` is to update to all remote tracking branches before losing network connectivity. If you run `git fetch`, and then later try to run `git pull` without any network connectivity, the `git fetch` portion of the `git pull` operation will fail.
23+
Another reason you may want to run `git fetch` is to update to all remote tracking branches before losing network connectivity. If you run `git fetch`, and then later try to run `git pull` without any network connectivity, the `git fetch` portion of the `git pull` operation will fail.
2424

2525
If you do use `git fetch` instead of `git pull`, make sure you remember to `git merge`. Merging the remote tracking branch into your own branch ensures you will be working with any updates or changes.
2626

@@ -90,4 +90,3 @@ Using `git pull --rebase` does not affect the integrity of the changes or the co
9090
- `git push`: Uploads all local branch commits to the remote.
9191
- `git log`: Browse and inspect the evolution of project files.
9292
- `git remote -v`: Show the associated remote repositories and their stored name, like `origin`.
93-

git-guides/install-git.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Note: [`git-scm`](https://git-scm.com/download/win) is a popular and recommended
2929
## Install Git on Windows through Visual Studio Code
3030

3131
GitHub integration is provided through the [GitHub Pull Requests and Issues extension](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github).
32-
To get started with the GitHub in VS Code, you'll need to create an account and install the GitHub Pull Requests and Issues extension.
32+
To get started with the GitHub in VS Code, you'll need to create an account and install the GitHub Pull Requests and Issues extension.
3333
Once you've installed the [GitHub Pull Requests and Issues extension](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github), you'll need to sign in. Follow the prompts to authenticate with GitHub and return to VS Code.
3434

3535

@@ -44,15 +44,15 @@ Note: You can perform actions like, you can search for and clone a repository fr
4444

4545
Most versions of MacOS will already have `Git` installed, and you can activate it through the terminal with `git version`. However, if you don't have Git installed for whatever reason, you can install the latest version of Git using one of several popular methods as listed below:
4646

47-
#### Install Git From an Installer
47+
### Install Git From an Installer
4848

4949
1. Navigate to the latest [macOS Git Installer](https://sourceforge.net/projects/git-osx-installer/files/git-2.23.0-intel-universal-mavericks.dmg/download?use_mirror=autoselect) and download the latest version.
5050
2. Once the installer has started, follow the instructions as provided until the installation is complete.
5151
3. Open the command prompt "terminal" and type `git version` to verify Git was installed.
5252

5353
Note: [`git-scm`](https://git-scm.com/download/mac) is a popular and recommended resource for downloading Git on a Mac. The advantage of downloading Git from `git-scm` is that your download automatically starts with the latest version of Git. The download source is the same [macOS Git Installer](https://sourceforge.net/projects/git-osx-installer/files/git-2.23.0-intel-universal-mavericks.dmg/download?use_mirror=autoselect) as referenced in the steps above.
5454

55-
#### Install Git from Homebrew
55+
### Install Git from Homebrew
5656

5757
[Homebrew](https://brew.sh/) is a popular package manager for macOS. If you already have Homebrew installed, you can follow the below steps to install Git:
5858

@@ -66,14 +66,14 @@ Fun fact: Git was originally developed to version the Linux operating system! So
6666

6767
You can install `Git` on Linux through the package management tool that comes with your distribution.
6868

69-
#### Debian/Ubuntu
69+
### Debian/Ubuntu
7070

7171
1. Git packages are available using `apt`.
7272
2. It's a good idea to make sure you're running the latest version. To do so, Navigate to your command prompt shell and run the following command to make sure everything is up-to-date: `sudo apt-get update`.
7373
3. To install Git, run the following command: `sudo apt-get install git-all`.
7474
4. Once the command output has been completed, you can verify the installation by typing: `git version`.
7575

76-
#### Fedora
76+
### Fedora
7777

7878
1. Git packages are available using `dnf`.
7979
2. To install Git, navigate to your command prompt shell and run the following command: `sudo dnf install git-all`.

0 commit comments

Comments
 (0)