summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Ingmar Vanhassel <ingmar@exherbo.org>2009-10-20 12:29:32 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-21 17:15:43 -0700
commit2a94552887ecbaa8b848a92eb607e032d77c8a2c (patch)
treeb66142c6dd45bdf349ef33d3f9439e900ac2abe3 /Documentation/merge-strategies.txt
parentGIT 1.6.5 (diff)
downloadtgif-2a94552887ecbaa8b848a92eb607e032d77c8a2c.tar.xz
import-tars: Add support for tarballs compressed with lzma, xz
Also handle the extensions .tlz and .txz, aliases for .tar.lzma and .tar.xz respectively. Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org> Liked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions