summaryrefslogtreecommitdiff
path: root/git-fmt-merge-msg.perl
Commit message (Collapse)AuthorAgeFilesLines
* git-fmt-merge-msg cleanupLinus Torvalds2006-03-081-1/+1
| | | | | | | | | | | Since I've started using the "merge.summary" flag in my repo, my merge messages look nicer, but I dislike how I get notifications of merges within merges. So I'd suggest this trivial change.. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* PATCH: simplify calls to git programs in git-fmt-merge-msgAlex Riesen2006-02-231-26/+5
| | | | | | It also makes it work on ActiveState Perl. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/perl'Junio C Hamano2006-02-211-8/+16
|\ | | | | | | | | | | | | | | | | * jc/perl: cvsimport: avoid open "-|" list form for Perl 5.6 svnimport: avoid open "-|" list form for Perl 5.6 send-email: avoid open "-|" list form for Perl 5.6 rerere: avoid open "-|" list form for Perl 5.6 fmt-merge-msg: avoid open "-|" list form for Perl 5.6
| * fmt-merge-msg: avoid open "-|" list form for Perl 5.6Junio C Hamano2006-02-201-8/+16
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix fmt-merge-msg counting.Junio C Hamano2006-02-201-3/+3
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* fmt-merge-msg: do not add excess newline at the end.Junio C Hamano2006-02-191-0/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* fmt-merge-msg: say which branch things were merged into unless 'master'Junio C Hamano2006-02-181-11/+18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* fmt-merge-msg: show summary of what is merged.Junio C Hamano2006-02-061-2/+77
| | | | | | | | | | | | In addition to the branch names, populate the log message with one-line description from actual commits that are being merged. This was prompted by Len's 12-way octopus. You need to have 'merge.summary' in the configuration file to enable it: $ git repo-config merge.summary yes Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix default pull not to do an unintended Octopus.Junio C Hamano2005-09-281-1/+3
| | | | | | | | | | | | The refspecs specified in the .git/remotes/<remote> on the "Pull: " lines are for fetching multiple heads in one go, but most of the time making an Octopus out of them is not what is wanted. Make git-fetch leave the marker in .git/FETCH_HEAD file so that later stages can tell which heads are for merging and which are not. Tom Prince made me realize how stupid the original behaviour was. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Prettyprint octopus merge message.Junio C Hamano2005-09-221-0/+93
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>
View Lorry Controller Status