Cumulative update of merge-recursive in C

diff --git a/git-push.sh b/git-push.sh
index 706db9933e7a3d418a0bc77a743695464901b800..21775fc21ae6668b04972ef942b2d90a789f4af6 100755 (executable)
--- a/git-push.sh
+++ b/git-push.sh
@@ -8,6 +8,7 @@ USAGE='[--all] [--tags] [--force] <repository> [<refspec>...]'
 has_all=
 has_force=
 has_exec=
+has_thin=--thin
 remote=
 do_tags=
 
@@ -22,6 +23,10 @@ do
                has_force=--force ;;
        --exec=*)
                has_exec="$1" ;;
+       --thin)
+               ;; # noop
+       --no-thin)
+               has_thin= ;;
        -*)
                 usage ;;
         *)
@@ -58,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
@@ -72,6 +77,7 @@ set x "$remote" "$@"; shift
 test "$has_all" && set x "$has_all" "$@" && shift
 test "$has_force" && set x "$has_force" "$@" && shift
 test "$has_exec" && set x "$has_exec" "$@" && shift
+test "$has_thin" && set x "$has_thin" "$@" && shift
 
 case "$remote" in
 http://* | https://*)