projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9027907) | patch
Refactored merge options into separate merge-options.txt.
authorJon Loeliger <jdl@freescale.com>
Mon, 7 Nov 2005 05:30:56 +0000 (23:30 -0600)
committerJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 07:32:04 +0000 (23:32 -0800)
commit93d69d86912c44206543f6670e93f9fc6f2f859f
tree0ad7728ed8054bfbcaa42960a7e9a90532d89f18tree | snapshot
parent90279074ca5cc336a8bfffd47d19d089b291b432commit | diff
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>
Documentation/Makefile diff | blob | history
Documentation/fetch-options.txt [new file with mode: 0644] blob
Documentation/git-fetch.txt diff | blob | history
Documentation/git-merge.txt diff | blob | history
Documentation/git-pull.txt diff | blob | history
Documentation/merge-options.txt [new file with mode: 0644] blob
Documentation/merge-pull-opts.txt [deleted file] blob | history
git-format-patch.sh diff | blob | history
git-pull.sh [changed mode: 0755->0644] diff | blob | history
The core git plumbing