Merge branch 'maint-1.6.0' into maint

gitster · gitster · commit 325e9bca3733 · 2009-02-28T14:05:09.000-08:00
* maint-1.6.0:
  added missing backtick in git-apply.txt
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ on the command line, and ignored if there is any include pattern.`
`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