diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-01-12 11:38:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-12 11:38:28 -0800 |
| commit | c00e1c59d8be28acb505e66eb32757c95b1aa840 (patch) | |
| tree | 2ca990ef544aed67c579929d72947c63e04fb0b4 /merge.c | |
| parent | Merge branch 'cc/bisect-rev-parsing' (diff) | |
| parent | checkout-index: fix --temp relative path mangling (diff) | |
| download | tgif-c00e1c59d8be28acb505e66eb32757c95b1aa840.tar.xz | |
Merge branch 'es/checkout-index-temp'
"git checkout-index --temp=$target $path" did not work correctly
for paths outside the current subdirectory in the project.
* es/checkout-index-temp:
checkout-index: fix --temp relative path mangling
t2004: demonstrate broken relative path printing
t2004: standardize file naming in symlink test
t2004: drop unnecessary write-tree/read-tree
t2004: modernize style
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions