diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-02-28 14:39:56 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-28 14:39:56 -0800 |
commit | 12ef3d84393025af044869be7de4c8e8aa1e025f (patch) | |
tree | b449bafb9b162a4f8045dffaea71f28518cc2c4b | |
parent | 749485f6225455eefd4a2af31e2c98068f20464d (diff) | |
parent | dcc901bc2926f92558a854430570123b4152451d (diff) | |
download | git-12ef3d84393025af044869be7de4c8e8aa1e025f.tar.gz git-12ef3d84393025af044869be7de4c8e8aa1e025f.tar.xz |
Merge branch 'maint'
* maint:
Documentation: minor grammatical fixes.
added missing backtick in git-apply.txt
-rw-r--r-- | Documentation/git-add.txt | 12 | ||||
-rw-r--r-- | Documentation/git-apply.txt | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 7c129cb24..e4c711bbd 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -136,7 +136,7 @@ $ git add Documentation/\\*.txt ------------ + Note that the asterisk `\*` is quoted from the shell in this -example; this lets the command to include the files from +example; this lets the command include the files from subdirectories of `Documentation/` directory. * Considers adding content from all git-*.sh scripts: @@ -145,7 +145,7 @@ subdirectories of `Documentation/` directory. $ git add git-*.sh ------------ + -Because this example lets shell expand the asterisk (i.e. you are +Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not consider `subdir/git-foo.sh`. @@ -198,8 +198,8 @@ one deletion). update:: - This shows the status information and gives prompt - "Update>>". When the prompt ends with double '>>', you can + This shows the status information and issues an "Update>>" + prompt. When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. "2-5 7,9" to choose 2,3,4,5,7,9 from the list. If the second number in a range is @@ -238,8 +238,8 @@ add untracked:: patch:: - This lets you choose one path out of 'status' like selection. - After choosing the path, it presents diff between the index + This lets you choose one path out of a 'status' like selection. + After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage the change of each hunk. You can say: diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 9400f6a5d..05663768d 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -159,7 +159,7 @@ on the command line, and ignored if there is any include pattern. considered whitespace errors. + By default, the command outputs warning messages but applies the patch. -When `git-apply is used for statistics and not applying a +When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`. + You can use different `<action>` to control this |