merged issue with gcp and gnu-coreutils's cp/gcp

Love the product here but I ran into an issue with the git plugin on my FreeBSD 9.1 box.  The alias for git-cherry-pick was set to "gcp" and that conflicts with the GUN coreutils version of the 'cp' command executable which is also named "gcp."  This can cause some frustration when you're trying to figure out why the git command is coming up when all you want to do is copy some files ;)