diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-01 21:58:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-01 21:58:53 -0800 |
| commit | 235d521da60e4699e5bd59ac658b5b48bd76ddca (patch) | |
| tree | 25620311ca206d41659b5f3e6f60760dca584c2b /Documentation/git-merge.txt | |
| parent | d92ddb525d47f11ecb6b11e795a668240d9a1af5 (diff) | |
| parent | 8e6ae4ad5ff14a6fd958ada867e24f8d248aac58 (diff) | |
| download | git-0.99.9b.tar.xz | |
GIT 0.99.9bv0.99.9b
This contains the changes made on the master branch since 0.99.9a.
The workaround for building RPMs has not changed since 0.99.9a,
mainly because I haven't heard back if it was good enough for
kernel.org consumption, or otherwise what changes are needed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a007a8b15a..8c9c4d87e3 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -28,6 +28,11 @@ OPTIONS there is no `-s` option, built-in list of strategies is used instead. +<msg>:: + The commit message to be used for the merge commit (in case + it is created). The `git-fmt-merge-msg` script can be used + to give a good default for automated `git-merge` invocations. + <head>:: our branch head commit. @@ -37,6 +42,11 @@ OPTIONS obviously means you are trying an Octopus. +SEE ALSO +-------- +gitlink:git-fmt-merge-msg[1] + + Author ------ Written by Junio C Hamano <junkio@cox.net> |