diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:23:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:05 +0900 |
| commit | 649cf589117d5f3a4bf024a187f70f216ed9d114 (patch) | |
| tree | 1f1fc63adc7eda5e86af07359940ea201d5d92a6 | |
| parent | config.txt: move web.* to a separate file (diff) | |
| download | git-649cf589117d5f3a4bf024a187f70f216ed9d114.tar.gz git-649cf589117d5f3a4bf024a187f70f216ed9d114.zip | |
config.txt: move worktree.* 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>
| -rw-r--r-- | Documentation/config.txt | 10 | ||||
| -rw-r--r-- | Documentation/config/worktree.txt | 9 |
2 files changed, 10 insertions, 9 deletions
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. |