diff options
| author |  David Glasser <glasser@davidglasser.net> | 2017-10-17 09:45:15 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-10-18 09:10:15 +0900 |
| commit | 07c4984508865984fdfdedf2e1cdf86328221af4 (patch) | |
| tree | 30ec28a2b50879a665819d1506352100274a0b24 /Documentation/merge-strategies.txt | |
| parent | Git 2.14.2 (diff) | |
| download | tgif-07c4984508865984fdfdedf2e1cdf86328221af4.tar.xz | |
doc: list filter-branch subdirectory-filter first
The docs claim that filters are applied in the listed order, so
subdirectory-filter should come first.
For consistency, apply the same order to the SYNOPSIS and the script's usage, as
well as the switch while parsing arguments.
Add missing --prune-empty to the script's usage.
Signed-off-by: David Glasser <glasser@davidglasser.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions