diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-22 00:55:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-22 18:09:07 -0700 |
| commit | c8b48ba4767ff9da19ef4f41f8d870f11742d833 (patch) | |
| tree | 3d0e6f09fd3189d9b684d064529eb81c5128a517 /Makefile | |
| parent | f8ff0c0641a14770a2214fffbd4271b1ea3a0d61 (diff) | |
| download | git-c8b48ba4767ff9da19ef4f41f8d870f11742d833.tar.gz | |
Prettyprint octopus merge message.
Including the current branch in the list of heads being merged
was not a good idea, so drop it. And shorten the message by
grouping branches and tags together to form a single line.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -87,7 +87,7 @@ SCRIPT_SH = \ SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ - git-rename.perl git-shortlog.perl + git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl SCRIPT_PYTHON = \ git-merge-recursive.py |