blocks|key|492947|text|你可能只想|type|unstyled|depth|inlineStyleRanges|entityRanges|data|492948|git+branch+--contains+branch-to-delete|code-block|syntax|javascript|492949|这将列出包含从"branch-to-delete“提交的所有分支。如果报告的不只是“分支到删除”，则分支已被合并。|492950|您的替代方案实际上只是rev-list语法的东西。例如，git+log+one-branch..another-branch显示了one-branch所需的一切，以获得another-branch所拥有的一切。|offset|length|style|CODE|492951|您可能还会对git+show-branch感兴趣，将其作为查看内容位置的一种方式。|492952|entityMap^0|0|0|0|S|Y|1T|A|2C|E|0|6|F|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|U|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|V|8|@$K|W|L|X|M|N]|$K|Y|L|Z|M|N]|$K|10|L|11|M|N]]|9|@]|A|$]]|$1|O|3|P|5|6|7|12|8|@$K|13|L|14|M|N]]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|15|8|@]|9|@]|A|$]]]|R|$]]

You probably just want

<pre><code>git branch --contains branch-to-delete
</code></pre>

This will list all branches which contain the commits from "branch-to-delete".
If it reports more than just "branch-to-delete", the branch has been merged.

Your alternatives are really just rev-list syntax things. e.g. <code>git log one-branch..another-branch</code> shows everything that <code>one-branch</code> needs to have everything <code>another-branch</code> has.

You may also be interested in <code>git show-branch</code> as a way to see what's where.

blocks|key|492986|text|如果您需要检查的是one+(single)分支，例如，如果您希望分支'B‘完全合并到分支'A’中，您可以简单地执行以下操作：|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|492987|$+git+checkout+A
$+git+branch+-d+B|code-block|syntax|javascript|492988|git+branch+-d+<branchname>具有“分支必须完全合并在HEAD中”的安全性。|CODE|492989|Caution：如果分支B合并到A中，这实际上会将其删除。|492990|entityMap^0|9|C|0|0|0|Q|0|0|7|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|U|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|V|8|@$9|W|A|X|B|M]]|D|@]|E|$]]|$1|N|3|O|5|6|7|Y|8|@$9|Z|A|10|B|C]]|D|@]|E|$]]|$1|P|3|-4|5|6|7|11|8|@]|D|@]|E|$]]]|Q|$]]

If it is one (single) branch that you need to check, for example if you want that branch 'B' is fully merged into branch 'A', you can simply do the following:

<pre><code>$ git checkout A
$ git branch -d B
</code></pre>

<code>git branch -d &lt;branchname&gt;</code> has the safety that "The branch must be fully merged in HEAD."

Caution: this actually deletes the branch B if it is merged into A.

blocks|key|1793824|text|要查看哪些提交在一个分支上而不在另一个分支上的列表，请使用git+log：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1793825|git+log+--no-merges+oldbranch+%5Enewbranch|code-block|syntax|javascript|1793826|...that是，显示旧分支上所有提交的提交日志，这些提交在新分支上是而不是。您可以列出要包含和排除的多个分支，例如|offset|length|style|BOLD|1793827|git+log++--no-merges+oldbranch1+oldbranch2+%5Enewbranch1+%5Enewbranch2|1793828|注意:在Windows命令提示符(不是Powershell)上，%5E是一个转义键，因此需要用另一个%5E对其进行转义|CODE|1793829|git+log+--no-merges+oldbranch+%5E%5Enewbranch|1793830|entityMap^0|0|0|Z|3|0|0|W|1|1C|1|0|0^^$0|@$1|2|3|4|5|6|7|V|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|W|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|X|8|@$I|Y|J|Z|K|L]]|9|@]|A|$]]|$1|M|3|N|5|D|7|10|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|11|8|@$I|12|J|13|K|Q]|$I|14|J|15|K|Q]]|9|@]|A|$]]|$1|R|3|S|5|D|7|16|8|@]|9|@]|A|$E|F]]|$1|T|3|-4|5|6|7|17|8|@]|9|@]|A|$]]]|U|$]]

