diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:15 -0800 |
| commit | 4b1197ab5a74982fd09bda07d17325f1261975ee (patch) | |
| tree | fb0ef579db7da4d81531c2e722dc5227dd8a96b1 /Documentation/git-mergetool.txt | |
| parent | bb47eee9df438ea1934effb1fb8877deb4852821 (diff) | |
| parent | e685ea535312ae397ddfbf0fa2b4a90808217ca4 (diff) | |
| download | git-4b1197ab5a74982fd09bda07d17325f1261975ee.tar.gz | |
Merge branch 'yn/complete-date-format-options'
The completion script (in contrib/) learns that the "--date"
option of commands from the "git log" family takes "human" and
"auto" as valid values.
* yn/complete-date-format-options:
completion: add human and auto: date format
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions