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-fmt-merge-msg.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-fmt-merge-msg.txt')
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt new file mode 100644 index 0000000000..a70eb3994a --- /dev/null +++ b/Documentation/git-fmt-merge-msg.txt @@ -0,0 +1,39 @@ +git-fmt-merge-msg(1) +==================== + +NAME +---- +git-fmt-merge-msg - Produce a merge commit message + + +SYNOPSIS +-------- +'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD + +DESCRIPTION +----------- +Takes the list of merged objects on stdin and produces a suitable +commit message to be used for the merge commit, usually to be +passed as the '<merge-message>' argument of `git-merge`. + +This script is intended mostly for internal use by scripts +automatically invoking `git-merge`. + + +SEE ALSO +-------- +gitlink:git-merge[1] + + +Author +------ +Written by Junio C Hamano <junkio@cox.net> + +Documentation +-------------- +Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>. + +GIT +--- +Part of the gitlink:git[7] suite + |