merge: refuse --commit with --squash
[gitweb.git] / contrib / fast-import /
drwxr-xr-x   parent (dest: contrib; base: 1d14d0c9949c02260fe4f8b3a54a1b5c605823a2)
-rwxr-xr-x 1451 git-import.perl
-rwxr-xr-x 724 git-import.sh
-rw-r--r-- 476 git-p4.README
-rwxr-xr-x 11140 import-directories.perl
-rwxr-xr-x 6197 import-tars.perl
-rwxr-xr-x 2241 import-zips.py