我在当地的'master'分支上工作，然后定期跳转到我的'release'分支并输入
% git merge master
这一段时间工作得很好 - 在BitBucket的提交历史中，我会看到签到主线后跟合并发布。但是现在当我合并并推送到origin / release时，我只看到了提交 - 它们看起来根本不像是一个合并。显然，我知道这很危险，因为我无法弄清楚我做了什么搞砸了。
我甚至不确定如何解决这个问题，所以即使是带有网址的RTFM回复也会受到赞赏。
这是我的主分支的样子。这是怎么回事？
* 0a41d90 * 77127c8 |\ | * a9e803b | * 76bf8dd | * 03f6c4d | |\ | * \ fffbcab | |\ \ | * \ \ 7e1064f | |\ \ \ | * \ \ \ 155b815 | |\ \ \ \ | * | | | | 6990b2f | * | | | | 6fc18fd | |\ \ \ \ \ | * \ \ \ \ \ 8b63f1b | |\ \ \ \ \ \ | * \ \ \ \ \ \ feddf35 | |\ \ \ \ \ \ \ | * \ \ \ \ \ \ \ 8eeedd4 | |\ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ f4bc862 | |\ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ 6595d3b | |\ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ 245ea26 | |\ \ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ \ 895733b | |\ \ \ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ \ \ fa22b61 | |\ \ \ \ \ \ \ \ \ \ \ \ \ | * | | | | | | | | | | | | | d56755e | * | | | | | | | | | | | | | 1afb89d | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ 9ef936c | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 77adbee | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ d37e67d | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 7e7e8fa | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 3cebafd | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 67327ce | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * | | | | | | | | | | | | | | | | | | | | 2ddd17c | * | | | | | | | | | | | | | | | | | | | | 51d241f * | | | | | | | | | | | | | | | | | | | | | acf8dd7 * | | | | | | | | | | | | | | | | | | | | | 238ba1c | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | b2987cf | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | 60c1528 | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | | fa4152b | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | 35f3451 * | | | | | | | | | | | | | | | | | 929990d * | | | | | | | | | | | | | | | | | 52d07ac * | | | | | | | | | | | | | | | | | 0b010f8 | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | 38bdc49 * | | | | | | | | | | | | | | | | 67e2693 * | | | | | | | | | | | | | | | | d98cc92 * | | | | | | | | | | | | | | | | 8f35a00 * | | | | | | | | | | | | | | | | cac033c | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | d7ebb20 | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | * | | | | | | | | | | | | | | 2a3b53f * | | | | | | | | | | | | | | 937080c * | | | | | | | | | | | | | | 3a925b8 * | | | | | | | | | | | | | | f5b757b * | | | | | | | | | | | | | | 398daad | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | * | | | | | | | | | | | | | 42f3300 | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | * | | | | | | | | | | | | eb455d7 | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | * | | | | | | | | | | | dc7db8a | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | * | | | | | | | | | | 0f09b40 | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | * | | | | | | | | | 7c1271e * | | | | | | | | | e9a9582 * | | | | | | | | | 92fa1dd * | | | | | | | | | fb0a0c2 * | | | | | | | | | 2a6bccf | |_|_|_|_|_|_|_|/ |/| | | | | | | | * | | | | | | | | b1cc90f * | | | | | | | | 2215950 * | | | | | | | | 26e1f4e | |_|_|_|_|_|_|/ |/| | | | | | | * | | | | | | | bde1089 * | | | | | | | 39b7af7 * | | | | | | | 7626f37 * | | | | | | | 152a71e * | | | | | | | 01a8351 * | | | | | | | 5455aad * | | | | | | | 5c3a2e4 * | | | | | | | e003d70 | |_|_|_|_|_|/ |/| | | | | | * | | | | | | 2494a37 | |_|_|_|_|/ |/| | | | | * | | | | | 7fa4f9d * | | | | | 98781b0 | |_|_|_|/ |/| | | | * | | | | 85047a2 * | | | | b81af73 * | | | | cfbf163 | |_|_|/ |/| | | * | | | f4ce570 | |_|/ |/| | * | | 7124029 | |/ |/| * | 86e30a9 * | b8609a7 * | b7ebd85 * | effb05a * | c2511fa * | 154eaf3 * | 9aaf759 * | 8d57e05 * | 56bc946 * | 4e46bfb * | 9ee3c38 * | 8f3bec0 |/ * 5e4e6e0 * f122342
答案 0 :(得分：0)
如果您的release分支上没有提交，那么每个master与release的合并都将是快进合并（只需沿着＆＃34移动分支标签; line＆＃34;并且没有创建新的＆＃34;行＆＃34;）。
在某些时候，您将51d241f和2ddd17c提交到release分支。从那时起（从master上的提交7124029开始），每次您提交master然后将master合并到release时，快进< / em> merge是不可能的，所以你创建了另一个＆＃34; line＆＃34;在图表中记录合并。