New --dirstat=lines mode, doing dirstat analysis based on diffstat

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ce17805509801d812511418a026e4733c05a8968..480dd0a8617ced1f7bf24cda0bf23b7fc2c6c4f3 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -641,7 +641,7 @@ branch.<name>.remote::
 
 branch.<name>.merge::
        Defines, together with branch.<name>.remote, the upstream branch
-       for the given branch. It tells 'git fetch'/'git pull' which
+       for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which
        branch to merge and can also affect 'git push' (see push.default).
        When in branch <name>, it tells 'git fetch' the default
        refspec to be marked for merging in FETCH_HEAD. The value is