diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-26 14:38:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 14:38:47 -0700 |
| commit | c4e2a202f871f2ea28e7598befddf229f7cda9f5 (patch) | |
| tree | fea82563dc976003740e95c8ac9f1229fb5c87b3 /config.txt | |
| parent | 1dbca52d492eab38500f435fc9af5f463d3e9c95 (diff) | |
| download | git-htmldocs-c4e2a202f871f2ea28e7598befddf229f7cda9f5.tar.gz | |
Autogenerated HTML docs for v2.4.2-337-gfae4
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.txt b/config.txt index 0f668bbe1..5f76e8cf4 100644 --- a/config.txt +++ b/config.txt @@ -2061,7 +2061,7 @@ pull.ff:: 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). + command line). This setting overrides `merge.ff` when pulling. pull.rebase:: When true, rebase branches on top of the fetched branch, instead |