diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:14 -0800 |
| commit | dd0c256b67d1b128655c42ae126fa3397b1f9ede (patch) | |
| tree | a2c7abcf6d0ccc8a89f2185070343d6402a4b7f4 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'po/http-push-error-message' (diff) | |
| parent | read-cache: don't write index twice if we can't write shared index (diff) | |
| download | tgif-dd0c256b67d1b128655c42ae126fa3397b1f9ede.tar.xz | |
Merge branch 'nd/shared-index-fix'
Code clean-up.
* nd/shared-index-fix:
read-cache: don't write index twice if we can't write shared index
read-cache.c: move tempfile creation/cleanup out of write_shared_index
read-cache.c: change type of "temp" in write_shared_index()
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions