Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> --- Documentation/config.txt | 27 ++------------------------- Documentation/stash-config.txt | 9 +++++++++ Documentation/tag-config.txt | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 Documentation/stash-config.txt create mode 100644 Documentation/tag-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index b7df6a8311..4b1efe0a95 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -664,34 +664,11 @@ include::ssh-config.txt[] include::status-config.txt[] -stash.showPatch:: - If this is set to true, the `git stash show` command without an - option will show the stash entry in patch form. Defaults to false. - See description of 'show' command in linkgit:git-stash[1]. - -stash.showStat:: - If this is set to true, the `git stash show` command without an - option will show diffstat of the stash entry. Defaults to true. - See description of 'show' command in linkgit:git-stash[1]. +include::stash-config.txt[] include::submodule-config.txt[] -tag.forceSignAnnotated:: - A boolean to specify whether annotated tags created should be GPG signed. - If `--annotate` is specified on the command line, it takes - precedence over this option. - -tag.sort:: - This variable controls the sort ordering of tags when displayed by - linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the - value of this variable will be used as the default. - -tar.umask:: - This variable can be used to restrict the permission bits of - tar archive entries. The default is 0002, which turns off the - world write bit. The special value "user" indicates that the - archiving user's umask will be used instead. See umask(2) and - linkgit:git-archive[1]. +include::tag-config.txt[] transfer.fsckObjects:: When `fetch.fsckObjects` or `receive.fsckObjects` are diff --git a/Documentation/stash-config.txt b/Documentation/stash-config.txt new file mode 100644 index 0000000000..c583d46d6b --- /dev/null +++ b/Documentation/stash-config.txt @@ -0,0 +1,9 @@ +stash.showPatch:: + If this is set to true, the `git stash show` command without an + option will show the stash entry in patch form. Defaults to false. + See description of 'show' command in linkgit:git-stash[1]. + +stash.showStat:: + If this is set to true, the `git stash show` command without an + option will show diffstat of the stash entry. Defaults to true. + See description of 'show' command in linkgit:git-stash[1]. diff --git a/Documentation/tag-config.txt b/Documentation/tag-config.txt new file mode 100644 index 0000000000..663663bdec --- /dev/null +++ b/Documentation/tag-config.txt @@ -0,0 +1,16 @@ +tag.forceSignAnnotated:: + A boolean to specify whether annotated tags created should be GPG signed. + If `--annotate` is specified on the command line, it takes + precedence over this option. + +tag.sort:: + This variable controls the sort ordering of tags when displayed by + linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the + value of this variable will be used as the default. + +tar.umask:: + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) and + linkgit:git-archive[1]. -- 2.19.1.647.g708186aaf9