To see a list of which commits are on one branch but not another, use git log:
<pre><code>git log --no-merges oldbranch ^newbranch
</code></pre>
...that is, show commit logs for all commits on oldbranch that are not on newbranch. You can list multiple branches to include and exclude, e.g.
<pre><code>git log --no-merges oldbranch1 oldbranch2 ^newbranch1 ^newbranch2
</code></pre>
Note: on Windows command prompt (not Powershell) <code>^</code> is an escape key, so it needs to be escaped with another <code>^</code>:
<pre><code>git log --no-merges oldbranch ^^newbranch
</code></pre>

blocks|key|1859182|text|虽然这里发布的一些答案可以帮助您找到所需的内容，但git+branch的以下子命令更适合您的任务。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|1859183|+is+used+to+find+all+branches+which+can+be+safely+deleted,+since+those+branches+are+fully+contained+by+HEAD.|1859184|而在master中，用户可以运行命令来枚举可以安全删除的分支，如下所示：|CODE|1859185|git+branch+--merged
++develop
++fpg_download_links
*+master
++master_merge_static

#+Delete+local+and+remote+tracking+branches+you+don't+want
git+branch+-d+fpg_download_links
git+push+origin+:fpg_download_links
git+branch+-d+master_merge_static
git+push+origin+:master_merge_static

#+There+is+also+a+flag+to+specify+remote+branches+in+the+output
git+branch+--remotes+--merged|code-block|syntax|javascript|1859186|entityMap|0|LINK|mutability|MUTABLE|url|http://www.kernel.org/pub/software/scm/git/docs/git-branch.html^0|P|A|0|0|30|0|0|2|6|0|0^^$0|@$1|2|3|4|5|6|7|X|8|@$9|Y|A|Z|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|10|8|@]|D|@$9|11|A|12|1|13]]|E|$]]|$1|H|3|I|5|6|7|14|8|@$9|15|A|16|B|J]]|D|@]|E|$]]|$1|K|3|L|5|M|7|17|8|@]|D|@]|E|$N|O]]|$1|P|3|-4|5|6|7|18|8|@]|D|@]|E|$]]]|Q|$R|$5|S|T|U|E|$V|W]]]]

While some of the answers posted here will help find what you seek, the following sub-command of git branch is a more suitable solution for your task. 

<a href="http://www.kernel.org/pub/software/scm/git/docs/git-branch.html" rel="noreferrer">--merged is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD.</a>

While in <code>master</code> one could run the command to enumerate the branches one could safely remove, like so:

<pre><code>git branch --merged
 develop
 fpg_download_links
* master
 master_merge_static

# Delete local and remote tracking branches you don't want
git branch -d fpg_download_links
git push origin :fpg_download_links
git branch -d master_merge_static
git push origin :master_merge_static

# There is also a flag to specify remote branches in the output
git branch --remotes --merged
</code></pre>

blocks|key|1793862|text|您可以使用这个简单的脚本来查看未合并的提交|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1793863|#!/bin/bash
#+Show+commits+that+exists+only+on+branch+and+not+in+current
#+Usage:
#+++git+branch-notmerge+<branchname>
#
#+Setup+git+alias
#+++git+config+alias.branch-notmerge+[path/to/this/script]
grep+-Fvf+<(git+log+--pretty=format:'%25H+-+%25s')+<(git+log+$1+--pretty=format:'%25H+-+%25s')|code-block|syntax|javascript|1793864|您还可以使用工具git-wtf来显示分支的状态|offset|length|1793865|entityMap|0|LINK|mutability|MUTABLE|url|http://git-wt-commit.rubyforge.org/git-wtf^0|0|0|8|7|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|U|8|@]|9|@$I|V|J|W|1|X]]|A|$]]|$1|K|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|L|$M|$5|N|O|P|A|$Q|R]]]]

You can use this simple script to see commits that are not merged

