summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
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 /Documentation/merge-options.txt
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 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index d64c259..0464a34 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -10,6 +10,10 @@
not autocommit, to give the user a chance to inspect and
further tweak the merge result before committing.
+--commit::
+ Perform the merge and commit the result. This option can
+ be used to override --no-commit.
+
--squash::
Produce the working tree and index state as if a real
merge happened, but do not actually make a commit or
@@ -19,6 +23,10 @@
top of the current branch whose effect is the same as
merging another branch (or more in case of an octopus).
+--no-squash::
+ Perform the merge and commit the result. This option can
+ be used to override --squash.
+
-s <strategy>, \--strategy=<strategy>::
Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried.