FIXME help for --squash option

diff --git a/git-subtree.sh b/git-subtree.sh
index ea0294fb79d969b37bf15ca6b051227feb13f822..65b6348fe455e93f750787c2136b11e6d0526b99 100755 (executable)
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -23,6 +23,8 @@ b,branch=     create a new branch from the split subtree
 ignore-joins  ignore prior --rejoin commits
 onto=         try connecting new tree to an existing one
 rejoin        merge the new branch back into HEAD
 ignore-joins  ignore prior --rejoin commits
 onto=         try connecting new tree to an existing one
 rejoin        merge the new branch back into HEAD

+ options for 'merge' and 'pull'
+squash        merge subtree changes as a single commit

 "
 eval $(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)
 . git-sh-setup
 "
 eval $(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)
 . git-sh-setup


@@ -36,6 +38,7 @@ onto=
 rejoin=
 ignore_joins=
 annotate=
 rejoin=
 ignore_joins=
 annotate=

+squash=

 
 debug()
 {
 
 debug()
 {


@@ -80,6 +83,8 @@ while [ $# -gt 0 ]; do
                --no-rejoin) rejoin= ;;
                --ignore-joins) ignore_joins=1 ;;
                --no-ignore-joins) ignore_joins= ;;
                --no-rejoin) rejoin= ;;
                --ignore-joins) ignore_joins=1 ;;
                --no-ignore-joins) ignore_joins= ;;

+               --squash) squash=1 ;;
+               --no-squash) squash= ;;

                --) break ;;
                *) die "Unexpected option: $opt" ;;
        esac
                --) break ;;
                *) die "Unexpected option: $opt" ;;
        esac