Skip to content

Commit

Permalink
Merge branch 'maint-1.6.0' into maint
Browse files Browse the repository at this point in the history
* maint-1.6.0:
  added missing backtick in git-apply.txt
  • Loading branch information
Junio C Hamano committed Feb 28, 2009
2 parents e43a6fd + eb006cc commit 325e9bc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/git-apply.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 325e9bc

Please sign in to comment.