diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-24 13:34:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-24 13:34:03 +0900 |
| commit | 4d6fb2beeb80f4899b0267d91c983c91772438f0 (patch) | |
| tree | 793d62db0b61f862d9cfcefe47de213cb1c1da57 /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'js/azure-ci-osx-fix' (diff) | |
| parent | repo-settings: read an int for index.version (diff) | |
| download | tgif-4d6fb2beeb80f4899b0267d91c983c91772438f0.tar.xz | |
Merge branch 'ds/feature-macros'
The codepath that reads the index.version configuration was broken
with a recent update, which has been corrected.
* ds/feature-macros:
repo-settings: read an int for index.version
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions