git-pull.txt: Mention branch.autosetuprebase
authorJari Aalto <jari.aalto@cante.net>
Fri, 3 Dec 2010 08:20:54 +0000 (10:20 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Dec 2010 19:16:45 +0000 (11:16 -0800)
commitc4f4157ee84ff27dd7a398f80002be59eb2f69e7
tree6773d1e0f9baa7b639c9e1c75410394c4194a1b8
parent7e4eb210bdf2a612d8bf4cc106d99ba190f73e3e
git-pull.txt: Mention branch.autosetuprebase

In "Options related to merging" mention also related option
branch.autosetuprebase in git-config(1).

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-pull.txt