Jiang XinAdd "-i" (interactive clean option) to clarify the documentation for "clean.requireForce" config variable. Also replace the example in `gitcli.txt` with safer git clean command.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com> --- Documentation/config.txt | 4 ++-- Documentation/gitcli.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Show changes to 2 files +3 −3
Documentation/config.txt, Documentation/gitcli.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8361380..547149d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -795,8 +795,8 @@ browser.<tool>.path:: working repository in gitweb (see linkgit:git-instaweb[1]). clean.requireForce:: - A boolean to make git-clean do nothing unless given -f - or -n. Defaults to true. + A boolean to make git-clean do nothing unless given -i, + -f or -n. Defaults to true. color.branch:: A boolean to enable/disable color in the output of diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 9ac5088..4005a3b 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -135,7 +135,7 @@ Aggregating short options ~~~~~~~~~~~~~~~~~~~~~~~~~ Commands that support the enhanced option parser allow you to aggregate short options. This means that you can for example use `git rm -rf` or -`git clean -fdx`. +`git clean -idx`. Abbreviating long options
-- 1.8.4.rc3.2.gf223459
