Cumulative update of merge-recursive in C

diff --git a/git-push.sh b/git-push.sh
index 73dcf067cb2cb6c74ce0a51b055470b5c46222e4..21775fc21ae6668b04972ef942b2d90a789f4af6 100755 (executable)
--- a/git-push.sh
+++ b/git-push.sh
@@ -8,7 +8,7 @@ USAGE='[--all] [--tags] [--force] <repository> [<refspec>...]'
 has_all=
 has_force=
 has_exec=
-has_thin=
+has_thin=--thin
 remote=
 do_tags=
 
@@ -24,7 +24,9 @@ do
        --exec=*)
                has_exec="$1" ;;
        --thin)
-               has_thin="$1" ;;
+               ;; # noop
+       --no-thin)
+               has_thin= ;;
        -*)
                 usage ;;
         *)
@@ -61,7 +63,7 @@ esac
 shift ;# away the initial 'x'
 
 # $# is now 0 if there was no explicit refspec on the command line
-# and there was no defalt refspec to push from remotes/ file.
+# and there was no default refspec to push from remotes/ file.
 # we will let git-send-pack to do its "matching refs" thing.
 
 case "$remote" in