freshlybakedca.ke
Git fork
Merge branch 'maint'
* maint:
Documentation: minor grammatical fixes.
added missing backtick in git-apply.txt
+6
-6
Documentation/git-add.txt
+6
-6
Documentation/git-add.txt
···
136
136
------------
137
137
+
138
138
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
140
140
subdirectories of `Documentation/` directory.
141
141
142
142
* Considers adding content from all git-*.sh scripts:
···
145
145
$ git add git-*.sh
146
146
------------
147
147
+
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
149
149
listing the files explicitly), it does not consider
150
150
`subdir/git-foo.sh`.
151
151
···
198
198
199
199
update::
200
200
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
203
203
make more than one selection, concatenated with whitespace or
204
204
comma. Also you can say ranges. E.g. "2-5 7,9" to choose
205
205
2,3,4,5,7,9 from the list. If the second number in a range is
···
238
238
239
239
patch::
240
240
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
243
243
and the working tree file and asks you if you want to stage
244
244
the change of each hunk. You can say:
245
245
+1
-1
Documentation/git-apply.txt
+1
-1
Documentation/git-apply.txt
···
159
159
considered whitespace errors.
160
160
+
161
161
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
163
163
patch, it defaults to `nowarn`.
164
164
+
165
165
You can use different `<action>` to control this