diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:56:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:56:50 -0800 |
| commit | dda8f4bf2b159d6f8e6d816e35418708cc6f21a1 (patch) | |
| tree | 103c94df0d3f8b7793120d9fc43b22b9c61bea4e /Documentation/merge-options.txt | |
| parent | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint (diff) | |
| parent | t4201: use ISO8859-1 rather than ISO-8859-1 (diff) | |
| download | tgif-dda8f4bf2b159d6f8e6d816e35418708cc6f21a1.tar.xz | |
Merge branch 'uk/maint-shortlog-encoding' into maint
* uk/maint-shortlog-encoding:
t4201: use ISO8859-1 rather than ISO-8859-1
shortlog: respect commit encoding
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions