From eb006ccfca019b4e96210310d9f823d050127b22 Mon Sep 17 00:00:00 2001 From: Danijel Tasov Date: Sat, 28 Feb 2009 21:03:54 +0100 Subject: added missing backtick in git-apply.txt Signed-off-by: Danijel Tasov Signed-off-by: Junio C Hamano --- Documentation/git-apply.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index feb51f124a..44e1968a1c 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -147,7 +147,7 @@ discouraged. 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 `` to control this -- cgit v1.2.3 From dcc901bc2926f92558a854430570123b4152451d Mon Sep 17 00:00:00 2001 From: "David J. Mellor" Date: Sat, 28 Feb 2009 13:12:59 -0800 Subject: Documentation: minor grammatical fixes. Signed-off-by: David J. Mellor Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 7c129cb24f..e4c711bbd2 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: -- cgit v1.2.3