Document that the default of branch.autosetupmerge is true
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Mon, 11 Feb 2008 11:27:20 +0000 (11:27 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Feb 2008 20:14:03 +0000 (12:14 -0800)
commit0ed50ceb48662e1d2b4e131f1ed79252062547dd
tree7a3f7fa47aa2ab6485b4ae6009e42fdcc49c2177
parentce32660edc2b83c6fdf550f6869e0b01e255dadb
Document that the default of branch.autosetupmerge is true

In 34a3e69 (git-branch: default to --track) the default was changed to
true, to help new git users.  But yours truly forgot to update the
documentation.  This fixes it.

Noticed by Kalle Olavi Niemitalo.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
Documentation/git-branch.txt
Documentation/git-checkout.txt