diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:46:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:46:23 -0700 |
| commit | 36a45b4fa4cff868632162d4e3d00e1579298910 (patch) | |
| tree | be0324914b3490bd4bdcabcbee287622e5fcd665 /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| parent | tests: check git does not barf on merge.ff values for future versions of git (diff) | |
| download | tgif-36a45b4fa4cff868632162d4e3d00e1579298910.tar.xz | |
Merge branch 'mg/merge-ff-config'
* mg/merge-ff-config:
tests: check git does not barf on merge.ff values for future versions of git
merge: introduce merge.ff configuration variable
Conflicts:
t/t7600-merge.sh
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-config.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 8920258baa..861bd6f553 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -16,6 +16,16 @@ merge.defaultToUpstream:: to their corresponding remote tracking branches, and the tips of these tracking branches are merged. +merge.ff:: + By default, git does not create an extra merge commit when merging + a commit that is a descendant of the current commit. Instead, the + tip of the current branch is fast-forwarded. When set to `false`, + this variable tells git to create an extra merge commit in such + a case (equivalent to giving the `--no-ff` option from the command + line). When set to `only`, only such fast-forward merges are + allowed (equivalent to giving the `--ff-only` option from the + command line). + merge.log:: In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the |