Merge branch 'jc/filter-commit'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index bb2fbc324e6fa93a639b31668a7a030ece7787f0..98c1f3e2e32e71047d6f0f6cf982e207117c64e2 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -119,6 +119,13 @@ apply.whitespace::
        Tells `git-apply` how to handle whitespaces, in the same way
        as the '--whitespace' option. See gitlink:git-apply[1].
 
+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).