From: Nguyễn Thái Ngọc Duy Date: Sat, 27 Oct 2018 06:23:50 +0000 (+0200) Subject: config.txt: move worktree.* to a separate file X-Git-Tag: v2.20.0-rc0~59^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=649cf589117d5f3a4bf024a187f70f216ed9d114;p=thirdparty%2Fgit.git config.txt: move worktree.* to a separate file Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 10617d0a10..75b8f6964d 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 0000000000..b853798fc2 --- /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.