Merge pull request #91 from randomecho/slide-dolla-dolla-symbols

Matthew McCullough · Matthew McCullough · commit 2a4cb3ff712d · 2014-04-21T12:28:34.000-04:00
Fix missing dollar sign symbol on command line syntax in slides
diff --git a/slides/_posts/foundations/alias/0001-01-01-Creating-an-Alias.md b/slides/_posts/foundations/alias/0001-01-01-Creating-an-Alias.md
@@ -12,8 +12,8 @@ Command shortcuts
 
 Alias for status as 's'
 
-	git config --global alias.s "status -u -s"
+	$ git config --global alias.s "status -u -s"
 
 Alias showing all branches to 'br'
 
-	git config --global alias.br "branch -a"
+	$ git config --global alias.br "branch -a"
diff --git a/slides/_posts/foundations/branch/0001-01-01-Listing.md b/slides/_posts/foundations/branch/0001-01-01-Listing.md
@@ -7,18 +7,18 @@ tags:
 ---
 
 	# List (Local) Branches
-	git branch
+	$ git branch
 
 	
 
 {% capture notes %}
 # List remote branches
-git branch -r
+$ git branch -r
 
 # List all branches
-git branch -a
+$ git branch -a
 
 # List upstream branches
-git ls-remote origin
+$ git ls-remote origin
 {% endcapture %}
 {% include hydeslides/core/notes %}
diff --git a/slides/_posts/foundations/branch/0002-01-01-Creating.md b/slides/_posts/foundations/branch/0002-01-01-Creating.md
@@ -6,14 +6,14 @@ tags:
 - short-branch
 ---
 
-    git branch <branchname> <ref>
+    $ git branch <branchname> <ref>
 
     # Create & Checkout branch
-    git checkout -b <branchname> <ref>
+    $ git checkout -b <branchname> <ref>
 
 
 {% capture notes %}
-`git branch <BRANCHNAME> HEAD`
+`$ git branch <BRANCHNAME> HEAD`
 
 HEAD is assumed when REF left off
 
diff --git a/slides/_posts/foundations/branch/0003-01-01-Deleting.md b/slides/_posts/foundations/branch/0003-01-01-Deleting.md
@@ -7,7 +7,7 @@ tags:
 ---
 
 	# Delete if branch is merged with upstream
-	git branch -d <branch-name>
+	$ git branch -d <branch-name>
 
 	# Delete regardless of merge condition
-	git branch -D <branch-name>
+	$ git branch -D <branch-name>
diff --git a/slides/_posts/foundations/branch/0005-01-01-Renaming.md b/slides/_posts/foundations/branch/0005-01-01-Renaming.md
@@ -5,5 +5,5 @@ tags: ['branch']
 ---
 
 	# Change branch name
-	git branch -m 
+	$ git branch -m 
         <orig-branch-name> <new-branch-name>
diff --git a/slides/_posts/foundations/checkout/0003-01-01-Switching-Branches.md b/slides/_posts/foundations/checkout/0003-01-01-Switching-Branches.md
@@ -4,7 +4,7 @@ layout: slide
 tags: ['checkout']
 ---
 
-    $ git checkout <branch-name>
+  $ git checkout <branch-name>
 
 
 
diff --git a/slides/_posts/foundations/config/0001-01-01-User-Information.md b/slides/_posts/foundations/config/0001-01-01-User-Information.md
@@ -3,8 +3,8 @@ chapter: Config
 layout: slide
 tags: ['config']
 ---
-	git config --global user.name 
+	$ git config --global user.name 
         "<your-name>"
-	git config --global user.email 
+	$ git config --global user.email 
         "<you>@<your-domain>.com"
 
diff --git a/slides/_posts/foundations/config/0002-01-01-Scopes.md b/slides/_posts/foundations/config/0002-01-01-Scopes.md
@@ -7,15 +7,15 @@ tags: ['config']
 
 __system__ configuration
 
-	git config --system <name> <value>
+	$ git config --system <name> <value>
 
 __user__ configuration
 
