diff options
| author | Aaron Lipman <alipman88@gmail.com> | 2020-09-15 22:08:40 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-16 12:38:10 -0700 |
| commit | 21bf933928c02372633b88aa6c4d9d71271d42b3 (patch) | |
| tree | e2ad37586b8eef4cb8bee34ff495ed4d7aed0c46 /Documentation/git-branch.txt | |
| parent | 415af72b174802a45300039ef2bc1127d48dc0c0 (diff) | |
| download | git-21bf933928c02372633b88aa6c4d9d71271d42b3.tar.gz | |
ref-filter: allow merged and no-merged filters
Enable ref-filter to process multiple merged and no-merged filters, and
extend functionality to git branch, git tag and git for-each-ref. This
provides an easy way to check for branches that are "graduation
candidates:"
$ git branch --no-merged master --merged next
If passed more than one merged (or more than one no-merged) filter, refs
must be reachable from any one of the merged commits, and reachable from
none of the no-merged commits.
Signed-off-by: Aaron Lipman <alipman88@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
| -rw-r--r-- | Documentation/git-branch.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index aa5e4da142..290b90639c 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git branch' [--color[=<when>] | --no-color] [--show-current] [-v [--abbrev=<length> | --no-abbrev]] [--column[=<options>] | --no-column] [--sort=<key>] - [(--merged | --no-merged) [<commit>]] + [--merged [<commit>]] [--no-merged [<commit>]] [--contains [<commit>]] [--no-contains [<commit>]] [--points-at <object>] [--format=<format>] [(-r | --remotes) | (-a | --all)] @@ -252,13 +252,11 @@ start-point is either a local or remote-tracking branch. --merged [<commit>]:: Only list branches whose tips are reachable from the - specified commit (HEAD if not specified). Implies `--list`, - incompatible with `--no-merged`. + specified commit (HEAD if not specified). Implies `--list`. --no-merged [<commit>]:: Only list branches whose tips are not reachable from the - specified commit (HEAD if not specified). Implies `--list`, - incompatible with `--merged`. + specified commit (HEAD if not specified). Implies `--list`. <branchname>:: The name of the branch to create or delete. |