diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-28 14:47:52 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 14:47:52 +0900 |
| commit | a515136c523cca1d4c5ea2b3c46b3f26bbd22639 (patch) | |
| tree | 1b10df0b1a21ea0164040b5ff7c47a9fb979a8ad /git-merge-resolve.sh | |
| parent | Sync with 2.14.2 (diff) | |
| parent | describe: fix matching to actually match all patterns (diff) | |
| download | tgif-a515136c523cca1d4c5ea2b3c46b3f26bbd22639.tar.xz | |
Merge branch 'jk/describe-omit-some-refs'
"git describe --match" learned to take multiple patterns in v2.13
series, but the feature ignored the patterns after the first one
and did not work at all. This has been fixed.
* jk/describe-omit-some-refs:
describe: fix matching to actually match all patterns
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions