lock_ref_sha1(): do not sometimes error() and sometimes die().

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04c5094fdd4c5e66b186107c0f64d3a82e1e8aa5..98c1f3e2e32e71047d6f0f6cf982e207117c64e2 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -122,6 +122,10 @@ apply.whitespace::
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.
 
+branch.<name>.merge::
+       When in branch <name>, it tells `git fetch` the default remote branch
+       to be merged.
+
 pager.color::
        A boolean to enable/disable colored output when the pager is in
        use (default is true).