]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/log-exclude-decoration-config'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2020 22:50:08 +0000 (15:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2020 22:50:08 +0000 (15:50 -0700)
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

1  2 
Documentation/git-log.txt
builtin/log.c
log-tree.c
refs.c

Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc refs.c
Simple merge