https://tortoisegit.org/docs/tortoisegit/tgit-dug-showlog.html

Repository Demo

https://github.com/ChuckGitMerge/TortoiseGit-Issue3333

一共有11个commits

1.红色commits为C2、C3、C7,这些commits不属于master分支。其中C2、C3属于dev分支,C7属于test分支

2.黑色commits为C0、C1、C4、C5、C6、C8、C9、C10,这些commits都属于master分支

3.合并产生的commits:C4、C8

4.commits with reference:C3、C7、C10 (因为有3个分支分别指向这3个commits)

关于commit是否属于某一个分支,是从log graph的角度来分析的

Git WorkBehavior-LMLPHP

注意:这里的设置都是针对从初始commit C0到HEAD的log graph显示

First Parent

First Parent just follow up first parent commit. This will help understand overwhole history.

剩下8个黑色的commits。移除了3个红色的commits,即移除了不属于master分支的commits

Git WorkBehavior-LMLPHP

No merges

No merges Skips all merge points.

剩下的9个commits分成三段,按照分支进行独立展示。即移除了合并产生的2个commits:C4、C8

Git WorkBehavior-LMLPHP

Compressed Graph

Compressed Graph The log graph is simplified to include merge points, commits with references, and possibly other commits.

剩下7个commits,移除了4个commits,分别为C0、C2、C5、C9

C1、C4是第一次merge的起点和终点

C6、C7是第二次merge的起点和终点

C3、C7、C10是commits with reference

Git WorkBehavior-LMLPHP

将dev重置到C5这个commit上

git branch -f dev 685f040869b0fbbff06439b942ac259a0e307b80

仍然是显示7个commits

C1、C4是第一次merge的起点和终点

C6、C7是第二次merge的起点和终点

C5、C7、C10是commits with reference

Git WorkBehavior-LMLPHP

(将dev分支重置回C3 git branch -f dev c464daa133936ebb3467d394974b2a2ed0e8b825)

Show labelled commits only

The log graph is simplified to include commits with references only.

这个只显示从初始commit到HEAD上的,不会显示其他的

Git WorkBehavior-LMLPHP

05-19 13:10