-	git config --global <name> <value>
+	$ git config --global <name> <value>
 	
 __repository__ configuration
 
-	git config --local <name> <value>
+	$ git config --local <name> <value>
 
 
 
diff --git a/slides/_posts/foundations/config/0003-01-01-Viewing-All.md b/slides/_posts/foundations/config/0003-01-01-Viewing-All.md
@@ -4,7 +4,7 @@ layout: slide
 tags: ['config']
 ---
 
-	git config --list
+	$ git config --list
 
 {% capture notes %}
 
diff --git a/slides/_posts/foundations/config/0006-01-01-Useful-Settings.md b/slides/_posts/foundations/config/0006-01-01-Useful-Settings.md
@@ -5,22 +5,22 @@ tags: ['config']
 ---
 
 	# Colorize console output
-	git config --global color.ui auto
+	$ git config --global color.ui auto
 
 	# Force files to be LF on Mac/Linux
-	git config --global core.autocrlf input
+	$ git config --global core.autocrlf input
 
 	# Force Windows to convert to CRLF
 	# on checkout and to LF on `add`
-	git config --global core.autocrlf true
+	$ git config --global core.autocrlf true
 
 
 {% capture notes %}
-Warn, but allow line ending conversion to proceed (the default)
-git config --global core.safecrlf warn
+# Warn, but allow line ending conversion to proceed (the default)
+$ git config --global core.safecrlf warn
 
-Do not allow line ending conversion to proceed
-git config --global core.safecrlf true
+# Do not allow line ending conversion to proceed
+$ git config --global core.safecrlf true
 
 http://help.github.com/dealing-with-lineending
 {% endcapture %}
diff --git a/slides/_posts/foundations/diff/0004-01-01-Useful-Options.md b/slides/_posts/foundations/diff/0004-01-01-Useful-Options.md
@@ -4,9 +4,9 @@ layout: slide
 tags: ['diff']
 ---
 
-	git diff --color-words
-	git diff --word-diff
-	git diff --stat
+	$ git diff --color-words
+	$ git diff --word-diff
+	$ git diff --stat
 
 
 
@@ -21,6 +21,6 @@ tags: ['diff']
 	# Unknown (X)
 	# Pairing Broken (B)
 	# Only show changes in modified files
-	git diff --diff-filter=M
+	$ git diff --diff-filter=M
 {% endcapture %}
 {% include hydeslides/core/notes %}
diff --git a/slides/_posts/foundations/gui/0001-01-01-Native-Tools.md b/slides/_posts/foundations/gui/0001-01-01-Native-Tools.md
@@ -5,7 +5,7 @@ tags: ['gui']
 ---
 
 	# Committing
-	git gui
+	$ git gui
 
 	# Browsing
-	gitk -a
+	$ gitk -a
diff --git a/slides/_posts/foundations/gui/0003-01-01-Diff-Tool.md b/slides/_posts/foundations/gui/0003-01-01-Diff-Tool.md
@@ -5,8 +5,8 @@ tags: ['gui']
 ---
 
 	# Diff Tool
-	git config diff.tool "myaraxis"
-	git config difftool.myaraxis.cmd 
+	$ git config diff.tool "myaraxis"
+	$ git config difftool.myaraxis.cmd 
         araxisgitdiff 
         ONE $LOCAL THREE FOUR $REMOTE
-	git config difftool.prompt false
+	$ git config difftool.prompt false
diff --git a/slides/_posts/foundations/gui/0004-01-01-Merge-Tool.md b/slides/_posts/foundations/gui/0004-01-01-Merge-Tool.md
@@ -5,6 +5,6 @@ tags: ['gui']
 ---
 
 	# Merge Tool
-	git config merge.tool "araxis"
-	git config mergetool.prompt false
+	$ git config merge.tool "araxis"
+	$ git config mergetool.prompt false
 	
diff --git a/slides/_posts/foundations/init/0002-01-01-Repository-from-Existing-Dir.md b/slides/_posts/foundations/init/0002-01-01-Repository-from-Existing-Dir.md
@@ -17,8 +17,8 @@ tags: ['init']
 If you already have an existing repository:
 
 * Change directory into the root project
