Merge pull request #109 from progit/libgit2_file

libgit2 contains no files named benchmarks.rb

Author: ben

book/02-git-basics/sections/recording-changes.asc

@@ -86,7 +86,7 @@ The `git add` command takes a path name for either a file or a directory; if it'
 ==== Staging Modified Files
 
 Let's change a file that was already tracked.
-If you change a previously tracked file called ``benchmarks.rb'' and then run your `git status` command again, you get something that looks like this:
+If you change a previously tracked file called ``CONTRIBUTING.md'' and then run your `git status` command again, you get something that looks like this:
 
 [source,console]
 ----
@@ -101,68 +101,68 @@ Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)
 
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 
 ----
 
-The ``benchmarks.rb'' file appears under a section named ``Changed but not staged for commit'' – which means that a file that is tracked has been modified in the working directory but not yet staged.
+The ``CONTRIBUTING.md'' file appears under a section named ``Changed but not staged for commit'' – which means that a file that is tracked has been modified in the working directory but not yet staged.
 To stage it, you run the `git add` command. `git add` is a multipurpose command – you use it to begin tracking new files, to stage files, and to do other things like marking merge-conflicted files as resolved. It may be helpful to think of it more as ``add this content to the next commit'' rather than ``add this file to the project''.(((git commands, add)))
-Let's run `git add` now to stage the ``benchmarks.rb'' file, and then run `git status` again:
+Let's run `git add` now to stage the ``CONTRIBUTING.md'' file, and then run `git status` again:
 
 [source,console]
 ----
-$ git add benchmarks.rb
+$ git add CONTRIBUTING.md
 $ git status
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)
 
     new file:   README
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 
 ----
 
 Both files are staged and will go into your next commit.
-At this point, suppose you remember one little change that you want to make in `benchmarks.rb` before you commit it.
+At this point, suppose you remember one little change that you want to make in `CONTRIBUTING.md` before you commit it.
 You open it again and make that change, and you're ready to commit.
 However, let's run `git status` one more time:
 
 [source,console]
 ----
-$ vim benchmarks.rb
+$ vim CONTRIBUTING.md
 $ git status
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)
 
     new file:   README
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 
 Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)
 
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 
 ----
 
 What the heck?
-Now `benchmarks.rb` is listed as both staged _and_ unstaged.
+Now `CONTRIBUTING.md` is listed as both staged _and_ unstaged.
 How is that possible?
 It turns out that Git stages a file exactly as it is when you run the `git add` command.
-If you commit now, the version of `benchmarks.rb` as it was when you last ran the `git add` command is how it will go into the commit, not the version of the file as it looks in your working directory when you run `git commit`.
+If you commit now, the version of `CONTRIBUTING.md` as it was when you last ran the `git add` command is how it will go into the commit, not the version of the file as it looks in your working directory when you run `git commit`.
 If you modify a file after you run `git add`, you have to run `git add` again to stage the latest version of the file:
 
 [source,console]
 ----
-$ git add benchmarks.rb
+$ git add CONTRIBUTING.md
 $ git status
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)
 
     new file:   README
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 ----
 
 ==== Short Status
@@ -248,7 +248,7 @@ We'll cover `git diff` in more detail later, but you'll probably use it most oft
 And what have you staged that you are about to commit?
 Although `git status` answers those questions very generally by listing the file names, `git diff` shows you the exact lines added and removed – the patch, as it were.
 
-Let's say you edit and stage the `README` file again and then edit the `benchmarks.rb` file without staging it.
+Let's say you edit and stage the `README` file again and then edit the `CONTRIBUTING.md` file without staging it.
 If you run your `git status` command, you once again see something like this:
 
 [source,console]
@@ -264,18 +264,18 @@ Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)
 
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 ----
 
 To see what you've changed but not yet staged, type `git diff` with no other arguments:
 
 [source,console]
 ----
 $ git diff
-diff --git a/benchmarks.rb b/benchmarks.rb
+diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
 index 3cb747f..e445e28 100644
---- a/benchmarks.rb
-+++ b/benchmarks.rb
+--- a/CONTRIBUTING.md
++++ b/CONTRIBUTING.md
 @@ -36,6 +36,10 @@ def main
            @commit.parents[0].parents[0].parents[0]
          end
@@ -313,35 +313,35 @@ index 0000000..03902a1
 It's important to note that `git diff` by itself doesn't show all changes made since your last commit – only changes that are still unstaged.
 This can be confusing, because if you've staged all of your changes, `git diff` will give you no output.
 
