summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-26 21:36:10 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-26 21:36:10 (GMT)
commit1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (patch)
tree319b38fbc0efc75d216bacccbeb53cc3ed42e50f /git-pull.sh
parent6a0dbb8a5c41770c2280de15c3202970c6515ccc (diff)
parent7d0c68871a86df0654454df047458836afa13129 (diff)
downloadgit-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.zip
git-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.tar.gz
git-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.tar.bz2
Merge branch 'jc/squash'
* jc/squash: git-merge --squash
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh
index bdd3939..aa8c208 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -8,7 +8,7 @@ USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <rep
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
. git-sh-setup
-strategy_args= no_summary= no_commit=
+strategy_args= no_summary= no_commit= squash=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
do
case "$1" in
@@ -17,6 +17,8 @@ do
no_summary=-n ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=--no-commit ;;
+ --sq|--squ|--squa|--squas|--squash)
+ squash=--squash ;;
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
--strateg=*|--strategy=*|\
-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
@@ -100,4 +102,5 @@ case "$strategy_args" in
esac
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
-git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head
+git-merge $no_summary $no_commit $squash $strategy_args \
+ "$merge_name" HEAD $merge_head