blocks|key|568807|text|替代@Marco+Ponti的答案，并避免结账：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|568808|git+diff+--name-only+<notMainDev>+$(git+merge-base+<notMainDev>+<mainDev>)|code-block|syntax|javascript|568809|如果您的特定shell不理解$()结构，请使用反划线。|568810|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

An alternative to the answer by @Marco Ponti, and avoiding the checkout:

<pre><code>git diff --name-only &lt;notMainDev&gt; $(git merge-base &lt;notMainDev&gt; &lt;mainDev&gt;)
</code></pre>

If your particular shell doesn't understand the $() construct, use back-ticks instead.

blocks|key|568660|text|你所要做的就是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|568661|git+checkout+<notMainDev>
git+diff+--name-only+<mainDev>|code-block|syntax|javascript|568662|这将只显示两个分支之间不同的文件名。|568663|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

All you have to do is the following:

<pre><code>git checkout &lt;notMainDev&gt;
git diff --name-only &lt;mainDev&gt;
</code></pre>

This will show you only the filenames that are different between the two branches.

blocks|key|353610|text|令人惊讶的是，到目前为止还没有人这么说过！|type|unstyled|depth|inlineStyleRanges|entityRanges|data|353611|git+diff+main...branch|code-block|syntax|javascript|353612|因此，只能在branch上查看更改|offset|length|style|CODE|353613|要检查当前分支，请使用|353614|git+diff+main...|353615|感谢jqr|353616|这是速记|353617|git+diff+$(git+merge-base+main+branch)+branch|353618|因此合并库(分支之间最新的公共提交)和分支提示|353619|另外，如果你的本地main过时了，使用origin/main代替master会有所帮助|353620|entityMap^0|0|0|6|6|0|0|0|0|0|0|0|J|B|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|13|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|14|8|@$I|15|J|16|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|17|8|@]|9|@]|A|$]]|$1|O|3|P|5|D|7|18|8|@]|9|@]|A|$E|F]]|$1|Q|3|R|5|6|7|19|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|1A|8|@]|9|@]|A|$]]|$1|U|3|V|5|D|7|1B|8|@]|9|@]|A|$E|F]]|$1|W|3|X|5|6|7|1C|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|6|7|1D|8|@$I|1E|J|1F|K|L]]|9|@]|A|$]]|$1|10|3|-4|5|6|7|1G|8|@]|9|@]|A|$]]]|11|$]]

amazed this has not been said so far!
<pre><code>git diff main...branch
</code></pre>
So see the changes only on <code>branch</code>
To check the current branch use
<pre><code>git diff main...
</code></pre>
Thanks to jqr
This is short hand for
<pre><code>git diff $(git merge-base main branch) branch
</code></pre>
so the merge base (the most recent common commit between the branches) and the branch tip
Also using <code>origin/main</code> instead of just master will help in case your local main is dated

blocks|key|569151|text|我不敢相信有这么多方法可以做到这一点。我使用了之前有人发布的内容，只是有以下几个论点：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|569152|git+whatchanged+--name-only+--pretty=""+origin..HEAD|code-block|syntax|javascript|569153|这只列出了文件名，并且只列出了在当前分支上发生更改的文件名。|569154|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

I can't believe there are so many ways to do this. I use whatchanged as someone posted before, just with the following arguments:

<pre><code>git whatchanged --name-only --pretty="" origin..HEAD
</code></pre>

This just lists the filenames, and only the ones that changed on the current branch.

blocks|key|569249|text|我真的很喜欢@twalberg的答案，但我不想一直输入当前的分支机构名称。所以我使用这个：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|569250|git+diff+--name-only+$(git+merge-base+master+HEAD)|code-block|syntax|javascript|569251|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

I really liked @twalberg's answer but I didn't want to have to type the current branch name all the time. So I'm using this:

<pre><code>git diff --name-only $(git merge-base master HEAD)
</code></pre>

blocks|key|569411|text|git+diff+--name-only+master...branch-name|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|569412|我们想要与之进行比较。|unstyled|569413|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|J|8|@]|9|@]|A|$]]|$1|G|3|-4|5|F|7|K|8|@]|9|@]|A|$]]]|H|$]]

<pre><code>git diff --name-only master...branch-name
</code></pre>

to which we want to compare.

blocks|key|353345|text|git+whatchanged似乎是一个很好的选择。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|353346|entityMap^0|0|F|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

<code>git whatchanged</code> seems to be a good alternative.

blocks|key|568986|text|如果它可以像这样简单呢？|type|unstyled|depth|inlineStyleRanges|entityRanges|data|568987|git+changed|code-block|syntax|javascript|568988|如果您愿意假设主分支名为"+master+"，并从master创建其他分支，那么可以将此别名添加到~/.gitconfig文件中以使其更简单：|offset|length|style|CODE|568989|cbranch+=+!"git+branch+%7C+grep+'*'+%7C+cut+-f2+-d'+'"
changed+=+!"git+diff+--name-only+$(git+cbranch)+$(git+merge-base+$(git+cbranch)+master)"|568990|这些假设在大多数情况下都适用于大多数人，但你必须意识到你正在做这些假设。|568991|此外，您还必须使用支持$()的shell。It's+very+likely+that+your+shell+supports+this。|568992|entityMap|0|LINK|mutability|MUTABLE|url|https://unix.stackexchange.com/a/218065/3358^0|0|0|1D|C|0|0|0|B|3|L|1A|0|0^^$0|@$1|2|3|4|5|6|7|10|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|11|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|12|8|@$I|13|J|14|K|L]]|9|@]|A|$]]|$1|M|3|N|5|D|7|15|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|16|8|@]|9|@]|A|$]]|$1|Q|3|R|5|6|7|17|8|@$I|18|J|19|K|L]]|9|@$I|1A|J|1B|1|1C]]|A|$]]|$1|S|3|-4|5|6|7|1D|8|@]|9|@]|A|$]]]|T|$U|$5|V|W|X|A|$Y|Z]]]]

