From: Junio C Hamano Date: Thu, 8 Nov 2007 02:19:38 +0000 (-0800) Subject: Merge branch 'jc/clean-config' X-Git-Tag: v1.5.4-rc0~249 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=53d149c54bdedd4cf490943a5478a7826c2379c9;p=git.git Merge branch 'jc/clean-config' * jc/clean-config: clean: require -f to do damage by default --- 53d149c54bdedd4cf490943a5478a7826c2379c9 diff --cc Documentation/config.txt index 0df004ea2,aeb7961ad..8d5d20058 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -338,15 -337,9 +338,15 @@@ branch..merge: branch..merge to the desired branch, and use the special setting `.` (a period) for branch..remote. +branch..mergeoptions:: + Sets default options for merging into branch . The syntax and + supported options are equal to that of gitlink:git-merge[1], but + option values containing whitespace characters are currently not + supported. + clean.requireForce:: - A boolean to make git-clean do nothing unless given -f or -n. Defaults - to false. + A boolean to make git-clean do nothing unless given -f + or -n. Defaults to true. color.branch:: A boolean to enable/disable color in the output of