-For another example, if you stage the `benchmarks.rb` file and then edit it, you can use `git diff` to see the changes in the file that are staged and the changes that are unstaged. If our environment looks like this:
+For another example, if you stage the `CONTRIBUTING.md` file and then edit it, you can use `git diff` to see the changes in the file that are staged and the changes that are unstaged. If our environment looks like this:
 
 [source,console]
 ----
-$ git add benchmarks.rb
-$ echo '# test line' >> benchmarks.rb
+$ git add CONTRIBUTING.md
+$ echo '# test line' >> CONTRIBUTING.md
 $ git status
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)
 
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 
 Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)
 
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 ----
 
 Now you can use `git diff` to see what is still unstaged
 
 [source,console]
 ----
 $ git diff
-diff --git a/benchmarks.rb b/benchmarks.rb
+diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
 index e445e28..86b2f7c 100644
---- a/benchmarks.rb
-+++ b/benchmarks.rb
+--- a/CONTRIBUTING.md
++++ b/CONTRIBUTING.md
 @@ -127,3 +127,4 @@ end
  main()
 
@@ -354,10 +354,10 @@ and `git diff --cached` to see what you've staged so far:
 [source,console]
 ----
 $ git diff --cached
-diff --git a/benchmarks.rb b/benchmarks.rb
+diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
 index 3cb747f..e445e28 100644
---- a/benchmarks.rb
-+++ b/benchmarks.rb
+--- a/CONTRIBUTING.md
++++ b/CONTRIBUTING.md
 @@ -36,6 +36,10 @@ def main
           @commit.parents[0].parents[0].parents[0]
         end
@@ -405,7 +405,7 @@ The editor displays the following text (this example is a Vim screen):
 # On branch master
 # Changes to be committed:
 #	new file:   README
-#	modified:   benchmarks.rb
+#	modified:   CONTRIBUTING.md
 #
 ~
 ~
@@ -451,15 +451,15 @@ Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)
 
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 
 no changes added to commit (use "git add" and/or "git commit -a")
 $ git commit -a -m 'added new benchmarks'
 [master 83e38c7] added new benchmarks
  1 file changed, 5 insertions(+), 0 deletions(-)
 ----
 
-Notice how you don't have to run `git add` on the ``benchmarks.rb'' file in this case before you commit.
+Notice how you don't have to run `git add` on the ``CONTRIBUTING.md'' file in this case before you commit.
 
 [[_removing_files]]
 ==== Removing Files

book/02-git-basics/sections/undoing.asc

@@ -49,17 +49,17 @@ Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)
 
     renamed:    README.md -> README
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 ----
 
 Right below the ``Changes to be committed'' text, it says use `git reset HEAD <file>...` to unstage.
-So, let's use that advice to unstage the `benchmarks.rb` file:
+So, let's use that advice to unstage the `CONTRIBUTING.md` file:
 
 [source,console]
 ----
-$ git reset HEAD benchmarks.rb
+$ git reset HEAD CONTRIBUTING.md
 Unstaged changes after reset:
-M	benchmarks.rb
+M	CONTRIBUTING.md
 $ git status
 On branch master
 Changes to be committed:
@@ -71,11 +71,11 @@ Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)
 
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 ----
 
 The command is a bit strange, but it works.
-The `benchmarks.rb` file is modified but once again unstaged.
+The `CONTRIBUTING.md` file is modified but once again unstaged.
 
 [NOTE]
 =====
@@ -86,7 +86,7 @@ For now this magic invocation is all you need to know about the `git reset` comm
 
 ==== Unmodifying a Modified File
 
-What if you realize that you don't want to keep your changes to the `benchmarks.rb` file?
+What if you realize that you don't want to keep your changes to the `CONTRIBUTING.md` file?
 How can you easily unmodify it – revert it back to what it looked like when you last committed (or initially cloned, or however you got it into your working directory)?
 Luckily, `git status` tells you how to do that, too.
 In the last example output, the unstaged area looks like this:
@@ -97,15 +97,15 @@ Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)
 
-    modified:   benchmarks.rb
+    modified:   CONTRIBUTING.md
 ----
 
 It tells you pretty explicitly how to discard the changes you've made.
 Let's do what it says:
 
 [source,console]
 ----
-$ git checkout -- benchmarks.rb
+$ git checkout -- CONTRIBUTING.md
 $ git status
 On branch master
 Changes to be committed: