undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIXME help for --squash option

Browse Source
This commit is contained in:
Avery Pennarun 2009-05-30 00:48:07 -04:00
parent f4f29557e7
commit 8e79043c47
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-subtree.sh
View File

@ -23,6 +23,8 @@ b,branch= create a new branch from the split subtree
ignore-joins ignore prior --rejoin commits ignore-joins ignore prior --rejoin commits
onto= try connecting new tree to an existing one onto= try connecting new tree to an existing one
rejoin merge the new branch back into HEAD 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 $?) eval $(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)
. git-sh-setup . git-sh-setup
@ -36,6 +38,7 @@ onto=
rejoin= rejoin=
ignore_joins= ignore_joins=
annotate= annotate=
squash=
debug() debug()
{ {
@ -80,6 +83,8 @@ while [ $# -gt 0 ]; do
--no-rejoin) rejoin= ;; --no-rejoin) rejoin= ;;
--ignore-joins) ignore_joins=1 ;; --ignore-joins) ignore_joins=1 ;;
--no-ignore-joins) ignore_joins= ;; --no-ignore-joins) ignore_joins= ;;
--squash) squash=1 ;;
--no-squash) squash= ;;
--) break ;; --) break ;;
*) die "Unexpected option: $opt" ;; *) die "Unexpected option: $opt" ;;
esac esac