diff --git a/source/sec_git_basics.ptx b/source/sec_git_basics.ptx index 708f218a..241900c5 100644 --- a/source/sec_git_basics.ptx +++ b/source/sec_git_basics.ptx @@ -39,7 +39,7 @@ - + Initializing a Repository in an Existing Directory @@ -105,9 +105,9 @@ $ git commit -m 'Initial project version' - + - + Cloning an Existing Repository @@ -148,7 +148,7 @@ $ git commit -m 'Initial project version' - + @@ -188,7 +188,7 @@ $ git commit -m 'Initial project version' - + Checking the Status of Your Files @@ -232,9 +232,9 @@ nothing added to commit but untracked files present (use "git add" to track) - + - + Tracking New Files @@ -267,9 +267,9 @@ Changes to be committed:

- + - + Staging Modified Files @@ -351,9 +351,9 @@ Changes to be committed: modified: CONTRIBUTING.md - + - + Short Status @@ -376,9 +376,9 @@ M lib/simplegit.rb

- + - + Ignoring Files @@ -458,7 +458,7 @@ M lib/simplegit.rb

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

+

+ You can also use two asterisks to match nested directories; a/**/z would match a/z, a/b/z, a/b/c/z, and so on. + + ** + double asterisk - matches characters in nested directories + +

@@ -512,9 +519,9 @@ doc/**/*.pdf - + - + Viewing Your Staged and Unstaged Changes @@ -659,9 +666,9 @@ index 8ebb991..643e24f 100644

- + - + Committing Your Changes @@ -741,9 +748,9 @@ index 8ebb991..643e24f 100644

- + - + Skipping the Staging Area @@ -773,9 +780,9 @@ $ git commit -a -m 'Add new benchmarks'

- + - + Removing Files @@ -858,9 +865,9 @@ Changes to be committed:

- + - + Moving Files @@ -910,7 +917,7 @@ $ git add README - + @@ -1039,7 +1046,7 @@ index a0a60ae..47c6340 100644 - + Showing Your Remotes @@ -1097,9 +1104,9 @@ origin git@github.com:mojombo/grit.git (push) - + - + Adding Remote Repositories @@ -1140,9 +1147,9 @@ From https://github.com/paulboone/ticgit

- + - + Fetching and Pulling from Your Remotes @@ -1186,9 +1193,9 @@ From https://github.com/paulboone/ticgit - + - + Pushing to Your Remotes @@ -1206,7 +1213,7 @@ From https://github.com/paulboone/ticgit

- +