builtin/merge-file.c: use error_errno()

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 952dfdfef098ca00b7976ef9d549401f171514f6..036edfb099c367262f34d2c1275ac5079a1e0914 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -158,3 +158,11 @@ endif::git-pull[]
        by default when it is attached to a terminal, unless -q
        is specified. This flag forces progress status even if the
        standard error stream is not directed to a terminal.
+
+-4::
+--ipv4::
+       Use IPv4 addresses only, ignoring IPv6 addresses.
+
+-6::
+--ipv6::
+       Use IPv6 addresses only, ignoring IPv4 addresses.