summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-03 10:05:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-03 10:05:58 (GMT)
commite66273a6abb8e9cd0967d52113e29c8014a255f8 (patch)
tree6f17cc631f26ba74a7a94156e03e3add7ec0711c /Documentation/config.txt
parent9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2 (diff)
parentd66424c4ac661c69640765260235452499d80378 (diff)
downloadgit-e66273a6abb8e9cd0967d52113e29c8014a255f8.zip
git-e66273a6abb8e9cd0967d52113e29c8014a255f8.tar.gz
git-e66273a6abb8e9cd0967d52113e29c8014a255f8.tar.bz2
Merge branch 'lh/merge'
* lh/merge: git-merge: add --ff and --no-ff options git-merge: add support for --commit and --no-squash git-merge: add support for branch.<name>.mergeoptions git-merge: refactor option parsing git-merge: fix faulty SQUASH_MSG Add test-script for git-merge porcelain
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index eebb0b6..971fd9f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -337,6 +337,12 @@ branch.<name>.merge::
branch.<name>.merge to the desired branch, and use the special setting
`.` (a period) for branch.<name>.remote.
+branch.<name>.mergeoptions::
+ Sets default options for merging into branch <name>. The syntax and
+ supported options are equal to that of gitlink:git-merge[1], but
+ option values containing whitespace characters are currently not
+ supported.
+
clean.requireForce::
A boolean to make git-clean do nothing unless given -f or -n. Defaults
to false.