<pre><code>#!/bin/bash
# Show commits that exists only on branch and not in current
# Usage:
# git branch-notmerge &lt;branchname&gt;
#
# Setup git alias
# git config alias.branch-notmerge [path/to/this/script]
grep -Fvf &lt;(git log --pretty=format:'%H - %s') &lt;(git log $1 --pretty=format:'%H - %s')
</code></pre>

You can use also tool <a href="http://git-wt-commit.rubyforge.org/git-wtf" rel="nofollow">git-wtf</a> that will display state of branches

blocks|key|452439|text|要在旧分支中显示提交，但不在新分支中显示提交，请执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|452440|git+log+newbranch..oldbranch|code-block|syntax|javascript|452441|为了显示这些提交的差异(请注意，这里有三个点)：|452442|git+diff+newbranch...oldbranch|452443|这是带有图表插图的文档https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Commit-Ranges|offset|length|452444|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Commit-Ranges^0|0|0|0|0|B|21|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|X|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Y|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|Z|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|10|8|@]|9|@$M|11|N|12|1|13]]|A|$]]|$1|O|3|-4|5|6|7|14|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|V]]]]

To show the commits in oldbranch but not in newbranch:

<pre><code>git log newbranch..oldbranch
</code></pre>

To show the diff by these commits (note there are three dots):

<pre><code>git diff newbranch...oldbranch
</code></pre>

Here is the doc with a diagram illustration <a href="https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Commit-Ranges">https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Commit-Ranges</a>

blocks|key|1859285|text|jimmyorr's+answer在Windows上不起作用。使用--not而不是%5E很有帮助，如下所示：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1859286|git+log+oldbranch+--not+newbranch+--no-merges|code-block|syntax|javascript|1859287|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/a/4207176/2790048^0|X|5|15|1|0|H|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@$9|T|A|U|B|C]|$9|V|A|W|B|C]]|D|@$9|X|A|Y|1|Z]]|E|$]]|$1|F|3|G|5|H|7|10|8|@]|D|@]|E|$I|J]]|$1|K|3|-4|5|6|7|11|8|@]|D|@]|E|$]]]|L|$M|$5|N|O|P|E|$Q|R]]]]

<a href="https://stackoverflow.com/a/4207176/2790048">jimmyorr's answer</a> does not work on Windows. it helps to use <code>--not</code> instead of <code>^</code> like so:

<pre><code>git log oldbranch --not newbranch --no-merges
</code></pre>

blocks|key|492584|text|对于那些仍在寻找简单答案的人，请查看git+cherry。它比较实际的差异，而不是提交散列。这意味着它容纳了经过精心挑选或重新基址的提交。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|492585|首先签出您想要删除的分支：|492586|git+checkout+[branch-to-delete]|style|CODE|492587|然后使用git+cherry将其与您的主要开发分支进行比较：|492588|git+cherry+-v+master|492589|输出示例：|492590|%2B+8a14709d08c99c36e907e47f9c4dacebeff46ecb+Commit+message
%2B+b30ccc3fb38d3d64c5fef079a761c7e0a5c7da81+Another+commit+message
-+85867e38712de930864c5edb7856342e1358b2a0+Yet+another+message|code-block|syntax|javascript|492591|注意：-v标志将包括提交消息和SHA。|492592|前面有'%2B‘的行在要删除的分支中，但不在主分支中。前面有'-‘的那些在master中有一个等效的提交。|492593|对于不在master中的提交，将cherry+pick与grep结合使用：|492594|git+cherry+-v+master+%7C+grep+"%5E\%2B"|492595|492596|%2B+8a14709d08c99c36e907e47f9c4dacebeff46ecb+Commit+message
%2B+b30ccc3fb38d3d64c5fef079a761c7e0a5c7da81+Another+commit+message|492597|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/docs/git-cherry^0|I|A|0|0|0|0|V|0|0|0|K|0|0|0|3|2|0|0|0|0|X|0|0|0^^$0|@$1|2|3|4|5|6|7|1D|8|@]|9|@$A|1E|B|1F|1|1G]]|C|$]]|$1|D|3|E|5|6|7|1H|8|@]|9|@]|C|$]]|$1|F|3|G|5|6|7|1I|8|@$A|1J|B|1K|H|I]]|9|@]|C|$]]|$1|J|3|K|5|6|7|1L|8|@]|9|@]|C|$]]|$1|L|3|M|5|6|7|1M|8|@$A|1N|B|1O|H|I]]|9|@]|C|$]]|$1|N|3|O|5|6|7|1P|8|@]|9|@]|C|$]]|$1|P|3|Q|5|R|7|1Q|8|@]|9|@]|C|$S|T]]|$1|U|3|V|5|6|7|1R|8|@$A|1S|B|1T|H|I]]|9|@]|C|$]]|$1|W|3|X|5|6|7|1U|8|@]|9|@]|C|$]]|$1|Y|3|Z|5|6|7|1V|8|@]|9|@]|C|$]]|$1|10|3|11|5|6|7|1W|8|@$A|1X|B|1Y|H|I]]|9|@]|C|$]]|$1|12|3|O|5|6|7|1Z|8|@]|9|@]|C|$]]|$1|13|3|14|5|R|7|20|8|@]|9|@]|C|$S|T]]|$1|15|3|-4|5|6|7|21|8|@]|9|@]|C|$]]]|16|$17|$5|18|19|1A|C|$1B|1C]]]]

