summaryrefslogtreecommitdiff
path: root/git-fmt-merge-msg.perl
AgeCommit message (Collapse)AuthorFilesLines
2006-02-19fmt-merge-msg: do not add excess newline at the end.Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-18fmt-merge-msg: say which branch things were merged into unless 'master'Libravatar Junio C Hamano1-11/+18
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-06fmt-merge-msg: show summary of what is merged.Libravatar Junio C Hamano1-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>
2005-09-28Fix default pull not to do an unintended Octopus.Libravatar Junio C Hamano1-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>
2005-09-22Prettyprint octopus merge message.Libravatar Junio C Hamano1-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 13:52:40 +0000