diff options
| author | Jon Loeliger <jdl@freescale.com> | 2005-11-06 23:30:56 -0600 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-06 23:32:04 -0800 |
| commit | 93d69d86912c44206543f6670e93f9fc6f2f859f (patch) | |
| tree | 0ad7728ed8054bfbcaa42960a7e9a90532d89f18 /Documentation/git-merge.txt | |
| parent | 90279074ca5cc336a8bfffd47d19d089b291b432 (diff) | |
| download | git-93d69d86912c44206543f6670e93f9fc6f2f859f.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index b3ef19bae4..904e2fc4c5 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -19,7 +19,7 @@ which drives multiple merge strategy scripts. OPTIONS ------- -include::merge-pull-opts.txt[] +include::merge-options.txt[] <msg>:: The commit message to be used for the merge commit (in case |