From 649cf589117d5f3a4bf024a187f70f216ed9d114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sat, 27 Oct 2018 08:23:50 +0200 Subject: [PATCH] config.txt: move worktree.* to a separate file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- Documentation/config.txt | 10 +--------- Documentation/config/worktree.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/config/worktree.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 10617d0a10d0a1..75b8f6964d0405 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -435,12 +435,4 @@ include::config/versionsort.txt[] include::config/web.txt[] -worktree.guessRemote:: - With `add`, if no branch argument, and neither of `-b` nor - `-B` nor `--detach` are given, the command defaults to - creating a new branch from HEAD. If `worktree.guessRemote` is - set to true, `worktree add` tries to find a remote-tracking - branch whose name uniquely matches the new branch name. If - such a branch exists, it is checked out and set as "upstream" - for the new branch. If no such match can be found, it falls - back to creating a new branch from the current HEAD. +include::config/worktree.txt[] diff --git a/Documentation/config/worktree.txt b/Documentation/config/worktree.txt new file mode 100644 index 00000000000000..b853798fc2b159 --- /dev/null +++ b/Documentation/config/worktree.txt @@ -0,0 +1,9 @@ +worktree.guessRemote:: + With `add`, if no branch argument, and neither of `-b` nor + `-B` nor `--detach` are given, the command defaults to + creating a new branch from HEAD. If `worktree.guessRemote` is + set to true, `worktree add` tries to find a remote-tracking + branch whose name uniquely matches the new branch name. If + such a branch exists, it is checked out and set as "upstream" + for the new branch. If no such match can be found, it falls + back to creating a new branch from the current HEAD.