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>
Nguyễn Thái Ngọc Duy committed
Aug 22, 2018 at 18:06 UTC
047502994566f97777eb16fbff6dc9e6e96b9a0a
2 files changed
+37
-36
Documentation/config.txt
+1
-36
@@ -2558,42 +2558,7 @@ protocol.version::
2558
2559
--
2560
2561
-pull.ff::
2562
- By default, Git does not create an extra merge commit when merging
2563
- a commit that is a descendant of the current commit. Instead, the
2564
- tip of the current branch is fast-forwarded. When set to `false`,
2565
- this variable tells Git to create an extra merge commit in such
2566
- a case (equivalent to giving the `--no-ff` option from the command
2567
- line). When set to `only`, only such fast-forward merges are
2568
- allowed (equivalent to giving the `--ff-only` option from the
2569
- command line). This setting overrides `merge.ff` when pulling.
2570
-
2571
-pull.rebase::
2572
- When true, rebase branches on top of the fetched branch, instead
2573
- of merging the default branch from the default remote when "git
2574
- pull" is run. See "branch.<name>.rebase" for setting this on a
2575
- per-branch basis.
2576
-+
2577
-When `merges`, pass the `--rebase-merges` option to 'git rebase'
2578
-so that the local merge commits are included in the rebase (see
2579
-linkgit:git-rebase[1] for details).
2580
-+
2581
-When preserve, also pass `--preserve-merges` along to 'git rebase'
2582
-so that locally committed merge commits will not be flattened
2583
-by running 'git pull'.
2584
-+
2585
-When the value is `interactive`, the rebase is run in interactive mode.
2586
-+
2587
-*NOTE*: this is a possibly dangerous operation; do *not* use
2588
-it unless you understand the implications (see linkgit:git-rebase[1]
2589
-for details).
2590
-
2591
-pull.octopus::
2592
- The default merge strategy to use when pulling multiple branches
2593
- at once.
2594
-
2595
-pull.twohead::
2596
- The default merge strategy to use when pulling a single branch.
2561
+include::pull-config.txt[]
2562
2563
push.default::
2564
Defines the action `git push` should take if no refspec is
Documentation/pull-config.txt
new
+36
@@ -0,0 +1,36 @@
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
++
17
+When `merges`, pass the `--rebase-merges` option to 'git rebase'
18
+so that the local merge commits are included in the rebase (see
19
+linkgit:git-rebase[1] for details).
20
++
21
+When preserve, also pass `--preserve-merges` along to 'git rebase'
22
+so that locally committed merge commits will not be flattened
23
+by running 'git pull'.
24
++
25
+When the value is `interactive`, the rebase is run in interactive mode.
26
++
27
+*NOTE*: this is a possibly dangerous operation; do *not* use
28
+it unless you understand the implications (see linkgit:git-rebase[1]
29
+for details).
30
+
31
+pull.octopus::
32
+ The default merge strategy to use when pulling multiple branches
33
+ at once.
34
+
35
+pull.twohead::
36
+ The default merge strategy to use when pulling a single branch.