daemon: Set SO_REUSEADDR on listening sockets.

diff --git a/git-revert.sh b/git-revert.sh
index 9d499c4807e7e583e960232d93624303554e8b81..2c5870684c9a0993116a86a511a0e9998a27b621 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -3,29 +3,20 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 #
-. git-sh-setup
 
 case "$0" in
 *-revert* )
        test -t 0 && edit=-e
-       me=revert ;;
+       me=revert
+       USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
 *-cherry-pick* )
        edit=
-       me=cherry-pick ;;
+       me=cherry-pick
+       USAGE='[--edit] [-n] [-r] <commit-ish>'  ;;
 * )
        die "What are you talking about?" ;;
 esac
-
-usage () {
-       case "$me" in
-       cherry-pick)
-               die "usage git $me [--edit] [-n] [-r] <commit-ish>"
-               ;;
-       revert)
-               die "usage git $me [--edit | --no-edit] [-n] <commit-ish>"
-               ;;
-       esac
-}
+. git-sh-setup
 
 no_commit= replay=
 while case "$#" in 0) break ;; esac
@@ -102,6 +93,7 @@ revert)
 cherry-pick)
        pick_author_script='
        /^author /{
+               s/'\''/'\''\\'\'\''/g
                h
                s/^author \([^<]*\) <[^>]*> .*$/\1/
                s/'\''/'\''\'\'\''/g