Skip to content

Commit a609ab5

Browse files
author
Jordan McCullough
committed
Merge pull request #286 from randomecho/intermed-reading-flow
Remove one AND from Details intro to stop a run-on sentence.
2 parents 3b9e67c + a879ac5 commit a609ab5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Diff for: intermediate/index.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ git config core.editor
4040
### Details
4141
Git is configured through name-value pairs saved in an [INI file format](http://en.wikipedia.org/wiki/INI_file). The name-value pairs can be read and written through the `git config` command.
4242

43-
Git's configuration is saved in one of three plain text files and one of three levels and is easily editable with a text editor and portable to other machines by copying the configuration files.
43+
Git's configuration is saved in one of three plain text files and one of three levels. It is easily editable with a text editor and portable to other machines by copying the configuration files.
4444

4545
#### Identity
4646
Your name and email address are configured locally in Git and are attached to each commit. Set these accurately to receive proper attribution for your work.
4747

4848
These are the very first Git elements often suggested to set. If not set, Git will fall back to an automatically derived name and email from the host machine's network node name.
4949

50-
To inspect the current settings, individually query two configuration values:
50+
To see the current settings, individually query two configuration values:
5151

5252
```shell
5353
$ git config user.name
@@ -403,7 +403,7 @@ $ git branch
403403
Typical workflows always begin with a branch, no matter how small or grand the level of effort might be or the number of commits involved.
404404

405405
```shell
406-
List branches, identify current brach
406+
List branches, identify current branch
407407
$ git branch
408408

409409
Create a new branch from current branch
@@ -545,7 +545,7 @@ $ git push
545545
{% endcapture %}{% include slide-section %}
546546
547547
{% capture lab %}
548-
1. Setup example aliases for command line effiency
548+
1. Setup example aliases for command line efficiency
549549
2. Create your own Git command alias and option switch combination
550550
{% endcapture %}{% include lab %}
551551
@@ -561,7 +561,7 @@ $ git config --global alias.lol "log --graph --all --oneline --decorate"
561561
```
562562
563563
```shell
564-
Shortuct to repository status
564+
Shortcut to repository status
565565
$ git config alias.s "status -s"
566566
```
567567
@@ -600,7 +600,7 @@ $ git config alias.s "status -s"
600600
{% endcapture %}{% include lab %}
601601
602602
### Details
603-
Files in Git transition through a well-defined states of tracking.
603+
Files in Git transition through well-defined states of tracking.
604604
605605
#### Adding files
606606
```shell

0 commit comments

Comments
 (0)