Skip to content

Issue #201 fix #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

Closed
wants to merge 5 commits into from
Closed

Issue #201 fix #362

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa4f6d9
Merge branch 'main' of https://github.com/logananglin98/opensource in…
logananglin98 May 9, 2025
88bc138
Merge branch 'main' of https://github.com/logananglin98/opensource in…
logananglin98 May 13, 2025
825e4da
Changed all <paragraphs> tags to <subsection> tags and ensured xml:id…
logananglin98 May 13, 2025
ed43ce3
Separated asterisk and double asterisk into two separate paragraphs a…
logananglin98 May 13, 2025
91d9ebb
Fixed index description for double asterisk
logananglin98 May 13, 2025
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
73 changes: 40 additions & 33 deletions source/sec_git_basics.ptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<!-- div attr= class="sect3"-->

<paragraphs xml:id="_initializing_a_repository_in_an_existing_directory">
<subsection xml:id="_initializing_a_repository_in_an_existing_directory">
<title>Initializing a Repository in an Existing Directory</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -105,9 +105,9 @@ $ git commit -m 'Initial project version'</pre><!--</div attr= class="content">-
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_git_cloning">
<subsection xml:id="_git_cloning">
<title>Cloning an Existing Repository</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -148,7 +148,7 @@ $ git commit -m 'Initial project version'</pre><!--</div attr= class="content">-
Git has a number of different transfer protocols you can use. The previous example uses the <c>https://</c> protocol, but you may also see <c>git://</c> or <c>user@server:path/to/repo.git</c>, which uses the SSH transfer protocol.
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

</paragraphs>
</subsection>

</subsection>

Expand Down Expand Up @@ -188,7 +188,7 @@ $ git commit -m 'Initial project version'</pre><!--</div attr= class="content">-

<!-- div attr= class="sect3"-->

<paragraphs xml:id="_checking_status">
<subsection xml:id="_checking_status">
<title>Checking the Status of Your Files</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -232,9 +232,9 @@ nothing added to commit but untracked files present (use "git add" to track)</pr
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_tracking_files">
<subsection xml:id="_tracking_files">
<title>Tracking New Files</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -267,9 +267,9 @@ Changes to be committed:
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_staging_modified_files">
<subsection xml:id="_staging_modified_files">
<title>Staging Modified Files</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -351,9 +351,9 @@ Changes to be committed:
modified: CONTRIBUTING.md</pre><!--</div attr= class="content">--><!--</div attr= class="listingblock">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_short_status">
<subsection xml:id="_short_status">
<title>Short Status</title>

<!-- div attr= class="paragraph"-->
Expand All @@ -376,9 +376,9 @@ M lib/simplegit.rb
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_ignoring">
<subsection xml:id="_ignoring">
<title>Ignoring Files</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -458,7 +458,7 @@ M lib/simplegit.rb

<!-- div attr= class="paragraph"-->
<p>
Glob patterns are like simplified regular expressions that shells use. An asterisk (<c>*</c>) matches zero or more characters; <c>[abc]</c> matches any character inside the brackets (in this case a, b, or c); a question mark (<c>?</c>) matches a single character; and brackets enclosing characters separated by a hyphen (<c>[0-9]</c>) matches any character between them (in this case 0 through 9). You can also use two asterisks to match nested directories; <c>a/**/z</c> would match <c>a/z</c>, <c>a/b/z</c>, <c>a/b/c/z</c>, and so on.
Glob patterns are like simplified regular expressions that shells use. An asterisk (<c>*</c>) matches zero or more characters; <c>[abc]</c> matches any character inside the brackets (in this case a, b, or c); a question mark (<c>?</c>) matches a single character; and brackets enclosing characters separated by a hyphen (<c>[0-9]</c>) matches any character between them (in this case 0 through 9).
<notation>
<usage><m>[ - ]</m></usage>
<description>brackets - encloses characters</description>
Expand All @@ -468,6 +468,13 @@ M lib/simplegit.rb
<description>asterisk - matches zero or more characters</description>
</notation>
</p><!--</div attr= class="paragraph">-->
<p>
You can also use two asterisks to match nested directories; <c>a/**/z</c> would match <c>a/z</c>, <c>a/b/z</c>, <c>a/b/c/z</c>, and so on.
<notation>
<usage><m>**</m></usage>
<description>double asterisk - matches characters in nested directories</description>
</notation>
</p>

<!-- div attr= class="paragraph"-->
<p>
Expand Down Expand Up @@ -512,9 +519,9 @@ doc/**/*.pdf</pre><!--</div attr= class="content">--><!--</div attr= class="list
</p><!--</div attr= class="paragraph">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_git_diff_staged">
<subsection xml:id="_git_diff_staged">
<title>Viewing Your Staged and Unstaged Changes</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -659,9 +666,9 @@ index 8ebb991..643e24f 100644
</p>

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_committing_changes">
<subsection xml:id="_committing_changes">
<title>Committing Your Changes</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -741,9 +748,9 @@ index 8ebb991..643e24f 100644
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_skipping_the_staging_area">
<subsection xml:id="_skipping_the_staging_area">
<title>Skipping the Staging Area</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -773,9 +780,9 @@ $ git commit -a -m 'Add new benchmarks'
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_removing_files">
<subsection xml:id="_removing_files">
<title>Removing Files</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -858,9 +865,9 @@ Changes to be committed:
</p>

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_git_mv">
<subsection xml:id="_git_mv">
<title>Moving Files</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -910,7 +917,7 @@ $ git add README</pre><!--</div attr= class="content">--><!--</div attr= class="
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->


</paragraphs>
</subsection>
</subsection>

<subsection xml:id="_viewing_history">
Expand Down Expand Up @@ -1039,7 +1046,7 @@ index a0a60ae..47c6340 100644

<!-- div attr= class="sect3"-->

<paragraphs xml:id="_showing_your_remotes">
<subsection xml:id="_showing_your_remotes">
<title>Showing Your Remotes</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -1097,9 +1104,9 @@ origin git@github.com:mojombo/grit.git (push)</pre><!--</div attr= class="con
</p><!--</div attr= class="paragraph">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_adding_remote_repositories">
<subsection xml:id="_adding_remote_repositories">
<title>Adding Remote Repositories</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -1140,9 +1147,9 @@ From https://github.com/paulboone/ticgit
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_fetching_and_pulling">
<subsection xml:id="_fetching_and_pulling">
<title>Fetching and Pulling from Your Remotes</title>

<!-- div attr= class="paragraph"-->
Expand Down Expand Up @@ -1186,9 +1193,9 @@ From https://github.com/paulboone/ticgit


<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

<paragraphs xml:id="_pushing_remotes">
<subsection xml:id="_pushing_remotes">
<title>Pushing to Your Remotes</title>

<!-- div attr= class="paragraph"-->
Expand All @@ -1206,7 +1213,7 @@ From https://github.com/paulboone/ticgit
</p><!--</div attr= class="paragraph">--><!--</div attr= class="sect3">-->

<!-- div attr= class="sect3"-->
</paragraphs>
</subsection>

</subsection>

Expand Down