summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-09-23 22:51:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-24 00:14:03 (GMT)
commitd08af0ad745869a4fe36bc8df4f9804edfb74eb9 (patch)
treee12eb7e4ce147d4f4c386a8da97c3748950c84ca /git-merge.sh
parentaec7b362ad07e1a2c58051c8db653dabffee8960 (diff)
downloadgit-d08af0ad745869a4fe36bc8df4f9804edfb74eb9.zip
git-d08af0ad745869a4fe36bc8df4f9804edfb74eb9.tar.gz
git-d08af0ad745869a4fe36bc8df4f9804edfb74eb9.tar.bz2
git-merge: add support for --commit and --no-squash
These options can be used to override --no-commit and --squash, which is needed since --no-commit and --squash now can be specified as default merge options in $GIT_DIR/config. The change also introduces slightly different behavior for --no-commit: when specified, it explicitly overrides --squash. Earlier, 'git merge --squash --no-commit' would result in a squashed merge (i.e. no $GIT_DIR/MERGE_HEAD was created) but with this patch the command will behave as if --squash hadn't been specified. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh
index a35b151..a0fc606 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
-USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
+USAGE='[-n] [--summary] [--[no-]commit] [--[no-]squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
SUBDIRECTORY_OK=Yes
. git-sh-setup
@@ -128,8 +128,12 @@ parse_option () {
show_diffstat=t ;;
--sq|--squ|--squa|--squas|--squash)
squash=t no_commit=t ;;
+ --no-sq|--no-squ|--no-squa|--no-squas|--no-squash)
+ squash= no_commit= ;;
+ --c|--co|--com|--comm|--commi|--commit)
+ squash= no_commit= ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
- no_commit=t ;;
+ squash= no_commit=t ;;
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
--strateg=*|--strategy=*|\
-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)