0

我想在合并后收到一个漂亮的可读的新提交列表及其消息,而不是默认的已更改文件列表。看起来像:

[21.05.13 10:03] User Superuser <his@mail.com>: f56dc3db33f7bae45edb48e4f051859d469a8f37
                 Fixed something
[23.05.13 10:03] User Duperuser <his@mail.net>: cb3fd7312ec6d712f8fcff27b508f74799f645b4
                 Merge remote branch 'origin/master' into duperbranch

我将使用post-merge钩子,但我是否找到未合并的最新提交消息?

4

1 回答 1

2

为了得到合并的提交,我会做这样的事情:

#!/usr/bin/env zsh

parents=( $( git show --pretty=%P $1 ) )
# First is branch we merged into, rest are parents which were merged.
echo First: $parents[1]
echo Rest: $parents[2,-1]

# For each parent we merged in get commits that are new to original HEAD.
for p in $parents[2,-1]
do
    git log $parents[1]..$p
done

运行这个./script.sh $commit,在你的情况下,你可以替换$1HEAD钩子。

您可以尝试使用漂亮的打印日志选项来获得您喜欢的内容。

于 2013-11-08T16:02:10.220 回答