@@ -11,9 +11,9 @@ can use three dots instead of two:
11
11
12
12
$ git diff master...test
13
13
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.
17
17
18
18
### What you will commit ###
19
19
@@ -30,12 +30,12 @@ If you want to see what _is_ staged for the next commit, you can run
30
30
$ git diff --cached
31
31
32
32
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.
34
34
Lastly, you can run
35
35
36
36
$ git diff HEAD
37
37
38
- which shows changes in the working tree since your last commit;
38
+ which shows changes in the working directory since your last commit;
39
39
what you would be committing if you run "git commit -a".
40
40
41
41
### More Diff Options ###
@@ -45,19 +45,19 @@ the project in another branch, you can run something like
45
45
46
46
$ git diff test
47
47
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* :
51
51
52
52
$ git diff HEAD -- ./lib
53
53
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.
57
57
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 .
61
61
62
62
$>git diff --stat
63
63
layout/book_index_template.html | 8 ++-
0 commit comments