diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-22 12:28:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-22 12:28:25 -0800 |
| commit | f11f76b2bbcd23fe403744c055456a0bdf0981e7 (patch) | |
| tree | bbcf114146443e2f5d5d79ec8ed5ce160e5aab8a /builtin/checkout-index.c | |
| parent | Merge branch 'es/blame-commit-info-fix' (diff) | |
| parent | merge-file: correctly open files when in a subdir (diff) | |
| download | git-f11f76b2bbcd23fe403744c055456a0bdf0981e7.tar.gz git-f11f76b2bbcd23fe403744c055456a0bdf0981e7.zip | |
Merge branch 'ab/merge-file-prefix'
"git merge-file" did not work correctly in a subdirectory.
* ab/merge-file-prefix:
merge-file: correctly open files when in a subdir
Diffstat (limited to 'builtin/checkout-index.c')
0 files changed, 0 insertions, 0 deletions