Merge branch 'js/maint-pretty-mailmap' into maint

diff --git a/git-lost-found.sh b/git-lost-found.sh
index c0b00e0fd143ab9d96933f2d39baa94e7e50e0ef..9cedaf80ceac1d4100adf3cfb152c76c7f945e4d 100755 (executable)
--- a/git-lost-found.sh
+++ b/git-lost-found.sh
@@ -2,8 +2,11 @@
 
 USAGE=''
 SUBDIRECTORY_OK='Yes'
+OPTIONS_SPEC=
 . git-sh-setup
 
+echo "WARNING: '$0' is deprecated in favor of 'git fsck --lost-found'" >&2
+
 if [ "$#" != "0" ]
 then
     usage