Merge branch 'lt/apply' into next

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index b04f393bc4a15c6bba6485d4ef0c609158073ee2..ca4163402261f1d381750bc5317d5e405f72a91c 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -67,7 +67,7 @@ $ git diff HEAD^ HEAD <3>
 <1> instead of using the tip of the current branch, compare with the
 tip of "test" branch.
 <2> instead of comparing with the tip of "test" branch, compare with
-the tip of the curren branch, but limit the comparison to the
+the tip of the current branch, but limit the comparison to the
 file "test".
 <3> compare the version before the last commit and the last commit.
 ------------