From: Junio C Hamano Date: Sat, 28 Feb 2009 22:39:56 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.6.2~11 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12ef3d84393025af044869be7de4c8e8aa1e025f?ds=inline;hp=-c Merge branch 'maint' * maint: Documentation: minor grammatical fixes. added missing backtick in git-apply.txt --- 12ef3d84393025af044869be7de4c8e8aa1e025f diff --combined Documentation/git-apply.txt index 9400f6a5d0,32f2b85a10..05663768d7 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@@ -10,7 -10,7 +10,7 @@@ SYNOPSI -------- [verse] 'git apply' [--stat] [--numstat] [--summary] [--check] [--index] - [--apply] [--no-add] [--build-fake-ancestor ] [-R | --reverse] + [--apply] [--no-add] [--build-fake-ancestor=] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] [--whitespace=] @@@ -64,7 -64,7 +64,7 @@@ OPTION cached data, apply the patch, and store the result in the index, without using the working tree. This implies '--index'. ---build-fake-ancestor :: +--build-fake-ancestor=:: Newer 'git-diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if @@@ -159,7 -159,7 +159,7 @@@ on the command line, and ignored if the 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