Skip to content

Commit 12ef3d8

Browse files
committed
Merge branch 'maint'
* maint: Documentation: minor grammatical fixes. added missing backtick in git-apply.txt
2 parents 749485f + dcc901b commit 12ef3d8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Documentation/git-add.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ $ git add Documentation/\\*.txt
136136
------------
137137
+
138138
Note that the asterisk `\*` is quoted from the shell in this
139-
example; this lets the command to include the files from
139+
example; this lets the command include the files from
140140
subdirectories of `Documentation/` directory.
141141

142142
* Considers adding content from all git-*.sh scripts:
@@ -145,7 +145,7 @@ subdirectories of `Documentation/` directory.
145145
$ git add git-*.sh
146146
------------
147147
+
148-
Because this example lets shell expand the asterisk (i.e. you are
148+
Because this example lets the shell expand the asterisk (i.e. you are
149149
listing the files explicitly), it does not consider
150150
`subdir/git-foo.sh`.
151151

@@ -198,8 +198,8 @@ one deletion).
198198

199199
update::
200200

201-
This shows the status information and gives prompt
202-
"Update>>". When the prompt ends with double '>>', you can
201+
This shows the status information and issues an "Update>>"
202+
prompt. When the prompt ends with double '>>', you can
203203
make more than one selection, concatenated with whitespace or
204204
comma. Also you can say ranges. E.g. "2-5 7,9" to choose
205205
2,3,4,5,7,9 from the list. If the second number in a range is
@@ -238,8 +238,8 @@ add untracked::
238238

239239
patch::
240240

241-
This lets you choose one path out of 'status' like selection.
242-
After choosing the path, it presents diff between the index
241+
This lets you choose one path out of a 'status' like selection.
242+
After choosing the path, it presents the diff between the index
243243
and the working tree file and asks you if you want to stage
244244
the change of each hunk. You can say:
245245

Documentation/git-apply.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ on the command line, and ignored if there is any include pattern.
159159
considered whitespace errors.
160160
+
161161
By default, the command outputs warning messages but applies the patch.
162-
When `git-apply is used for statistics and not applying a
162+
When `git-apply` is used for statistics and not applying a
163163
patch, it defaults to `nowarn`.
164164
+
165165
You can use different `<action>` to control this

0 commit comments

Comments
 (0)