From b59cdffd7e3d791ee289ebb46d7109ad3d51d7ea Mon Sep 17 00:00:00 2001 From: Aaron Lipman Date: Fri, 18 Sep 2020 17:58:42 -0400 Subject: Doc: prefer more specific file name Change filters.txt to ref-reachability-filters.txt in order to avoid squatting on a file name that might be useful for another purpose. Signed-off-by: Aaron Lipman Signed-off-by: Junio C Hamano --- Documentation/filters.txt | 7 ------- Documentation/git-branch.txt | 2 +- Documentation/git-for-each-ref.txt | 2 +- Documentation/git-tag.txt | 2 +- Documentation/ref-reachability-filters.txt | 7 +++++++ 5 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 Documentation/filters.txt create mode 100644 Documentation/ref-reachability-filters.txt (limited to 'Documentation') diff --git a/Documentation/filters.txt b/Documentation/filters.txt deleted file mode 100644 index 9bae46d84c..0000000000 --- a/Documentation/filters.txt +++ /dev/null @@ -1,7 +0,0 @@ -When combining multiple `--contains` and `--no-contains` filters, only -references that contain at least one of the `--contains` commits and -contain none of the `--no-contains` commits are shown. - -When combining multiple `--merged` and `--no-merged` filters, only -references that are reachable from at least one of the `--merged` -commits and from none of the `--no-merged` commits are shown. diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 290b90639c..ace4ad3da8 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -368,7 +368,7 @@ serve four related but different purposes: - `--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD. -include::filters.txt[] +include::ref-reachability-filters.txt[] SEE ALSO -------- diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 7b9cf0ef1f..2962f85a50 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -409,7 +409,7 @@ will be reported. NOTES ----- -include::filters.txt[] +include::ref-reachability-filters.txt[] SEE ALSO -------- diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index cc667d7d01..56656d1be6 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -380,7 +380,7 @@ include::date-formats.txt[] NOTES ----- -include::filters.txt[] +include::ref-reachability-filters.txt[] SEE ALSO -------- diff --git a/Documentation/ref-reachability-filters.txt b/Documentation/ref-reachability-filters.txt new file mode 100644 index 0000000000..9bae46d84c --- /dev/null +++ b/Documentation/ref-reachability-filters.txt @@ -0,0 +1,7 @@ +When combining multiple `--contains` and `--no-contains` filters, only +references that contain at least one of the `--contains` commits and +contain none of the `--no-contains` commits are shown. + +When combining multiple `--merged` and `--no-merged` filters, only +references that are reachable from at least one of the `--merged` +commits and from none of the `--no-merged` commits are shown. -- cgit v1.2.3