summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-11-25 12:58:48 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-26 14:21:15 -0800
commit30a3318ac06c639f0ccb25b3abf627b3120c4dc9 (patch)
treec5263b386d1105611fcd5503c1c0acc82a03f4be /git-merge-one-file.sh
parentmark contributed hooks executable (diff)
downloadtgif-30a3318ac06c639f0ccb25b3abf627b3120c4dc9.tar.xz
contrib: remove git-p4import
The git p4import documentation has suggested git p4 as a better alternative for more than 6 years. (According to the mailing list discussion when it was moved to contrib/, git-p4import has serious bugs --- e.g., its incremental mode just doesn't work.) Since then, git p4 has been actively developed and was promoted to a standard git command alongside git svn. Searches on google.com/trends and stackoverflow suggest that no one is looking for git-p4import any more. Remove it. Noticed while considering marking the contrib/p4import/git-p4import.py script executable as part of a wider sweep. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions