Correct git-pull documentation
authorJay Soffian <jaysoffian@gmail.com>
Tue, 19 Feb 2008 19:24:32 +0000 (14:24 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Feb 2008 05:31:33 +0000 (21:31 -0800)
commita288394ed3f2ec1feea632ee28fb41d1ad2172bf
treec157105fd017dda485e6556bb79749e7d9f20eb0
parentafa9b620f9432491a453d752e8bf62860d7834c0
Correct git-pull documentation

The --rebase option was documented in the wrong place (under MERGE
STRATEGIES instead of OPTIONS). Noted the branch.<name>.rebase
option.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-pull.txt