Skip to content

Commit ca28040

Browse files
committed
Minor edits to "Comparing Commits - Git Diff" section (10 in source)
1 parent 298b31c commit ca28040

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

text/10_Comparing_Commits_Git_Diff/0_ Comparing_Commits_Git_Diff.markdown

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ can use three dots instead of two:
1111

1212
$ git diff master...test
1313

14-
linkgit:git-diff[1] is an incredibly useful tool for figuring out what has
15-
changed between any two points in your projects history, or to see what people
16-
are trying to introduce in new branches, etc.
14+
linkgit:git-diff[1] is an incredibly useful tool for figuring out what has
15+
changed between any two points in your project's history, or to see what
16+
people are trying to introduce in new branches, etc.
1717

1818
### What you will commit ###
1919

@@ -30,12 +30,12 @@ If you want to see what _is_ staged for the next commit, you can run
3030
$ git diff --cached
3131

3232
which will show you the difference between the index and your last commit;
33-
what you would be committing if you run "git commit" without "-a" option.
33+
what you would be committing if you run "git commit" without the "-a" option.
3434
Lastly, you can run
3535

3636
$ git diff HEAD
3737

38-
which shows changes in the working tree since your last commit;
38+
which shows changes in the working directory since your last commit;
3939
what you would be committing if you run "git commit -a".
4040

4141
### More Diff Options ###
@@ -45,19 +45,19 @@ the project in another branch, you can run something like
4545

4646
$ git diff test
4747

48-
This will show you what is different between your current content and the snapshot
49-
on the 'test' branch. You can also limit the comparison to a specific file or
50-
subdirectory by adding a *path limiter*
48+
This will show you what is different between your current working directory
49+
and the snapshot on the 'test' branch. You can also limit the comparison to a
50+
specific file or subdirectory by adding a *path limiter*:
5151

5252
$ git diff HEAD -- ./lib
5353

54-
That command will show the changes between the last commit
55-
(or, more accurately, the tip of the current branch) and limit the comparison
56-
to files in the 'lib' subdirectory.
54+
That command will show the changes between your current working directory and
55+
the last commit (or, more accurately, the tip of the current branch), limiting
56+
the comparison to files in the 'lib' subdirectory.
5757

58-
If you don't want to see the whole patch, you can add the '--stat' option, which
59-
will limit the output to which files have changed and a little text graph of
60-
how each file changed.
58+
If you don't want to see the whole patch, you can add the '--stat' option,
59+
which will limit the output to the files that have changed along with a little
60+
text graph depicting how many lines changed in each file.
6161

6262
$>git diff --stat
6363
layout/book_index_template.html | 8 ++-

0 commit comments

Comments
 (0)