X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-config.txt;h=19a8917b83f4ff111e9eec0767c3261a2c39d995;hb=7b73d828f02e885f4e9619ff1a2b43e3d8dcf259;hp=697824cbabdd4bab487b8c943277d3a1d703e59a;hpb=7eef32d9f4883d983e284f5c508a92833bd89d11;p=git.git

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 697824cba..19a8917b8 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -222,7 +222,7 @@ Given a .git/config like this:
 
 	; Our diff algorithm
 	[diff]
-		external = "/usr/local/bin/gnu-diff -u"
+		external = /usr/local/bin/diff-wrapper
 		renames = true
 
 	; Proxy settings
@@ -279,7 +279,7 @@ If you want to know all the values for a multivar, do:
 % git config --get-all core.gitproxy
 ------------
 
-If you like to live dangerous, you can replace *all* core.gitproxy by a
+If you like to live dangerously, you can replace *all* core.gitproxy by a
 new one with
 
 ------------