-* type git init
-*  Add all files
+* Type `git init`
+* Add all files
 
 {% endcapture %}
 {% include hydeslides/core/notes %}
diff --git a/slides/_posts/foundations/log/0001-01-01-Show-All-History.md b/slides/_posts/foundations/log/0001-01-01-Show-All-History.md
@@ -6,5 +6,5 @@ tags:
 - short-log
 ---
 
-	git log
+	$ git log
 
diff --git a/slides/_posts/foundations/log/0002-01-01-Show-History-Patches.md b/slides/_posts/foundations/log/0002-01-01-Show-History-Patches.md
@@ -5,7 +5,7 @@ tags: ['log']
 ---
 
 	# Show all history with filenames
-	git log --stat
+	$ git log --stat
 
 	# Show all history with patches
-	git log --patch
+	$ git log --patch
diff --git a/slides/_posts/foundations/log/0003-01-01-History-Formatting.md b/slides/_posts/foundations/log/0003-01-01-History-Formatting.md
@@ -5,19 +5,19 @@ tags: ['log']
 ---
 
 	# Control the output format
-	git log --format=full
+	$ git log --format=full
 
 	# Control the output format
-	git log --format=fuller
+	$ git log --format=fuller
 
 	# Control the output format
-	git log --format=raw
+	$ git log --format=raw
 
 {% capture notes %}
 # Control the output format
-git log --format=email
+$ git log --format=email
 
 # Control the output format
-git log --format=format:<pattern>
+$ git log --format=format:<pattern>
 {% endcapture %}
 {% include hydeslides/core/notes %}
diff --git a/slides/_posts/foundations/log/0004-01-01-Limiting-Output.md b/slides/_posts/foundations/log/0004-01-01-Limiting-Output.md
@@ -5,8 +5,8 @@ tags: ['log']
 ---
 
 	# Limit the output entries
-	git log -<n>
+	$ git log -<n>
 	
-	git log -1
-	git log -3
-	git log -5
+	$ git log -1
+	$ git log -3
+	$ git log -5
diff --git a/slides/_posts/foundations/log/0005-01-01-Additional-Options.md b/slides/_posts/foundations/log/0005-01-01-Additional-Options.md
@@ -6,5 +6,5 @@ tags:
 - short-log
 ---
 
-	git log --word-diff --patch
-	git log --graph
+	$ git log --word-diff --patch
+	$ git log --graph
diff --git a/slides/_posts/foundations/log/0006-01-01-Searching-Commits.md b/slides/_posts/foundations/log/0006-01-01-Searching-Commits.md
@@ -4,9 +4,9 @@ layout: slide
 tags: ['log']
 ---
 
-	git log -S <string-in-patch>
+	$ git log -S <string-in-patch>
 
-	git log --grep="regex-pattern"
+	$ git log --grep="regex-pattern"
 
 
 {% capture notes %}
diff --git a/slides/_posts/foundations/merge/0001-01-01-Basics.md b/slides/_posts/foundations/merge/0001-01-01-Basics.md
@@ -6,8 +6,8 @@ tags:
 - short-merge
 ---
 
-	git checkout master
-	git merge <featurebranch> -m<message>
+	$ git checkout master
+	$ git merge <featurebranch> -m<message>
 
 {% capture notes %}
 (diagram: recursive merge)
diff --git a/slides/_posts/foundations/merge/0004-01-01-Conflicting-Merges.md b/slides/_posts/foundations/merge/0004-01-01-Conflicting-Merges.md
@@ -5,5 +5,5 @@ tags:
 - merge
 - short-merge
 ---
-	git add <conflicting-file>
-	git commit -m"<commit-message>"
+	$ git add <conflicting-file>
+	$ git commit -m"<commit-message>"
diff --git a/slides/_posts/foundations/merge/0005-01-01-Resolution-Selection.md b/slides/_posts/foundations/merge/0005-01-01-Resolution-Selection.md
@@ -4,5 +4,5 @@ layout: slide
 tags: ['merge']
 ---
 
