From: Jon Loeliger <jdl@freescale.com>
Date: Mon, 7 Nov 2005 05:30:56 +0000 (-0600)
Subject: Refactored merge options into separate merge-options.txt.
X-Git-Tag: v0.99.9f~2^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/93d69d86912c44206543f6670e93f9fc6f2f859f?hp=93d69d86912c44206543f6670e93f9fc6f2f859f

Refactored merge options into separate merge-options.txt.

Refactored fetch options into separate fetch-options.txt.
Made git-merge use merge-options.
Made git-fetch use fetch-options.
Made git-pull use merge-options and fetch-options.
Added --help option to git-pull and git-format-patch scripts.
Rewrote Documentation/Makefile to dynamically determine
include dependencies.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---