For those still looking for a simple answer, check out <a href="http://git-scm.com/docs/git-cherry" rel="noreferrer">git cherry</a>. It compares actual diffs instead of commit hashes. That means it accommodates commits that have been cherry picked or rebased.

First checkout the branch you want to delete: 

<code>git checkout [branch-to-delete]</code>

then use git cherry to compare it to your main development branch:

<code>git cherry -v master</code>

Example output:

<pre><code>+ 8a14709d08c99c36e907e47f9c4dacebeff46ecb Commit message
+ b30ccc3fb38d3d64c5fef079a761c7e0a5c7da81 Another commit message
- 85867e38712de930864c5edb7856342e1358b2a0 Yet another message
</code></pre>

Note: The <code>-v</code> flag is to include the commit message along with the SHA hash.

Lines with the '+' in front are in the branch-to-delete, but not the master branch. Those with a '-' in front have an equivalent commit in master.

For JUST the commits that aren't in master, combine cherry pick with grep:

<code>git cherry -v master | grep "^\+"</code>

Example output:

<pre><code>+ 8a14709d08c99c36e907e47f9c4dacebeff46ecb Commit message
+ b30ccc3fb38d3d64c5fef079a761c7e0a5c7da81 Another commit message
</code></pre>

blocks|key|493177|text|只需使用git+cherry挑选分支newFeature42中的所有提交，例如：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|493178|git+cherry+-v主newFeature42|493179|entityMap^0|4|A|I|C|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@]|D|@]|E|$]]|$1|H|3|-4|5|6|7|P|8|@]|D|@]|E|$]]]|I|$]]

Just use <code>git cherry</code> to pick all commits in the branch <code>newFeature42</code> for example:

git cherry -v master newFeature42

blocks|key|1859378|text|显示other-branch中不在当前分支中的提交和提交内容：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1859379|git+show+@..other-branch|code-block|syntax|javascript|1859380|此外，您还可以将来自other-branch的提交直接应用于当前分支：|1859381|git+cherry-pick+@..other-branch|1859382|entityMap^0|2|C|0|0|A|C|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@$9|R|A|S|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|T|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|U|8|@$9|V|A|W|B|C]]|D|@]|E|$]]|$1|M|3|N|5|H|7|X|8|@]|D|@]|E|$I|J]]|$1|O|3|-4|5|6|7|Y|8|@]|D|@]|E|$]]]|P|$]]

Show commits and commit contents from <code>other-branch</code> that are not in your current branch:
<pre><code>git show @..other-branch
</code></pre>
Additionally you can apply the commits from <code>other-branch</code> directly to your current branch:
<pre><code>git cherry-pick @..other-branch
</code></pre>

