2016-07-04 36 views
1

如何获取我正在合并的分支的名称? git的状态只告诉我,我合并,但我忘了哪一个分支正是我合并...Git - 我正在合并的分支是什么?

On branch master 
Your branch is up-to-date with 'origin/master'. 
All conflicts fixed but you are still merging. 
    (use "git commit" to conclude merge) 
+0

用'git的log'试试? – Hackerman

+0

Nah,已经试过了。不显示。 – sooqua

+4

'xargs git log --decorate --no-walk = unsorted --oneline <.git/MERGE_HEAD' – PetSerAl

回答

1

要清楚大家谁仍然寻求类似的答案

答案被张贴评论的@PetSerAL

xargs git log --decorate --no-walk=unsorted --oneline < .git/MERGE_HEAD 
2

尝试git show-branch

这表明新的分支,最后提交上每。 如果有合并,它会在合并中显示-

0
​git show MERGE_HEAD -s --pretty=%d