config.txt: move checkout.* 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
Oct 27, 2018 at 08:22 UTC
9140b410d2aece923a8b49368629d96bc8082f8b
2 files changed
+24
-23
Documentation/config.txt
+1
-23
@@ -305,29 +305,7 @@ include::config/branch.txt[]
305
306
include::config/browser.txt[]
307
308
-checkout.defaultRemote::
309
- When you run 'git checkout <something>' and only have one
310
- remote, it may implicitly fall back on checking out and
311
- tracking e.g. 'origin/<something>'. This stops working as soon
312
- as you have more than one remote with a '<something>'
313
- reference. This setting allows for setting the name of a
314
- preferred remote that should always win when it comes to
315
- disambiguation. The typical use-case is to set this to
316
- `origin`.
317
-+
318
-Currently this is used by linkgit:git-checkout[1] when 'git checkout
319
-<something>' will checkout the '<something>' branch on another remote,
320
-and by linkgit:git-worktree[1] when 'git worktree add' refers to a
321
-remote branch. This setting might be used for other checkout-like
322
-commands or functionality in the future.
323
-
324
-checkout.optimizeNewBranch::
325
- Optimizes the performance of "git checkout -b <new_branch>" when
326
- using sparse-checkout. When set to true, git will not update the
327
- repo based on the current sparse-checkout settings. This means it
328
- will not update the skip-worktree bit in the index nor add/remove
329
- files in the working directory to reflect the current sparse checkout
330
- settings nor will it show the local changes.
308
+include::config/checkout.txt[]
309
310
clean.requireForce::
311
A boolean to make git-clean do nothing unless given -f,
Documentation/config/checkout.txt
new
+23
@@ -0,0 +1,23 @@
1
+checkout.defaultRemote::
2
+ When you run 'git checkout <something>' and only have one
3
+ remote, it may implicitly fall back on checking out and
4
+ tracking e.g. 'origin/<something>'. This stops working as soon
5
+ as you have more than one remote with a '<something>'
6
+ reference. This setting allows for setting the name of a
7
+ preferred remote that should always win when it comes to
8
+ disambiguation. The typical use-case is to set this to
9
+ `origin`.
10
++
11
+Currently this is used by linkgit:git-checkout[1] when 'git checkout
12
+<something>' will checkout the '<something>' branch on another remote,
13
+and by linkgit:git-worktree[1] when 'git worktree add' refers to a
14
+remote branch. This setting might be used for other checkout-like
15
+commands or functionality in the future.
16
+
17
+checkout.optimizeNewBranch::
18
+ Optimizes the performance of "git checkout -b <new_branch>" when
19
+ using sparse-checkout. When set to true, git will not update the
20
+ repo based on the current sparse-checkout settings. This means it
21
+ will not update the skip-worktree bit in the index nor add/remove
22
+ files in the working directory to reflect the current sparse checkout
23
+ settings nor will it show the local changes.