What if it could be as easy as this?

<pre><code>git changed
</code></pre>

If you're willing to assume that the main branch is called "master", and that you create your other branches from master, then you can add this alias to your <code>~/.gitconfig</code> file to make it that easy:

<pre><code>cbranch = !"git branch | grep '*' | cut -f2 -d' '"
changed = !"git diff --name-only $(git cbranch) $(git merge-base $(git cbranch) master)"
</code></pre>

Those assumptions will work for most people in most situations, but you must be aware that you're making them.

Also, you must use a shell that supports <code>$()</code>. <a href="https://unix.stackexchange.com/a/218065/3358">It's very likely that your shell supports this</a>.

blocks|key|353117|text|git+show+--stat+origin/branch_name|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|353118|这将为您提供已在此分支下添加或修改的文件的列表。|unstyled|353119|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|J|8|@]|9|@]|A|$]]|$1|G|3|-4|5|F|7|K|8|@]|9|@]|A|$]]]|H|$]]

<pre><code>git show --stat origin/branch_name
</code></pre>

This will give you a list of the files that have been added or modified under this branch.

blocks|key|569490|text|考虑到您在一个功能分支上，并且您想要检查哪些文件与主文件相比发生了更改...就是这样：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|569491|git+diff+--name-only+master|code-block|syntax|javascript|569492|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

Considering you're on a feature branch and you want to check which files have changed compared to master... just this:
<pre><code>git diff --name-only master
</code></pre>

blocks|key|353322|text|在@twalberg和@iconoclast的基础上扩展，如果你出于任何原因使用cmd，你可以使用：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|353323|FOR+/F+"usebackq"+%25x+IN+(`"git+branch+%7C+grep+'*'+%7C+cut+-f2+-d'+'"`)+DO+FOR+/F+"usebackq"+%25y+IN+(`"git+merge-base+%25x+master"`)+DO+git+diff+--name-only+%25x+%25y|code-block|syntax|javascript|353324|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

Expanding off of what @twalberg and @iconoclast had, if you're using cmd for whatever reason, you can use:

<pre><code>FOR /F "usebackq" %x IN (`"git branch | grep '*' | cut -f2 -d' '"`) DO FOR /F "usebackq" %y IN (`"git merge-base %x master"`) DO git diff --name-only %x %y
</code></pre>

blocks|key|353460|text|以下批处理文件基于twalberg的答案，但将在Windows中运行：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|353461|@ECHO+OFF
C:+++++++++++++++++++++++++++++++::+<==+OR+USE+A+DIFFERENT+DRIVE
CD+\path\to\where\git\files\are++::+<==+CHANGE+TO+THE+ACTUAL+PATH
SET+/p+b="Enter+full+path+of+an+ALREADY+MERGED+branch+to+compare+with+origin/master:+"
bash+--login+-i+-c+"git+diff+--name-only+%25b%25+$(git+merge-base+%25b1%25+origin/drop2/master)"
PAUSE|code-block|syntax|javascript|353462|上面假设主分支是origin/master，并且在安装git时包含了Git+bash+(它的位置在path环境中)。我实际上需要使用一个已配置的比较工具(kdiff3)来显示实际的差异，所以用上面的bash命令替换了它：|353463|bash+--login+-i+-c+"git+difftool+--dir-diff+%25b%25+$(git+merge-base+%25b1%25+origin/drop2/master)"|353464|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

The following batch file is based on twalberg's answer but will work in Windows:

<pre><code>@ECHO OFF
C: :: &lt;== OR USE A DIFFERENT DRIVE
CD \path\to\where\git\files\are :: &lt;== CHANGE TO THE ACTUAL PATH
SET /p b="Enter full path of an ALREADY MERGED branch to compare with origin/master: "
bash --login -i -c "git diff --name-only %b% $(git merge-base %b1% origin/drop2/master)"
PAUSE
</code></pre>

The above assumes that the main branch is origin/master and that git bash was included when Git was installed (and its location is in the path environment). I actually needed to show the actual differences using a configured diff tool (kdiff3) so substituted the following bash command above:

<pre><code>bash --login -i -c "git difftool --dir-diff %b% $(git merge-base %b1% origin/drop2/master)"
</code></pre>

Is there a way to see what files have changed in a branch?

Get all files that have been modified in git branch

Windows

有没有办法查看分支中哪些文件发生了更改？

问获取所有在git分支中修改过的文件
EN

回答 12

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问获取所有在git分支中修改过的文件EN

回答 12

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问获取所有在git分支中修改过的文件
EN