blocks|key|452671|text|我也想对提交进行，所以下面是怎么做的：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|452672|计算在当前分支(HEAD)上但不在master上的提交次数|offset|length|style|CODE|452673|git+log+--oneline+%5Emaster+HEAD+%7C+wc+-l|code-block|syntax|javascript|452674|wc+-l的意思是“单词计数”--计算“l”的个数。|452675|当然，还可以查看完整的日志消息，正如其他答案所给出的：|452676|git+log+%5Emaster+HEAD|452677|精简--oneline形式的...or：|452678|git+log+--oneline+%5Emaster+HEAD|452679|如果您也不想计算合并提交次数，则可以排除那些包含--no-merges的提交次数|452680|git+log+--oneline+--no-merges+%5Emaster+HEAD+%7C+wc+-l|452681|等。|452682|entityMap^0|0|8|4|H|6|0|0|0|5|0|0|0|2|9|0|0|O|B|0|0|0^^$0|@$1|2|3|4|5|6|7|14|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|15|8|@$D|16|E|17|F|G]|$D|18|E|19|F|G]]|9|@]|A|$]]|$1|H|3|I|5|J|7|1A|8|@]|9|@]|A|$K|L]]|$1|M|3|N|5|6|7|1B|8|@$D|1C|E|1D|F|G]]|9|@]|A|$]]|$1|O|3|P|5|6|7|1E|8|@]|9|@]|A|$]]|$1|Q|3|R|5|J|7|1F|8|@]|9|@]|A|$K|L]]|$1|S|3|T|5|6|7|1G|8|@$D|1H|E|1I|F|G]]|9|@]|A|$]]|$1|U|3|V|5|J|7|1J|8|@]|9|@]|A|$K|L]]|$1|W|3|X|5|6|7|1K|8|@$D|1L|E|1M|F|G]]|9|@]|A|$]]|$1|Y|3|Z|5|J|7|1N|8|@]|9|@]|A|$K|L]]|$1|10|3|11|5|6|7|1O|8|@]|9|@]|A|$]]|$1|12|3|-4|5|6|7|1P|8|@]|9|@]|A|$]]]|13|$]]

I'd like to count the commits too, so here's how to do that:
Count how many commits are on the current branch (<code>HEAD</code>), but NOT on <code>master</code>:
<pre class="lang-bash prettyprint-override"><code>git log --oneline ^master HEAD | wc -l
</code></pre>
<code>wc -l</code> means &quot;word count&quot;--count the number of 'l'ines.
And of course to see the whole log messages, as other answers have given:
<pre class="lang-bash prettyprint-override"><code>git log ^master HEAD
</code></pre>
...or in a condensed <code>--oneline</code> form:
<pre class="lang-bash prettyprint-override"><code>git log --oneline ^master HEAD
</code></pre>
If you don't want to count merge commits either, you can exclude those with <code>--no-merges</code>:
<pre class="lang-bash prettyprint-override"><code>git log --oneline --no-merges ^master HEAD | wc -l
</code></pre>
etc.

I have an old branch, which I would like to delete. However, before doing so, I want to check that all commits made to this branch were at some point merged into some other branch. Thus, I'd like to see all commits made to my current branch which have not been applied to any other branch [or, if this is not possible without some scripting, how does one see all commits in one branch which have not been applied to another given branch?].

Using Git, show all commits that are in one branch, but not the other(s)

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

我有一个旧的分支，我想删除它。然而，在这样做之前，我想检查一下对这个分支所做的所有提交是否在某个时刻被合并到其他某个分支中。因此，我希望看到所有提交到我的当前分支的没有应用到任何其他分支的提交，或者，如果没有一些脚本，这是不可能的，如何看到一个分支中没有应用到另一个给定分支的所有提交？

问使用Git，显示一个分支中的所有提交，但不显示另一个分支中的提交
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用Git，显示一个分支中的所有提交，但不显示另一个分支中的提交EN