X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fconfig.txt;h=e0aff5369f3b7ee3059095fc3531779e452e1db1;hb=520d7e278cfd25057e883575060b7378dfab61dc;hp=b13ff3a1bbedb70766f08b2e4d9b5048a4903d4d;hpb=a2d7c6c62080b542007f9787342aa1e57b95f50c;p=git.git diff --git a/Documentation/config.txt b/Documentation/config.txt index b13ff3a1b..e0aff5369 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -300,6 +300,10 @@ branch..merge:: branch..merge to the desired branch, and use the special setting `.` (a period) for branch..remote. +clean.requireForce:: + A boolean to make git-clean do nothing unless given -f or -n. Defaults + to false. + color.branch:: A boolean to enable/disable color in the output of gitlink:git-branch[1]. May be set to `true` (or `always`),