Sync with maint

diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index 472a6808cd60899f4554e998b9fb8e4f3103aac2..ff487ff77d397207431c8e3d9e56f3c5da5a2791 100644 (file)
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -20,7 +20,7 @@ depending on the subcommand:
 'git reflog' ['show'] [log-options] [<ref>]
 'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]
        [--rewrite] [--updateref] [--stale-fix]
-       [--dry-run | -n] [--verbose] [--all | <refs>...]
+       [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]
 'git reflog delete' [--rewrite] [--updateref]
        [--dry-run | -n] [--verbose] ref@\{specifier\}...
 'git reflog exists' <ref>
@@ -72,6 +72,11 @@ Options for `expire`
 --all::
        Process the reflogs of all references.
 
+--single-worktree::
+       By default when `--all` is specified, reflogs from all working
+       trees are processed. This option limits the processing to reflogs
+       from the current working tree only.
+
 --expire=<time>::
        Prune entries older than the specified time. If this option is
        not specified, the expiration time is taken from the