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 /git-submodule.sh | |
| parent | 073bb8ebb8f6213080162ac5632ba853d2e8cceb (diff) | |
| parent | 204a8ffe67d2b789a34a14a06618a24756f7d9a9 (diff) | |
| download | git-f11f76b2bbcd23fe403744c055456a0bdf0981e7.tar.gz | |
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 'git-submodule.sh')
0 files changed, 0 insertions, 0 deletions