查看将在一个git命令中合并什么?
目前,在合并分支之前,我使用以下命令查看将合并哪些更改:查看将在一个git命令中合并什么?,git,merge,Git,Merge,目前,在合并分支之前,我使用以下命令查看将合并哪些更改: base=$(git merge-base other HEAD) git diff $base other 是否有一个git命令来实现这一点 问候,, Jochen注意:问题“”确实提到了在获取时查看合并内容的上下文: [alias] # fetch and show what would be merged (use option "-p" to see patch) incoming = "!git remote
base=$(git merge-base other HEAD)
git diff $base other
是否有一个git命令来实现这一点
问候,,
Jochen注意:问题“”确实提到了在获取时查看合并内容的上下文:
[alias]
# fetch and show what would be merged (use option "-p" to see patch)
incoming = "!git remote update -p; git log ..@{u}"
与:
- “
”以显示大量更改,或git incoming
- “
”以显示修补程序(即“差异”)git incoming-p
- “
”,用于简洁的摘要等git incoming--pretty=oneline
- :
[alias]
# fetch and show what would be merged (use option "-p" to see patch)
incoming = "!git remote update -p; git log ..@{u}"