From: Avery Pennarun <apenwarr@gmail.com>
Date: Sat, 30 May 2009 04:48:07 +0000 (-0400)
Subject: FIXME help for --squash option
X-Git-Tag: v1.7.11-rc0~176^2~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e79043c47d69032a86e5587a69289304dd5ca23;p=git.git

FIXME help for --squash option
---

diff --git a/git-subtree.sh b/git-subtree.sh
index ea0294fb7..65b6348fe 100755
--- 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
+ 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
@@ -36,6 +38,7 @@ onto=
 rejoin=
 ignore_joins=
 annotate=
+squash=
 
 debug()
 {
@@ -80,6 +83,8 @@ while [ $# -gt 0 ]; do
 		--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