rebase: allow "-" short-hand for the previous branch

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 81064507b6fbdc95751d2046c3d9b77e0fe3ebfe..5f4d7939ed1ec267e7f282624e5bb480e72d7a33 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2030,6 +2030,10 @@ receive.updateserverinfo::
        If set to true, git-receive-pack will run git-update-server-info
        after receiving data from git-push and updating refs.
 
+receive.shallowupdate::
+       If set to true, .git/shallow can be updated when new refs
+       require new shallow roots. Otherwise those refs are rejected.
+
 remote.pushdefault::
        The remote to push to by default.  Overrides
        `branch.<name>.remote` for all branches, and is overridden by
@@ -2091,8 +2095,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>::