diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-08-22 18:06:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-12 13:54:17 -0700 |
| commit | 047502994566f97777eb16fbff6dc9e6e96b9a0a (patch) | |
| tree | f9ada1c41673a5b69ac7d85bc2804c54c386fa53 /Documentation/config.txt | |
| parent | fb981ced71f29305aae068c66d2840aa83703e7b (diff) | |
| download | git-047502994566f97777eb16fbff6dc9e6e96b9a0a.tar.gz | |
config.txt: move pull part out to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ebb44a3955..4fae7b6b92 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2558,42 +2558,7 @@ protocol.version:: -- -pull.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). This setting overrides `merge.ff` when pulling. - -pull.rebase:: - When true, rebase branches on top of the fetched branch, instead - of merging the default branch from the default remote when "git - pull" is run. See "branch.<name>.rebase" for setting this on a - per-branch basis. -+ -When `merges`, pass the `--rebase-merges` option to 'git rebase' -so that the local merge commits are included in the rebase (see -linkgit:git-rebase[1] for details). -+ -When preserve, also pass `--preserve-merges` along to 'git rebase' -so that locally committed merge commits will not be flattened -by running 'git pull'. -+ -When the value is `interactive`, the rebase is run in interactive mode. -+ -*NOTE*: this is a possibly dangerous operation; do *not* use -it unless you understand the implications (see linkgit:git-rebase[1] -for details). - -pull.octopus:: - The default merge strategy to use when pulling multiple branches - at once. - -pull.twohead:: - The default merge strategy to use when pulling a single branch. +include::pull-config.txt[] push.default:: Defines the action `git push` should take if no refspec is |