Git 历史报告

Question

我正在尝试基于 git log 构建历史报告。但是我想跳过除 master 之外的分支，即使它们被 merge 了。例如，我创建了一个分支来处理功能 X。这个分支中有很多小的提交，我不喜欢在报告中看到这些小步骤。但是当我将这个分支 merge 到 master 中并带有消息“功能 X 已实现”时，我希望在报告中看到这个里程碑。感谢您帮助 git 新手。

Answer 1

如果你想 merge 一个分支而不 merge 该分支的整个提交历史，你可以使用--squash 命令来merge。这将应用该分支的所有更改到您的工作目录，而无需实际创建任何提交；此时，您可以为整个历史生成一个提交。因此，如果您有如下所示的 master 分支:

commit 69b2303df9884627ade245fff4a3376f39646cbd
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:24:56 2012 -0400

    commit on master

commit c8496d9ac4048a414faffb91486075ab0952e2d7
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:24:43 2012 -0400

    initial commit

另一个分支 newbranch 如下所示:

commit 71587063a73368ea160a78cd6d130f828cb05e0e
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:25:36 2012 -0400

    commit 3 on new branch

commit 37ab4fc91c796ed05ecae0c8f504f263cee9603d
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:25:36 2012 -0400

    commit 2 on new branch

commit 5fd0768e355d1cba0905aaed327fb20ef263d6ef
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:25:36 2012 -0400

    commit 1 on new branch

commit 69b2303df9884627ade245fff4a3376f39646cbd
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:24:56 2012 -0400

    commit on master

commit c8496d9ac4048a414faffb91486075ab0952e2d7
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:24:43 2012 -0400

    initial commit

然后你可以这样做:

git checkout master
git merge --squash newbranch
git commit -m "merged changes from newbranch"

然后 master 分支的日志将如下所示:

commit 0737d3dac5f769f837d4d0ce90ba1004c79d6a92
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:26:29 2012 -0400

    merged newbranch into master

commit 69b2303df9884627ade245fff4a3376f39646cbd
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:24:56 2012 -0400

    commit on master

commit c8496d9ac4048a414faffb91486075ab0952e2d7
Author: Lars Kellogg-Stedman <lars@seas.harvard.edu>
Date:   Mon May 14 13:24:43 2012 -0400

    initial commit