Merge branch 'ow/stash-with-ifs'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 81064507b6fbdc95751d2046c3d9b77e0fe3ebfe..ed5985319089e287b5ada6353d42b1e81568290c 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2091,8 +2091,8 @@ remote.<name>.vcs::
 
 remote.<name>.prune::
        When set to true, fetching from this remote by default will also
-       remove any remote-tracking branches which no longer exist on the
-       remote (as if the `--prune` option was give on the command line).
+       remove any remote-tracking references that no longer exist on the
+       remote (as if the `--prune` option was given on the command line).
        Overrides `fetch.prune` settings, if any.
 
 remotes.<group>::