diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:08 -0700 |
| commit | d3fc8dc53a7ef9f33a5d9604b382e24408a9b7be (patch) | |
| tree | 5f3a7e6ad3336d850083af8b24e38a2fffe089c9 /Documentation | |
| parent | 93d1f196a9b84f449ed405fe9c9c96320b6dffb0 (diff) | |
| parent | a6be5e6764aabd4b418f7f365254518ec44c38d8 (diff) | |
| download | git-d3fc8dc53a7ef9f33a5d9604b382e24408a9b7be.tar.gz | |
Merge branch 'ds/log-exclude-decoration-config'
The "--decorate-refs" and "--decorate-refs-exclude" options "git
log" takes have learned a companion configuration variable
log.excludeDecoration that sits at the lowest priority in the
family.
* ds/log-exclude-decoration-config:
log: add log.excludeDecoration config option
log-tree: make ref_filter_match() a helper method
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/log.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-log.txt | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index e9e1e397f3..208d5fdcaa 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -18,6 +18,12 @@ log.decorate:: names are shown. This is the same as the `--decorate` option of the `git log`. +log.excludeDecoration:: + Exclude the specified patterns from the log decorations. This is + similar to the `--decorate-refs-exclude` command-line option, but + the config option can be overridden by the `--decorate-refs` + option. + log.follow:: If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 619577f23b..20e6d21a74 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -43,7 +43,10 @@ OPTIONS If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it - doesn't match any of the patterns given to `--decorate-refs`. + doesn't match any of the patterns given to `--decorate-refs`. The + `log.excludeDecoration` config option allows excluding refs from + the decorations, but an explicit `--decorate-refs` pattern will + override a match in `log.excludeDecoration`. --source:: Print out the ref name given on the command line by which each |