FIXME help for --squash option
Avery Pennarun committed
May 30, 2009 at 00:48 UTC
8e79043c47d69032a86e5587a69289304dd5ca23
1 file changed
+5
git-subtree.sh
+5
@@ -23,6 +23,8 @@ b,branch= create a new branch from the split subtree
23
ignore-joins ignore prior --rejoin commits
24
onto= try connecting new tree to an existing one
25
rejoin merge the new branch back into HEAD
26
+ options for 'merge' and 'pull'
27
+squash merge subtree changes as a single commit
28
"
29
eval $(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)
30
. git-sh-setup
@@ -36,6 +38,7 @@ onto=
38
rejoin=
39
ignore_joins=
40
annotate=
41
+squash=
42
43
debug()
44
{
@@ -80,6 +83,8 @@ while [ $# -gt 0 ]; do
83
--no-rejoin) rejoin= ;;
84
--ignore-joins) ignore_joins=1 ;;
85
--no-ignore-joins) ignore_joins= ;;
86
+ --squash) squash=1 ;;
87
+ --no-squash) squash= ;;
88
--) break ;;
89
*) die "Unexpected option: $opt" ;;
90
esac