-	git checkout --ours <file>
-	git checkout --theirs <file>
+	$ git checkout --ours <file>
+	$ git checkout --theirs <file>
diff --git a/slides/_posts/foundations/network/0002-01-01-Adding-a-Remote.md b/slides/_posts/foundations/network/0002-01-01-Adding-a-Remote.md
@@ -4,7 +4,7 @@ layout: slide
 tags: ['network']
 ---
 
-	git remote add <name> <url>
+	$ git remote add <name> <url>
 
 
 {% capture notes %}
diff --git a/slides/_posts/foundations/network/0005-01-01-Listing-Remote-Branches.md b/slides/_posts/foundations/network/0005-01-01-Listing-Remote-Branches.md
@@ -5,10 +5,10 @@ tags: ['network']
 ---
 
 	# List remote branches
-	git branch -r
+	$ git branch -r
 
 	# List all branches
-	git branch -a
+	$ git branch -a
 
 
 
diff --git a/slides/_posts/foundations/network/0006-01-01-Sharing-with-a-Push.md b/slides/_posts/foundations/network/0006-01-01-Sharing-with-a-Push.md
@@ -4,7 +4,7 @@ layout: slide
 tags: ['network']
 ---
 
-	git push <remote> <branch>
+	$ git push <remote> <branch>
 
 {% capture notes %}
 * Send code to an upstream server
diff --git a/slides/_posts/foundations/network/0007-01-01-Pull-vs-Fetch.md b/slides/_posts/foundations/network/0007-01-01-Pull-vs-Fetch.md
@@ -4,9 +4,9 @@ layout: slide
 tags: ['network']
 ---
 
-	git pull <remote> <branch>
+	$ git pull <remote> <branch>
 
-	git fetch <remote> <branch>
+	$ git fetch <remote> <branch>
 
 
 {% capture notes %}
diff --git a/slides/_posts/foundations/preparation/0001-01-01-Installing-and-Verifying.md b/slides/_posts/foundations/preparation/0001-01-01-Installing-and-Verifying.md
@@ -4,6 +4,6 @@ layout: slide
 tags: ['preparation']
 ---
 
-* Installing git
+* Installing Git
 * Verifying & checking version
-  * `git --version`
+  * `$ git --version`
diff --git a/slides/_posts/foundations/rebase/0003-01-01-Against-a-Branch.md b/slides/_posts/foundations/rebase/0003-01-01-Against-a-Branch.md
diff --git a/slides/_posts/foundations/rebase/0005-01-01-Interactive-Command.md b/slides/_posts/foundations/rebase/0005-01-01-Interactive-Command.md
diff --git a/slides/_posts/foundations/reflog/0001-01-01-Restoring-by-Action.md b/slides/_posts/foundations/reflog/0001-01-01-Restoring-by-Action.md
diff --git a/slides/_posts/foundations/revert/0001-01-01-Restore-a-Prior-Commit.md b/slides/_posts/foundations/revert/0001-01-01-Restore-a-Prior-Commit.md
diff --git a/slides/_posts/foundations/rm-mv/0007-01-01-Move-and-Stage.md b/slides/_posts/foundations/rm-mv/0007-01-01-Move-and-Stage.md
diff --git a/slides/_posts/foundations/rm-mv/0008-01-01-Similarity-Index.md b/slides/_posts/foundations/rm-mv/0008-01-01-Similarity-Index.md
diff --git a/slides/_posts/foundations/stash/0002-01-01-Stash-Commands.md b/slides/_posts/foundations/stash/0002-01-01-Stash-Commands.md
diff --git a/slides/_posts/foundations/stash/0003-01-01-Stash-Commands.md b/slides/_posts/foundations/stash/0003-01-01-Stash-Commands.md
diff --git a/slides/_posts/foundations/stash/0004-01-01-Stash-Commands.md b/slides/_posts/foundations/stash/0004-01-01-Stash-Commands.md
diff --git a/slides/_posts/foundations/tag/0003-01-01-Transmitting-Tags.md b/slides/_posts/foundations/tag/0003-01-01-Transmitting-Tags.md
