Try to be consistent with capitalization in the documentation
Signed-off-by: Steve Hoelzer <shoelzer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Steve Hoelzer committed
Aug 1, 2007 at 10:43 UTC
434e6ef89d73dcc812b3a44dfaff0ca8204a206e
4 files changed
+26
-26
Documentation/git-branch.txt
+2
-2
@@ -134,8 +134,8 @@ $ git branch -d -r origin/todo origin/html origin/man <1>
134
$ git branch -D test <2>
135
------------
136
+
137
-<1> delete remote-tracking branches "todo", "html", "man"
138
-<2> delete "test" branch even if the "master" branch does not have all
137
+<1> Delete remote-tracking branches "todo", "html", "man"
138
+<2> Delete "test" branch even if the "master" branch does not have all
139
commits from test branch.
140
141
Documentation/git-diff.txt
+11
-11
@@ -76,10 +76,10 @@ $ git diff --cached <2>
76
$ git diff HEAD <3>
77
------------
78
+
79
-<1> changes in the working tree not yet staged for the next commit.
80
-<2> changes between the index and your last commit; what you
79
+<1> Changes in the working tree not yet staged for the next commit.
80
+<2> Changes between the index and your last commit; what you
81
would be committing if you run "git commit" without "-a" option.
82
-<3> changes in the working tree since your last commit; what you
82
+<3> Changes in the working tree since your last commit; what you
83
would be committing if you run "git commit -a"
84
85
Comparing with arbitrary commits::
@@ -90,12 +90,12 @@ $ git diff HEAD -- ./test <2>
90
$ git diff HEAD^ HEAD <3>
91
------------
92
+
93
-<1> instead of using the tip of the current branch, compare with the
93
+<1> Instead of using the tip of the current branch, compare with the
94
tip of "test" branch.
95
-<2> instead of comparing with the tip of "test" branch, compare with
95
+<2> Instead of comparing with the tip of "test" branch, compare with
96
the tip of the current branch, but limit the comparison to the
97
file "test".
98
-<3> compare the version before the last commit and the last commit.
98
+<3> Compare the version before the last commit and the last commit.
99
100
101
Limiting the diff output::
@@ -106,11 +106,11 @@ $ git diff --name-status <2>
106
$ git diff arch/i386 include/asm-i386 <3>
107
------------
108
+
109
-<1> show only modification, rename and copy, but not addition
109
+<1> Show only modification, rename and copy, but not addition
110
nor deletion.
111
-<2> show only names and the nature of change, but not actual
111
+<2> Show only names and the nature of change, but not actual
112
diff output.
113
-<3> limit diff output to named subtrees.
113
+<3> Limit diff output to named subtrees.
114
115
Munging the diff output::
116
+
@@ -119,9 +119,9 @@ $ git diff --find-copies-harder -B -C <1>
119
$ git diff -R <2>
120
------------
121
+
122
-<1> spend extra cycles to find renames, copies and complete
122
+<1> Spend extra cycles to find renames, copies and complete
123
rewrites (very expensive).
124
-<2> output diff in reverse.
124
+<2> Output diff in reverse.
125
126
127
Author
Documentation/git-merge.txt
+5
-5
@@ -107,11 +107,11 @@ pull after you are done and ready.
107
108
When things cleanly merge, these things happen:
109
110
-1. the results are updated both in the index file and in your
111
- working tree,
112
-2. index file is written out as a tree,
113
-3. the tree gets committed, and
114
-4. the `HEAD` pointer gets advanced.
110
+1. The results are updated both in the index file and in your
111
+ working tree;
112
+2. Index file is written out as a tree;
113
+3. The tree gets committed; and
114
+4. The `HEAD` pointer gets advanced.
115
116
Because of 2., we require that the original state of the index
117
file to match exactly the current `HEAD` commit; otherwise we
Documentation/git-reset.txt
+8
-8
@@ -63,7 +63,7 @@ $ git commit -a -c ORIG_HEAD <3>
63
<1> This is most often done when you remembered what you
64
just committed is incomplete, or you misspelled your commit
65
message, or both. Leaves working tree as it was before "reset".
66
-<2> make corrections to working tree files.
66
+<2> Make corrections to working tree files.
67
<3> "reset" copies the old head to .git/ORIG_HEAD; redo the
68
commit by starting with its log message. If you do not need to
69
edit the message further, you can give -C option instead.
@@ -106,17 +106,17 @@ $ git reset <3>
106
$ git pull git://info.example.com/ nitfol <4>
107
------------
108
+
109
-<1> you are happily working on something, and find the changes
109
+<1> You are happily working on something, and find the changes
110
in these files are in good order. You do not want to see them
111
when you run "git diff", because you plan to work on other files
112
and changes with these files are distracting.
113
-<2> somebody asks you to pull, and the changes sounds worthy of merging.
114
-<3> however, you already dirtied the index (i.e. your index does
113
+<2> Somebody asks you to pull, and the changes sounds worthy of merging.
114
+<3> However, you already dirtied the index (i.e. your index does
115
not match the HEAD commit). But you know the pull you are going
116
to make does not affect frotz.c nor filfre.c, so you revert the
117
index changes for these two files. Your changes in working tree
118
remain there.
119
-<4> then you can pull and merge, leaving frotz.c and filfre.c
119
+<4> Then you can pull and merge, leaving frotz.c and filfre.c
120
changes still in the working tree.
121
122
Undo a merge or pull::
@@ -133,15 +133,15 @@ Fast forward
133
$ git reset --hard ORIG_HEAD <4>
134
------------
135
+
136
-<1> try to update from the upstream resulted in a lot of
136
+<1> Try to update from the upstream resulted in a lot of
137
conflicts; you were not ready to spend a lot of time merging
138
right now, so you decide to do that later.
139
<2> "pull" has not made merge commit, so "git reset --hard"
140
which is a synonym for "git reset --hard HEAD" clears the mess
141
from the index file and the working tree.
142
-<3> merge a topic branch into the current branch, which resulted
142
+<3> Merge a topic branch into the current branch, which resulted
143
in a fast forward.
144
-<4> but you decided that the topic branch is not ready for public
144
+<4> But you decided that the topic branch is not ready for public
145
consumption yet. "pull" or "merge" always leaves the original
146
tip of the current branch in ORIG_HEAD, so resetting hard to it
147
brings your index file and the working tree back to that state,