From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 06/11] config.txt: move pull part out to a separate file
Date: Wed, 22 Aug 2018 18:06:00 +0200 [thread overview]
Message-ID: <20180822160605.21864-7-pclouds@gmail.com> (raw)
In-Reply-To: <20180822160605.21864-1-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/config.txt | 37 +----------------------------------
Documentation/pull-config.txt | 36 ++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 36 deletions(-)
create mode 100644 Documentation/pull-config.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4b1e9e830d..609b407afc 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2549,42 +2549,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
diff --git a/Documentation/pull-config.txt b/Documentation/pull-config.txt
new file mode 100644
index 0000000000..bb23a9947d
--- /dev/null
+++ b/Documentation/pull-config.txt
@@ -0,0 +1,36 @@
+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.
--
2.19.0.rc0.335.ga73d156e9c
next prev parent reply other threads:[~2018-08-22 16:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-22 16:05 [PATCH/RFC 00/11] Break down Documentation/config.txt Nguyễn Thái Ngọc Duy
2018-08-22 16:05 ` [PATCH 01/11] config.txt: follow camelCase naming Nguyễn Thái Ngọc Duy
2018-08-22 16:05 ` [PATCH 02/11] config.txt: move fetch part out to a separate file Nguyễn Thái Ngọc Duy
2018-08-22 16:05 ` [PATCH 03/11] config.txt: move format " Nguyễn Thái Ngọc Duy
2018-08-22 16:05 ` [PATCH 04/11] config.txt: move gitcvs " Nguyễn Thái Ngọc Duy
2018-08-22 16:05 ` [PATCH 05/11] config.txt: move gui " Nguyễn Thái Ngọc Duy
2018-08-22 16:06 ` Nguyễn Thái Ngọc Duy [this message]
2018-08-22 16:06 ` [PATCH 07/11] config.txt: move push " Nguyễn Thái Ngọc Duy
2018-08-22 16:06 ` [PATCH 08/11] config.txt: move receive " Nguyễn Thái Ngọc Duy
2018-08-22 16:06 ` [PATCH 09/11] config.txt: move sendemail " Nguyễn Thái Ngọc Duy
2018-08-22 16:06 ` [PATCH 10/11] config.txt: move sequence.editor out of "core" part Nguyễn Thái Ngọc Duy
2018-08-22 16:06 ` [PATCH 11/11] config.txt: move submodule part out to a separate file Nguyễn Thái Ngọc Duy
2018-08-22 16:28 ` [PATCH/RFC 00/11] Break down Documentation/config.txt Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180822160605.21864-7-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).