Nguyễn Thái Ngọc Duy | 0475029 | 2018-08-22 18:06:00 +0200 | [diff] [blame] | 1 | pull.ff:: |
| 2 | By default, Git does not create an extra merge commit when merging |
| 3 | a commit that is a descendant of the current commit. Instead, the |
| 4 | tip of the current branch is fast-forwarded. When set to `false`, |
| 5 | this variable tells Git to create an extra merge commit in such |
| 6 | a case (equivalent to giving the `--no-ff` option from the command |
| 7 | line). When set to `only`, only such fast-forward merges are |
| 8 | allowed (equivalent to giving the `--ff-only` option from the |
| 9 | command line). This setting overrides `merge.ff` when pulling. |
| 10 | |
| 11 | pull.rebase:: |
| 12 | When true, rebase branches on top of the fetched branch, instead |
| 13 | of merging the default branch from the default remote when "git |
| 14 | pull" is run. See "branch.<name>.rebase" for setting this on a |
| 15 | per-branch basis. |
| 16 | + |
Bert Wesarg | 88f8576 | 2020-01-27 08:04:27 +0100 | [diff] [blame] | 17 | When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase' |
Nguyễn Thái Ngọc Duy | 0475029 | 2018-08-22 18:06:00 +0200 | [diff] [blame] | 18 | so that the local merge commits are included in the rebase (see |
| 19 | linkgit:git-rebase[1] for details). |
| 20 | + |
Bert Wesarg | 88f8576 | 2020-01-27 08:04:27 +0100 | [diff] [blame] | 21 | When the value is `interactive` (or just 'i'), the rebase is run in interactive |
| 22 | mode. |
Nguyễn Thái Ngọc Duy | 0475029 | 2018-08-22 18:06:00 +0200 | [diff] [blame] | 23 | + |
| 24 | *NOTE*: this is a possibly dangerous operation; do *not* use |
| 25 | it unless you understand the implications (see linkgit:git-rebase[1] |
| 26 | for details). |
| 27 | |
| 28 | pull.octopus:: |
| 29 | The default merge strategy to use when pulling multiple branches |
| 30 | at once. |
| 31 | |
| 32 | pull.twohead:: |
| 33 | The default merge strategy to use when pulling a single branch. |