Merge branch 'jx/clean-interactive'

Finishing touches to update the document to adjust to a new option
"git clean" learned recently.

* jx/clean-interactive:
  documentation: clarify notes for clean.requireForce
This commit is contained in:
Junio C Hamano 2013-09-17 11:40:23 -07:00
Родитель f2ded0f807 f85f7947c3
Коммит 9b4aa47e7d
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -789,8 +789,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 -f,
-i or -n. Defaults to true.
color.branch::
A boolean to enable/disable color in the output of